From 154e75464f03daeb88041149bc1c2b07cb36be06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Wed, 29 Nov 2023 19:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=E3=80=81?=
 =?UTF-8?q?=E5=A4=87=E6=96=99=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts | 42 ++++++++++---------
 .../preparetoissueMain.data.ts                |  6 +--
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index bfd66621a..c2eaeb375 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -34,6 +34,24 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 发料申请主表
  */
 export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '车间代码',
     field: 'workshopCode',
@@ -240,24 +258,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -538,7 +538,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
   },
   {
     label: '器具号',
@@ -548,7 +549,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
   },
   {
     label: '批次',
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 7f23ef705..f4e1e40e6 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -688,7 +688,7 @@ export const PreparetoissueDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-  workStation: [
-    { required: true, message: '请选择工位', trigger: 'change' }
-  ],
+  // workStation: [
+  //   { required: true, message: '请选择工位', trigger: 'change' }
+  // ],
 })
\ No newline at end of file