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

src/api/wms/supplierApbalanceMain/index.ts

@@ -58,8 +58,13 @@ export const deleteSupplierApbalanceMain = async (id: number) => {
 
 // 导出供应商余额明细主 Excel
 export const exportSupplierApbalanceMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier-apbalance-main/export-excel-senior`, data })
+  } else {
     return await request.download({ url: `/wms/supplier-apbalance-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/views/qms/inspectionScheme/addForm.vue

@@ -831,18 +831,15 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     } else {
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
+      editableTabsValue.value = '1'
       let arr = []
       list.forEach((item, index) => {
-        // editableTabsValue.value = index + 1
-        item.name = index + 1
-        console.log(item.inspectionCharacteristicsBaseVO)
-        
         let obj = {
           inspectionCode:item.inspectionCode,
           description:item.description,
           inspectionCharCode:item.inspectionCharCode,
           sequenceCode:item.sequenceCode,
-          name : index + 1,
+          name :String(index + 1),
           inspectionCharacteristicsBaseVO:{
             description:item.inspectionCharacteristicsBaseVO.description,
             featureType:item.inspectionCharacteristicsBaseVO.featureType,
@@ -886,7 +883,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         }
         arr.push(obj)
       })
-      editableTabsValue.value = 1
       data.value.process = arr
       console.log(111, data.value)
     }else{
@@ -899,10 +895,9 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
     rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
     rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+      editableTabsValue.value = '1'
     list.forEach((item, index) => {
-      // editableTabsValue.value = index + 1
-      item.name = index + 1
-      // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      item.name = String(index + 1)
       // 编辑判断上限下限目标值是否必填
       if (
         item.inspectionCharacteristicsBaseVO.featureType == 0 &&
@@ -920,7 +915,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
       }
     })
-    editableTabsValue.value = 1
     // 显示aql和检验水平字段的时候添加必填规则
     if (isShowField.value > 0) {
       rules.value.aql[0].required = true

src/views/qms/inspectionTemplate/addForm.vue

@@ -587,18 +587,15 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         process: []
       }
       let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+      editableTabsValue.value = '1'
       let arr = []
       list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        console.log(item.inspectionCharacteristicsBaseVO)
-        
         let obj = {
           description:item.description,
           inspectionCharCode:item.inspectionCharCode,
           inspectionCode:item.inspectionCode,
           sequenceCode:item.sequenceCode,
-          name : index + 1,
+          name :String(index + 1),
           inspectionCharacteristicsBaseVO:{
             description:item.inspectionCharacteristicsBaseVO.description,
             featureType:item.inspectionCharacteristicsBaseVO.featureType,
@@ -641,13 +638,14 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         arr.push(obj)
       })
       data.value.process = arr
+      
     }else{
       data.value = JSON.parse(JSON.stringify(row))
       data.value.version = String(data.value.version)
       let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+      editableTabsValue.value = '1'
       list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
+        item.name = String(index + 1)
         // 编辑判断上限下限目标值是否必填
         if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -76,6 +76,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -86,7 +87,15 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -395,7 +404,6 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm:{
       multiple:true,
-      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',
       searchField: 'code',
@@ -406,7 +414,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -575,6 +593,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择库位代码',
       searchField: 'code',
@@ -585,11 +604,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码',
         searchField: 'code',
@@ -600,7 +628,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -632,6 +668,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择货主代码',
       searchField: 'code',
@@ -642,11 +679,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择货主代码',
         searchField: 'code',
@@ -657,7 +703,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -764,6 +818,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     form: {
       componentProps: {
+        enterSearch: true,
         disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
@@ -783,11 +838,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
 
       }
     },
     tableForm: {
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -807,7 +871,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+      verificationParams: [{
+        key: 'packUnit',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     }
   },
   {
@@ -831,6 +903,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     form: {
       componentProps: {
+        enterSearch: true,
         disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
@@ -850,11 +923,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
 
       }
     },
     tableForm: {
+      enterSearch: true,
       clearable: true,
       disabled: true,
       isInpuFocusShow: true,
@@ -875,7 +957,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
     }
   },
   {
@@ -899,6 +989,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       width: 150,
       componentProps: {
+        enterSearch: true,
         disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
@@ -918,11 +1009,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
 
       }
     },
     tableForm: {
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -942,7 +1042,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+    verificationParams: [{
+      key: 'packUnit',
+      action: '==',
+      value: '',
+      isMainValue: false,
+      isSearch: true,
+      isFormModel: true,
+    }], // 失去焦点校验参数
     }
   },
   {

src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts

@@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+    isTable:true,
+  },
   {
     label: '车间代码',
     field: 'workShopCode',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+    isTable:true,
+  },
   {
     label: '车间代码',
     field: 'workshopCode',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -236,9 +236,10 @@ const expandChange = (row: any, expandedRows: any[]) => {
     // 放满的托数量*一托的箱数量*一箱的数量  获取放满的托一共多少数量
     let num1 = accuracyFun.multiply(parseFloat(row.manTuoQty ),parseFloat(row.otherNumber))
     row.tuoInManNumber = accuracyFun.multiply(num1, parseFloat(row.packQty))
+    console.log(11,row.tuoInManNumber )
     // 数量除以托数量获取余数
     row.lastNumber =
-      parseFloat(row.qty) > parseFloat(row.tuoInManNumber)
+      parseFloat(row.qty) >= parseFloat(row.tuoInManNumber)
         ? accuracyFun.subtract( parseFloat(row.qty),parseFloat(row.tuoInManNumber)) 
         : parseFloat(row.qty)
     // 循环托