From a41a9a5d38fd52a2b2384e15c166b1909fb8c446 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Sat, 12 Oct 2024 10:33:12 +0800
Subject: [PATCH] =?UTF-8?q?YT-318=E8=A3=85=E9=85=8D=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E3=80=81=E8=A3=85=E9=85=8D=E5=A4=87=E4=BB=B6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E4=B8=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=8F=AD=E6=AC=A1=E5=BA=94=E6=98=BE=E7=A4=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=EF=BC=8C=E7=8E=B0=E6=98=BE=E7=A4=BA=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMainAssemble/index.vue              |  5 +++++
 .../productionMainAssemble.data.ts                | 15 ++++++++++++++-
 .../productionMainAssembleSparePart/index.vue     |  4 ++++
 .../productionMainAssembleSparePart.data.ts       | 15 ++++++++++++++-
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index a5335ec3c..5f9217311 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -170,6 +170,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = val[0][searchField]
       }
+      // const setV = {}
+      if (formField == 'shift') {
+        setV['shift'] = val[0]['code']
+        setV['shiftName'] = val[0]['name']
+      }
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 7b43f9b8d..e354b35f0 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -199,7 +199,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -231,6 +231,19 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '物料代码',
   //   field: 'detailItemCode',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 5f1d7a00b..e99505438 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -162,6 +162,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = val[0][searchField]
       }
+      if (formField == 'shift') {
+        setV['shift'] = val[0]['code']
+        setV['shiftName'] = val[0]['name']
+      }
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index de69f82d7..1530e2c0c 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -203,7 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -235,6 +235,19 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '物料代码',
   //   field: 'detailItemCode',