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

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -102,6 +102,10 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['itemName'] = val[0]['name']
         setV['itemDesc1'] = val[0]['desc1']
         setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
         await Itempackaging.getItempackagingPage({
           itemCode: val[0]['code']
         }).then(res => {

src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@@ -193,14 +193,16 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         style: {width:'100%'},
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+        disabled: true
       }
     },
     form: {
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'x',
+        disabled: true
       }
     },
     table: {
@@ -215,7 +217,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 0
+        precision: 0,
+        disabled: true
       },
       value: 0
     },
@@ -234,14 +237,16 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         style: {width:'100%'},
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+        disabled: true
       }
     },
     form: {
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'x',
+        disabled: true
       }
     },
     table: {

src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@@ -102,6 +102,10 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['itemName'] = val[0]['name']
         setV['itemDesc1'] = val[0]['desc1']
         setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
         await Itempackaging.getItempackagingPage({
           itemCode: val[0]['code']
         }).then(res => {

src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@@ -202,6 +202,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         style: {width:'100%'},
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         type: 'daterange',
+        disabled: true,
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
@@ -209,7 +210,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'x',
+        disabled: true
       }
     },
     table: {
@@ -224,7 +226,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 0
+        precision: 0,
+        disabled: true
       },
       value: 0
     },
@@ -243,6 +246,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         style: {width:'100%'},
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         type: 'daterange',
+        disabled: true,
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
@@ -250,7 +254,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'x',
+        disabled: true,
       }
     },
     table: {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -117,7 +117,12 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['customerUom']
+      }else {
         row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]      

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -129,9 +129,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
-      if(formField == 'itemCode') {
-        row['uom'] = val[0]['customerUom']
-      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -378,6 +375,16 @@ const flag = ref(false)
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+    // 判断是否重复物料
+    let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
   data.subList.forEach(obj => {
     if(obj.qty == 0){
       message.error(`数量不能为0!`)