From d6a0fb9eb031554421809c2d2f9b16bd0b866b2a Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 17 Jul 2024 08:58:33 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9C=89=E4=BB=B7=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMainDifference/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue index 4806bd522..1bc166d4d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue @@ -358,6 +358,7 @@ const importTemplateData = reactive({ // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { + ...tableObject.params, isSearch: true, filters: [...searchData.filters,{ action: "==", From f1bbdb903e00655967b63884181f171d8c261008 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 17 Jul 2024 09:43:10 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissue/transferissueRequestMain/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 29a8c0330..7648b471c 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -80,7 +80,7 @@ /> - @@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (formField == 'packingNumber') { let itemCodes = [] val.forEach(item=>{ - const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) + const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) if(findIndex == -1){ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['packingNumber'] = item['packingNumber'] @@ -156,6 +156,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['inventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] setV['itemCode'] = val[0]['itemCode'] + setV['uom'] = val[0]['uom'] }else { setV[formField] = val[0][searchField] } From 5f889213e1f032727d307f44bad9d2c5abc191ad Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 17 Jul 2024 09:51:09 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 1 + .../productreceiptAssembleRequestMain.data.ts | 124 ++++++++++++++++-- 2 files changed, 112 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 2f42cfe4c..ea2e30994 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -928,6 +928,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index e786a028d..9762467ba 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -108,6 +108,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -118,7 +119,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -130,7 +139,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ width: 150 }, isTable:false, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -146,11 +156,20 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -166,7 +185,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +208,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -191,7 +219,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -206,6 +242,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -216,7 +253,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -633,7 +678,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -653,7 +708,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -664,7 +727,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -675,9 +739,18 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { + enterSearch: true, // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, @@ -690,7 +763,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -842,11 +923,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -862,7 +952,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, From 1e8d0a999ab0e4ffabe36e024ee53b5d30f2a897 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 17 Jul 2024 10:44:10 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productionline/index.ts | 5 + .../productreceiptscrapRequestMain.data.ts | 124 ++++++++++++++++-- 2 files changed, 116 insertions(+), 13 deletions(-) diff --git a/src/api/wms/productionline/index.ts b/src/api/wms/productionline/index.ts index 85e5fce07..3a0176b79 100644 --- a/src/api/wms/productionline/index.ts +++ b/src/api/wms/productionline/index.ts @@ -64,4 +64,9 @@ export const importTemplate = () => { // 查询生产线列表 export const getProductionlineNoPage = async (params) => { return await request.get({ url: `/wms/productionline/noPage`, params }) +} + +// 根据code获取数据列表 +export const getProductionlineByCodes = async (params) => { + return await request.get({ url: `/wms/productionline/listByCodes`, params }) } \ No newline at end of file diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7e3cc8a51..2b914c87e 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -108,6 +108,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -118,7 +119,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -133,6 +142,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -143,7 +153,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -158,6 +176,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -168,7 +187,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -540,7 +567,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -560,7 +597,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -571,7 +616,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', @@ -587,11 +633,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', @@ -607,7 +662,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -618,7 +681,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -629,11 +693,20 @@ export const ProductreceiptRequestDetail = 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', @@ -644,7 +717,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -796,11 +877,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -816,7 +906,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, From c6aa6a6d1d0bc9f75da7f920bbf6c2a74f799d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 17 Jul 2024 10:51:11 +0800 Subject: [PATCH 05/13] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/inspectionJobMain.data.ts | 2 +- src/views/qms/inspectionScheme/inspectionScheme.data.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 88f9fd035..def7f46a5 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -256,9 +256,9 @@ export const InspectionJobMain = useCrudSchemas( label: '检验类型', field: 'inspectionType', sort: 'custom', - isSearch: false, dictType: DICT_TYPE.INSPECTION_TYPE, dictClass: 'string', + isSearch: true, form: { component: 'Select', componentProps: { diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts index ceca52b8e..041851697 100644 --- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts +++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts @@ -84,6 +84,7 @@ export const InspectionSchemeMain = useCrudSchemas( dictType: DICT_TYPE.INSPECTION_TYPE, dictClass: 'string', sort: 'custom', + isSearch: true, table: { width: 175 } From b1c8bd72640ae0987dc27ba58fcf0ab98050157b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 17 Jul 2024 11:28:07 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 90ede593f..d782eff18 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -554,6 +554,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, disabled:true, + isShowTableFormSearch: true, // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 From dcf484d8f989e69823e67c926db2957f3f5b441e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 17 Jul 2024 11:40:26 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=EF=BC=8C=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=EF=BC=8C=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=8E=82=E6=8B=86=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain.data.ts | 104 +++++++++++++-- .../productrepairRequestMain.data.ts | 93 +++++++++++-- .../productscrapRequestMain.data.ts | 123 ++++++++++++++++-- 3 files changed, 286 insertions(+), 34 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index bb1e0b840..b36e3ff4d 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -72,6 +72,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -82,7 +83,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -96,6 +105,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -106,7 +116,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -120,6 +138,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -130,7 +149,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -491,11 +518,22 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -104,7 +105,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -116,7 +125,8 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ width: 150 }, sortTableDefault:4, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -132,11 +142,20 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -152,7 +171,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -167,6 +194,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -177,7 +205,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -192,6 +228,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -202,7 +239,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -570,7 +615,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive value: 'productionLineCode', message: '请选择返修生产线代码！', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -618,7 +673,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive width: 150 }, sortTableDefault:7, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -629,11 +685,20 @@ export const ProductrepairRequestDetaila = 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', @@ -644,7 +709,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 2ebb907d2..23aa105f3 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -91,6 +91,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -101,7 +102,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -112,7 +121,8 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -128,11 +138,20 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -148,7 +167,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -162,6 +189,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -172,7 +200,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -186,6 +222,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -196,7 +233,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -568,7 +613,17 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -588,7 +643,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'productionLineCode', message: '请填写生产线代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -599,7 +662,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -610,11 +674,20 @@ export const ProductscrapRequestDetail = 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', @@ -625,7 +698,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -655,7 +736,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -675,7 +764,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { From d097a88fc31b39f55416cbaffffb0e8c5833bb03 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 17 Jul 2024 11:45:12 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/web/useCrudSchemas.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index f74c14467..541ca87b6 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -271,6 +271,10 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For comonentProps = { options: options } + // 可编辑字典-下拉框默认选中第一条数据 --喜婷 + if(options.length>0&&!schemaItem.form?.componentProps?.disabled){ + defaultValue = options[0].value + } if (!(schemaItem.form && schemaItem.form.component)) component = 'Select' } From ce806ae42cb8f6453b42585389698b8e55506884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 17 Jul 2024 11:52:24 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 8 ++++---- .../productionplan/productionMainAssemble/index.vue | 8 ++++---- .../productionMainAssembleSparePart/index.vue | 8 ++++---- .../productionMainPredictSparePart/index.vue | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 642431a99..c53a2a76f 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -348,7 +348,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -406,7 +406,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -419,7 +419,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 1f63f5282..7e2c041af 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -347,7 +347,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -405,7 +405,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -418,7 +418,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index dad69ddeb..4ab269ab6 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -331,7 +331,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -404,7 +404,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -419,7 +419,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 6a4e7cdac..3b44d5f4c 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -331,7 +331,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -344,7 +344,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -402,7 +402,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -415,7 +415,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { From a81f8bcdc0f70d24b21dc0c37c3d135123d7bddb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 17 Jul 2024 13:13:25 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 1 + .../unplannedreceiptRequestMain.data.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index b9c9fbe01..fe6ea3444 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -731,6 +731,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, isInpuFocusShow: true, // 开启查询弹窗 + isShowTableFormSearch: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', searchTitle: '客户物料基础信息', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 96b8bc38c..f4bdae616 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -618,6 +618,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Wed, 17 Jul 2024 13:18:45 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8A=A5=E4=BA=A7?= =?UTF-8?q?=EF=BC=8C=E8=A3=85=E9=85=8D=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproductionRequestMain.data.ts | 102 ++++++++++++++++-- .../productputawayAssembleRequestMain.data.ts | 1 + 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts index 07cd13ca5..b7fc626e8 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -64,7 +64,15 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive multiple: true, // isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 + disabled:true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 From b81d0ac4635fce2dd85d2c11c35f4759627e788b Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 17 Jul 2024 14:09:23 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/callmaterials/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 2d39e52da..c13150278 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -199,7 +199,7 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - + basicFormRef.value.open(type, row) if (type == 'create') { // nextTick(() => { @@ -272,8 +272,17 @@ const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken()) const srcPoint = ref(BASE_URL + '/jmreport/view/940818992169918464?token=' + getAccessToken()) // 标签打印 +// const handlePoint = async (row) => { +// window.open(src.value+'&relateNumber='+row.id) +// } const handlePoint = async (row) => { - window.open(src.value+'&relateNumber='+row.id) + let rows = [row.id]; // 将单个 row.id 转换成数组 + await PackageApi.batchPrintingLable(rows.join(',')).then(res => { + window.open(srcPoint.value + '&relateNumber=' + res); + message.success('创建标签成功'); + }).catch(err => { + message.error('创建标签失败'); + }); } // 批量打印 const handleSelectionPoint = async ()=>{ From ec539c99bd1da3e48e8dc89d3f3fee5293894b56 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 17 Jul 2024 14:35:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E5=A4=B1=E5=8E=BB?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 104 +++++++++--------- .../relegateRequestMain.data.ts | 21 +++- .../deliverRequestMain.data.ts | 51 ++++++++- .../deliverPlanMain/deliverPlanMain.data.ts | 32 +++++- 4 files changed, 150 insertions(+), 58 deletions(-) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 4e1ec241b..c72f0dec7 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -211,10 +211,10 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f headerItem.field == 'packUnit' || headerItem.field == 'secondPackUnit' || headerItem.field == 'fromPackUnit' || - headerItem.field == 'toPackUnit'|| - headerItem.field == 'toPackUnit'|| + headerItem.field == 'toPackUnit' || + headerItem.field == 'toPackUnit' || headerItem.field == 'supplierItemCode' - + ) { let searchField = headerItem.field let pageApi = ref() @@ -239,10 +239,10 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f ] ? formRef.formModel[searchCondition1[i].value] : detailData - ? detailData[searchCondition1[i].value] - : row - ? row[searchCondition1[i].value] - : '' + ? detailData[searchCondition1[i].value] + : row + ? row[searchCondition1[i].value] + : '' // 是否含有空参数情况 let isNull = false if ( @@ -354,9 +354,9 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f ) { // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请 pageApi.value = getProductionLineCodelistByCodes - params.value.productionLineCode= - formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, - params.value.itemCodes=val?.trim() + params.value.productionLineCode = + formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, + params.value.itemCodes = val?.trim() } } else if ( headerItem.field == 'packUnit' || @@ -376,39 +376,39 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f routeName == 'UnplannedissueJobMain' || routeName == 'PackageoverRequestMain' ) { - params.value.itemCode= row.itemCode - params.value.packUnit= val?.trim() + params.value.itemCode = row.itemCode + params.value.packUnit = val?.trim() pageApi.value = getItemPackageunitListByCodes } } else if ( - headerItem.field == 'supplierItemCode' + headerItem.field == 'supplierItemCode' ) { // 生产退料申请,隔离退料申请 if ( routeName == 'ProductionreturnRequestMain' || - routeName == 'ProductionreturnRequestMainNo' + routeName == 'ProductionreturnRequestMainNo' ) { - searchField = 'supplierCode' - params.value.itemCodes= row.itemCode - params.value.supplierCode= val?.trim() + searchField = 'supplierCode' + params.value.itemCodes = row.itemCode + params.value.supplierCode = val?.trim() pageApi.value = getSupplierItemListByCodes } } const list = ref() // 调取包装接口 await pageApi.value(params.value).then(async (res) => { - list.value = res ? res : [] - // 只查一条数据，多条数据查询默认显示不存在 - if (res.length == 1) { - callback(list.value) - } else { - message.alert('代码' + row[headerItem.field] + '没有找到对应数据') - row[headerItem.field] = '' - return - } - }) - } + list.value = res ? res : [] + // 只查一条数据，多条数据查询默认显示不存在 + if (res.length == 1) { + callback(list.value) + } else { + message.alert('代码' + row[headerItem.field] + '没有找到对应数据') + row[headerItem.field] = '' + return + } + }) } + } } } export const FormBlur = async (field, val, routeName, formRef, detailData, formSchema, callback) => { @@ -586,7 +586,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS callback(list.value) }) } - } + } else { let pageApi = ref() let params = ref() @@ -737,13 +737,13 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS }) } } - } + } } // 根据下方输入框失去焦点校验信息 export const getListByBottonInput = async (headerItem, val, row, routeName, formRef, detailData, tableData, callback) => { let tableFormSchemaObj = headerItem?.tableForm - console.log(333,tableFormSchemaObj) + console.log(333, tableFormSchemaObj) if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) { if (!val) return; let params = ref({}) @@ -817,7 +817,7 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form if (verificationParams && verificationParams.length > 0) { for (let i = 0; i < verificationParams.length; i++) { console.log(54565, verificationParams[i].key) - verificationParams[i].key1 = verificationParams[i].key +'s' + verificationParams[i].key1 = verificationParams[i].key + 's' params.value[verificationParams[i].key1] = val } } @@ -830,25 +830,29 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form ...arr1.filter((item) => !arr2.includes(item)), ...arr2.filter((item) => !arr1.includes(item)) ].join(',') - message.alert('代码' + str + '没有找到对应数据') - return - } else { - let repeatCode = [] - if (tableData.length > 0) { - tableData.forEach((item) => { - const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field]) - if (findIndex > -1) { - arr1.splice(findIndex, 1) - repeatCode.push(item[headerItem.field]) - } - }) - } - if (repeatCode.length > 0) { - message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); - return; + console.log(arr1.filter((item) => arr2.includes(item))) + console.log(22, str) + if (str) { + message.alert('代码' + str + '没有找到对应数据') + return } - callback(list.value) } + let repeatCode = [] + if (tableData.length > 0) { + tableData.forEach((item) => { + const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field]) + if (findIndex > -1) { + arr1.splice(findIndex, 1) + repeatCode.push(item[headerItem.field]) + } + }) + } + if (repeatCode.length > 0) { + message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); + return; + } + console.log(list.value) + callback(list.value) }) return } else { @@ -929,5 +933,5 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form }) } - + } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 64ce34152..6df677b5e 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -70,7 +70,15 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, table: { @@ -350,6 +358,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ sort: 'custom', form: { componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择降级物料代码', searchField: 'code', @@ -364,7 +373,15 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ key: 'type', value: confgiData.itemType, isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index fe6ea3444..fad28bdc9 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -92,7 +92,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -107,6 +115,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -123,7 +132,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ value: 'customerCode', message: '请填写客户代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -201,7 +218,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'status', value: '6', isMainValue: false - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -226,6 +251,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择承运商', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -236,7 +262,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -737,6 +771,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { componentProps: { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 06e18de14..c1b0b4b1b 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -87,7 +87,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -119,6 +127,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ // }, form: { componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择客户月台代码', searchField: 'code', @@ -133,7 +142,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ key: 'customerCode', value: 'customerCode', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, }, @@ -594,10 +611,21 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ multiple:true, // isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', + disabled:true, searchField: 'itemCode', searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { componentProps: {