From 7a76b7acdd05bfa93eac7dc95f6a3e9fa8522c38 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 22 Jul 2024 09:26:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=94=9F=E6=88=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E8=AE=A1=E7=AE=97=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 8f6ab2391..6e02b6fb0 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -235,10 +235,11 @@ const expandChange = (row: any, expandedRows: any[]) => { row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber)) // 放满的托数量*一托的箱数量*一箱的数量 获取放满的托一共多少数量 let num1 = accuracyFun.multiply(parseFloat(row.manTuoQty ),parseFloat(row.otherNumber)) - row.tuoInManNumber =accuracyFun.multiply(num1,parseFloat(row.packQty)) + 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) // 循环托 From ca7d6962d996d1787b99221313d107c47f421e78 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jul 2024 09:42:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?HL-4298=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptJobMain.data.ts | 11 +++++++++++ .../productreceiptAssembleJobMain.data.ts | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 268d5311d..08ddb8dd4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '生产计划单号', + field: 'productionPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isForm: false, + isTable:true, + }, { label: '车间代码', field: 'workShopCode', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index 007f65edc..7da976dcd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '生产计划单号', + field: 'productionPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isForm: false, + isTable:true, + }, { label: '车间代码', field: 'workshopCode', From 4bd1416168e5ba59d0082c05c6784a57326ffd64 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 22 Jul 2024 09:49:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?SCP=20=E2=80=94=E2=80=94>=20=20=20bug=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=AF=A2=E8=AF=81=E5=87=BD=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierApbalanceMain/index.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api/wms/supplierApbalanceMain/index.ts b/src/api/wms/supplierApbalanceMain/index.ts index 1eed92870..ed7e2f60c 100644 --- a/src/api/wms/supplierApbalanceMain/index.ts +++ b/src/api/wms/supplierApbalanceMain/index.ts @@ -58,10 +58,15 @@ export const deleteSupplierApbalanceMain = async (id: number) => { // 导出供应商余额明细主 Excel export const exportSupplierApbalanceMain = async (params) => { - return await request.download({ url: `/wms/supplier-apbalance-main/export-excel`, 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 = () => { return request.download({ url: '/wms/supplier-apbalance-main/get-import-template' }) -} \ No newline at end of file +} From c467943dc3a08e002ef5c957ec70cd15e119db17 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 22 Jul 2024 09:50:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E4=B8=8E=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE=E5=90=8E=E3=80=82?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=8E=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=B7=A5=E5=BA=8F=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 14 +- src/views/qms/inspectionTemplate/addForm.vue | 12 +- .../inventoryinitRequestMain.data.ts | 138 ++++++++++++++++-- 3 files changed, 132 insertions(+), 32 deletions(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 7493373c8..0aac036b0 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/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 diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue index adde857d0..dacf37523 100644 --- a/src/views/qms/inspectionTemplate/addForm.vue +++ b/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 diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 7ea15a22d..b8af46eb8 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -76,6 +76,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -86,7 +87,15 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ 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( }, tableForm:{ multiple:true, - enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'code', @@ -406,7 +414,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -574,7 +592,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择库位代码', searchField: 'code', @@ -585,11 +604,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( 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( key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 } } }, @@ -631,7 +667,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择货主代码', searchField: 'code', @@ -642,11 +679,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( 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( 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( sort: 'custom', form: { componentProps: { + enterSearch: true, disabled: true, isSearchList: true, searchListPlaceholder: '请选择包装', @@ -783,11 +838,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( 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( 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( sort: 'custom', form: { componentProps: { + enterSearch: true, disabled: true, isSearchList: true, searchListPlaceholder: '请选择包装', @@ -850,11 +923,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( 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( 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( form: { width: 150, componentProps: { + enterSearch: true, disabled: true, isSearchList: true, searchListPlaceholder: '请选择包装', @@ -918,11 +1009,20 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( 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( key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, {