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

@@ -260,7 +260,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField == 'packingNumber'){
+      if(formField == 'itemCode'){
         row['containerNumber'] = val[0]['containerNumber']
         row['itemCode'] = val[0]['itemCode']
         row['packingNumber'] = val[0]['packingNumber']

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

@@ -691,16 +691,16 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '包装号',
+    label: '物料代码',
-    field: 'packingNumber',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装号',
+      searchListPlaceholder: '请选择物料代码',
-      searchField: 'packingNumber',
+      searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceItemPage
@@ -709,31 +709,14 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择包装号',
+        searchListPlaceholder: '请选择物料代码',
-        searchField: 'packingNumber',
+        searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
         searchPage: BalanceApi.getBalanceItemPage
       }
     }
   },
-
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '成品库位代码',
     field: 'fromLocationCode',
@@ -1140,9 +1123,9 @@ export const ProductdismantleRequestDetailaRules = reactive({
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
-  packingNumber: [
+  // packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],