Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -303,6 +303,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
+    const setV = {}
+    if (formField == 'shift') {
+      setV['shift'] = val[0]['code']
+      setV['shiftName'] = val[0]['name']
+    }
+    formRef.setValues(setV)
   })
 }
 // 查询页面返回——详情

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -129,7 +129,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -161,6 +161,19 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+          disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

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)
     }
   })

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',

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)
     }
   })

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',