From 6f92254852116903f058e47f3b118e6616ab21d7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 10:45:30 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=80=BC=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=B8=BA0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 10 ++++------ src/views/qms/inspectionRecord/addForm.vue | 17 +++++++++++------ src/views/qms/inspectionRecordFirst/addForm.vue | 10 ++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6775e1ea5..93b717cd3 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -478,12 +478,7 @@ " > - + { + cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '') +} const inspectionValueInput = (item, cur) => { for ( let i = 0; diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue index 030c4d595..037c9456b 100644 --- a/src/views/qms/inspectionRecord/addForm.vue +++ b/src/views/qms/inspectionRecord/addForm.vue @@ -478,12 +478,7 @@ " > - + { + cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '') +} const inspectionValueInput = (item, cur) => { for ( let i = 0; @@ -1528,6 +1526,13 @@ const inspectionValueInput = (item, cur) => { .inspectionValue ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) ) { + console.log(parseFloat( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] + .inspectionValue + )) + console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) + console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)) + console.log(333) item.isPass = false return } diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index d3c12f30a..ebcab9ac7 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -535,12 +535,7 @@ v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'" > - + { + cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '') +} const inspectionValueInput = (item, cur) => { for ( let i = 0; From 1779eb2aafba98dbf2f91760d92f7f222236170e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 7 Aug 2024 11:05:47 +0800 Subject: [PATCH 02/14] =?UTF-8?q?HL-4978=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRecordMain.data.ts | 2 ++ .../unplannedissueRequestMain.data.ts | 19 ++++++++++--------- .../unplannedreceiptRequestMain.data.ts | 5 +++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 35765b53c..a24d5b002 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -736,6 +736,8 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, // { // label: '任务明细ID', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 27e78019e..ba2f86dbd 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -502,7 +502,8 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + sortTableDefault: 1000, + isTable: true, }, { label: '直接生成记录', @@ -995,14 +996,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTableForm: false, isTable:false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index d434fb19e..4b2310c5d 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -544,8 +544,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm:false, - isTable: false + sortTableDefault: 1000, }, { label: '创建时间', @@ -1259,6 +1258,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Wed, 7 Aug 2024 13:16:57 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BB=8E=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 88f278275..d7c1d4a8c 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -698,6 +698,11 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode) + if(findLocation){ + message.warning('从库位和到库位不能相同') + return + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { From e4af43453ea9decdce392e552e99d1e2ac4f329c Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 7 Aug 2024 13:26:52 +0800 Subject: [PATCH 04/14] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=E4=BB=BB=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreceiptJobMain/productionreceiptJobMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index b87fb651e..ca98bc89e 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -99,6 +99,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.JOB_STATUS, dictClass: 'string', + isSearch: true, isTable: true, sort: 'custom', table: { From 683a537eeacc4aa747d3a466e04fed1e946c30dd Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 13:39:18 +0800 Subject: [PATCH 05/14] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E3=80=81=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E3=80=81=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E8=AE=B0=E5=BD=95=E3=80=82=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=82=A8=E4=B8=BA=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 2 +- src/views/qms/inspectionRecord/index.vue | 2 +- src/views/qms/inspectionRequest/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index df041bc5b..957192bd0 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -121,7 +121,7 @@ import Detail from './detail.vue' import { getReportUrl } from '@/utils/systemParam' // 采购订单 -defineOptions({ name: 'InspectionJobMain' }) +defineOptions({ name: 'inspectionJobMain' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index efc788c35..ba8757931 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -129,7 +129,7 @@ import { import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' // 采购订单 -defineOptions({ name: 'InspectionRecordMain' }) +defineOptions({ name: 'inspectionRecordMain' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index 6e1351e10..04c95aacc 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -104,7 +104,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data' -defineOptions({ name: 'InspectionMain' }) +defineOptions({ name: 'inspectionMain' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 From 64b1853d8e9239f709c8be71b514f9a2ce2738eb Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 7 Aug 2024 16:14:13 +0800 Subject: [PATCH 06/14] =?UTF-8?q?HL-4976=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 2 +- .../purchasereturnRequestMain/index.vue | 4 + .../purchasereturnRequestMain.data.ts | 179 +++++++++--------- 3 files changed, 91 insertions(+), 94 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 3d408963f..c5db15323 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -58,7 +58,7 @@ export const getBalancePageReturn= async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/balance/senior', data }) + return await request.post({ url: '/wms/balance/seniorReturn', data }) } else { return await request.get({ url: `/wms/balance/pageReturn`, params }) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 773fcfd95..4a3a842db 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -304,6 +304,8 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro tableData.value.push(newRow) } }) + row['fromLocationCode'] = val[0]['locationCode'] + row['batch'] = val[0]['batch'] // row['inventoryBalance'] = val[0]['qty'] //库存余额 }else{ row[formField] = val[0][searchField] @@ -450,6 +452,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { } else if (formField == 'packingNumber'){ setV[formField] = val[0][searchField] setV['inventoryBalance'] = val[0]['qty'] + setV['batch'] = val[0]['batch'] + setV['fromLocationCode'] = val[0]['locationCode'] } else { setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 1132680fb..9d1aa60e0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1023,71 +1023,74 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm: { - enterSearch: true, - // labelMessage: '信息提示说明！！！', - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - message: '', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + tableForm:{ + disabled:true }, - // form: { - // componentProps:{ - // disabled:true - // } + // tableForm: { + // enterSearch: true, + // // labelMessage: '信息提示说明！！！', + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 // }, - form:{ - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - message: '', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + form: { + componentProps:{ + disabled:true } }, + // form:{ + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, hiddenInMain: true, isTable: false, }, @@ -1113,7 +1116,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchField: 'packingNumber', searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, + searchPage: BalanceApi.getBalancePageReturn, searchCondition: [{ key: 'itemCode', value: 'itemCode', @@ -1121,21 +1124,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:true - },{ - key: 'batch', - value: 'batch', - message: '请填写批次', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - // required:true, - isMainValue:true - },{ - key: 'locationCode', - value: 'fromLocationCode', - message: '请选择从库位代码', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:true - }], + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // // required:true, + // isMainValue:true + // } + ], verificationParams: [{ key: 'packingNumber', action: '==', @@ -1155,7 +1153,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchField: 'packingNumber', searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, + searchPage: BalanceApi.getBalancePageReturn, searchCondition: [{ key: 'itemCode', value: 'itemCode', @@ -1163,21 +1161,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:false - },{ - key: 'batch', - value: 'batch', - message: '请填写批次', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:false - },{ - key: 'locationCode', - value: 'fromLocationCode', - message: '请选择从库位代码', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:false - }], + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // required:true, + // isMainValue:false + // } + ], verificationParams: [{ key: 'packingNumber', action: '==', From d6ee0bd74f73d28341295d444cb69b32e17c7d96 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 7 Aug 2024 19:19:14 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=B4=BE=E6=80=BB-=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentSetting/requestsetting/requestsetting.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts index 9bdad8a12..f5272600e 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts @@ -99,7 +99,7 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'directCreateRecord', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isForm: false, + isForm: true, isTable: true, sort: 'custom', table: { From 5110ec46914ab66077f329b51e87b6d4896cfc17 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 20:54:45 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 5ee0e745c..05bbd18c6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -368,7 +368,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + type: 'datetimerange', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, form: { component: 'DatePicker', componentProps: { From f87307840f288848c846553ee67d236ee00d5633 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 8 Aug 2024 10:56:23 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 133 ++++---- .../inventorymoveRequestMain.data.ts | 321 ++++++++++++------ 2 files changed, 301 insertions(+), 153 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index d7c1d4a8c..ff388d3bd 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -182,7 +182,7 @@ else if( routeName.value == 'InventorymoveRequestMain'){ } console.log(99 , businessType.value) InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ - if(item.field == 'fromWarehouseCode') { + if(item.field == 'fromLocationCode') { if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ { @@ -249,30 +249,16 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ } else { delete item.tableForm.searchCondition } - } -}) -// 修改 tableform 属性 -InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { - if(item.field == 'fromPackingNumber') { - if (fromInventoryStatus.value) { + }else if(item.field == "toLocationCode"){ + if (toInventoryStatus.value) { item.tableForm.searchCondition = [ - { - key: 'businessType', - value: businessType.value , - isMainValue: false - }] - item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false - } - ] - } else if (fromInventoryStatus.value == null) { - item.tableForm.searchCondition = [ - { - key: 'businessType', - value: businessType.value , + },{ + key: 'isIn', + value: 'in', isMainValue: false }] item.form.componentProps.searchCondition = [ @@ -280,21 +266,21 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'businessType', value: businessType.value, isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false }] - } else { - delete item.tableForm.searchCondition - } - } - if(item.field == "toLocationCode"){ - if (toInventoryStatus.value) { + }} +}) +// 修改 tableform 属性 +InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { + if(item.field == 'fromPackingNumber') { + if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ { key: 'businessType', - value: businessType.value, - isMainValue: false - },{ - key: 'isIn', - value: 'in', + value: businessType.value , isMainValue: false }] item.form.componentProps.searchCondition = [ @@ -302,34 +288,70 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'businessType', value: businessType.value, isMainValue: false - },{ - key: 'isIn', - value: 'in', - isMainValue: false - }] - }else if (toInventoryStatus.value == null) { + } + ] + } else if (fromInventoryStatus.value == null) { item.tableForm.searchCondition = [ { key: 'businessType', value: businessType.value , isMainValue: false - },{ - key: 'isIn', - value: 'in', - isMainValue: false }] item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false - },{ - key: 'isIn', - value: 'in', - isMainValue: false }] + } else { + delete item.tableForm.searchCondition } } + // if(item.field == "toLocationCode"){ + // if (toInventoryStatus.value) { + // item.tableForm.searchCondition = [ + // { + // key: 'businessType', + // value: businessType.value, + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // item.form.componentProps.searchCondition = [ + // { + // key: 'businessType', + // value: businessType.value, + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // }else if (toInventoryStatus.value == null) { + // item.tableForm.searchCondition = [ + // { + // key: 'businessType', + // value: businessType.value , + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // item.form.componentProps.searchCondition = [ + // { + // key: 'businessType', + // value: businessType.value, + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // } + // } }) // 字段设置 更新主列表字段 @@ -351,7 +373,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['itemCode'] = item['itemCode'] newRow['fromBatch'] = item['batch'] newRow['fromInventoryStatus'] = item['inventoryStatus'] - newRow['fromLocationCode'] = item['locationCode'] + // newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] if(routeName.value == 'OktoholdRequestMain'){ @@ -376,16 +398,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} - if (formField == 'fromWarehouseCode') { + if (formField == 'fromLocationCode') { + setV['fromWarehouseCode'] = val[0]['warehouseCode']//从仓库 if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){ InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({ - key: 'warehouseCode', + key: 'locationCode', value: val[0]["code"], isMainValue: false }) } else { InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => { - if (item.key == 'warehouseCode') { + if (item.key == 'locationCode') { item.value = val[0]["code"] } }) @@ -406,7 +429,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['itemCode'] = val[0]['itemCode'] setV['fromBatch'] = val[0]['batch'] setV['fromInventoryStatus'] = val[0]['inventoryStatus'] - setV['fromLocationCode'] = val[0]['locationCode'] + // setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] if(routeName.value == 'OktoholdRequestMain'){ setV['toInventoryStatus'] = "HOLD" @@ -698,16 +721,11 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode) - if(findLocation){ - message.warning('从库位和到库位不能相同') - return - } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) ) - console.log(rs,5666); + let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) ) + console.log(rs,5666); if(rs.length > 1) isExist = true }) if (isExist) { @@ -715,7 +733,6 @@ const submitForm = async (formType, submitData) => { isExist = false return message.warning('包装号重复') } - flag.value = false data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 5899a7623..006019fc6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -72,14 +72,74 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + disabled: true + } + } + // tableForm: { + // enterSearch: true, + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择从仓库代码', + // searchField: 'code', + // searchTitle: '仓库基础信息', + // searchAllSchemas: Warehouse.allSchemas, + // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择从仓库代码', + // searchField: 'code', + // searchTitle: '仓库基础信息', + // searchAllSchemas: Warehouse.allSchemas, + // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, tableForm: { enterSearch: true, isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从仓库代码', + searchListPlaceholder: '请选择从库位代码', searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'out', + isMainValue: false + }], verificationParams: [{ key: 'code', action: '==', @@ -93,12 +153,87 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择从仓库代码', + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'out', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], verificationParams: [{ key: 'code', action: '==', @@ -133,7 +268,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ field: 'requestTime', formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -668,88 +803,87 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch: true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'in', - isMainValue: false - }], - isRepeat:true, - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'in', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '从库位代码', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '到库位代码', + // field: 'toLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // enterSearch: true, + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectBusinessTypeToLocation, + // searchCondition: [ + // { + // key: 'type', + // value: 'businessType', + // isMainValue: true + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectBusinessTypeToLocation, + // searchCondition: [ + // { + // key: 'type', + // value: 'businessType', + // isMainValue: true + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, { label: '从库存状态', field: 'fromInventoryStatus', @@ -921,9 +1055,6 @@ export const InventorymoveRequestDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], - fromPackingNumber: [ - { required: true, message: '请选择从包装号', trigger: 'change' } - ], fromInventoryStatus: [ { required: true, message: '请选择从库存状态', trigger: 'change' } ], From 06f6b2684e17c27a34f122cb84cbd631bd658fe3 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 8 Aug 2024 11:49:34 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=EF=BC=9A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=BA=94=E8=AF=A5=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 34afdd4b6..3fecca561 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -145,8 +145,8 @@ tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE, loginForm: { tenantName: tenantArray.value[0].name, - username: 'admin', - password: '123456', + username: '', + password: '', captchaVerification: '', rememberMe: false, code: '', From fed46cbc7b8f3d503e31968e54c11183bf93f828 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 8 Aug 2024 15:52:18 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 133 ++++---- .../inventorymoveRequestMain.data.ts | 321 ++++++------------ 2 files changed, 153 insertions(+), 301 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index ff388d3bd..d7c1d4a8c 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -182,7 +182,7 @@ else if( routeName.value == 'InventorymoveRequestMain'){ } console.log(99 , businessType.value) InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ - if(item.field == 'fromLocationCode') { + if(item.field == 'fromWarehouseCode') { if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ { @@ -249,16 +249,30 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ } else { delete item.tableForm.searchCondition } - }else if(item.field == "toLocationCode"){ - if (toInventoryStatus.value) { + } +}) +// 修改 tableform 属性 +InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { + if(item.field == 'fromPackingNumber') { + if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ + { + key: 'businessType', + value: businessType.value , + isMainValue: false + }] + item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false - },{ - key: 'isIn', - value: 'in', + } + ] + } else if (fromInventoryStatus.value == null) { + item.tableForm.searchCondition = [ + { + key: 'businessType', + value: businessType.value , isMainValue: false }] item.form.componentProps.searchCondition = [ @@ -266,21 +280,21 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ key: 'businessType', value: businessType.value, isMainValue: false - },{ - key: 'isIn', - value: 'in', - isMainValue: false }] - }} -}) -// 修改 tableform 属性 -InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { - if(item.field == 'fromPackingNumber') { - if (fromInventoryStatus.value) { + } else { + delete item.tableForm.searchCondition + } + } + if(item.field == "toLocationCode"){ + if (toInventoryStatus.value) { item.tableForm.searchCondition = [ { key: 'businessType', - value: businessType.value , + value: businessType.value, + isMainValue: false + },{ + key: 'isIn', + value: 'in', isMainValue: false }] item.form.componentProps.searchCondition = [ @@ -288,70 +302,34 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'businessType', value: businessType.value, isMainValue: false - } - ] - } else if (fromInventoryStatus.value == null) { + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }] + }else if (toInventoryStatus.value == null) { item.tableForm.searchCondition = [ { key: 'businessType', value: businessType.value , isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false }] item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false }] - } else { - delete item.tableForm.searchCondition } } - // if(item.field == "toLocationCode"){ - // if (toInventoryStatus.value) { - // item.tableForm.searchCondition = [ - // { - // key: 'businessType', - // value: businessType.value, - // isMainValue: false - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }] - // item.form.componentProps.searchCondition = [ - // { - // key: 'businessType', - // value: businessType.value, - // isMainValue: false - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }] - // }else if (toInventoryStatus.value == null) { - // item.tableForm.searchCondition = [ - // { - // key: 'businessType', - // value: businessType.value , - // isMainValue: false - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }] - // item.form.componentProps.searchCondition = [ - // { - // key: 'businessType', - // value: businessType.value, - // isMainValue: false - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }] - // } - // } }) // 字段设置 更新主列表字段 @@ -373,7 +351,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['itemCode'] = item['itemCode'] newRow['fromBatch'] = item['batch'] newRow['fromInventoryStatus'] = item['inventoryStatus'] - // newRow['fromLocationCode'] = item['locationCode'] + newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] if(routeName.value == 'OktoholdRequestMain'){ @@ -398,17 +376,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} - if (formField == 'fromLocationCode') { - setV['fromWarehouseCode'] = val[0]['warehouseCode']//从仓库 + if (formField == 'fromWarehouseCode') { if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){ InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({ - key: 'locationCode', + key: 'warehouseCode', value: val[0]["code"], isMainValue: false }) } else { InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => { - if (item.key == 'locationCode') { + if (item.key == 'warehouseCode') { item.value = val[0]["code"] } }) @@ -429,7 +406,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['itemCode'] = val[0]['itemCode'] setV['fromBatch'] = val[0]['batch'] setV['fromInventoryStatus'] = val[0]['inventoryStatus'] - // setV['fromLocationCode'] = val[0]['locationCode'] + setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] if(routeName.value == 'OktoholdRequestMain'){ setV['toInventoryStatus'] = "HOLD" @@ -721,11 +698,16 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode) + if(findLocation){ + message.warning('从库位和到库位不能相同') + return + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) ) - console.log(rs,5666); + let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) ) + console.log(rs,5666); if(rs.length > 1) isExist = true }) if (isExist) { @@ -733,6 +715,7 @@ const submitForm = async (formType, submitData) => { isExist = false return message.warning('包装号重复') } + flag.value = false data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 006019fc6..5899a7623 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -72,74 +72,14 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - form: { - componentProps: { - disabled: true - } - } - // tableForm: { - // enterSearch: true, - // isInpuFocusShow: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择从仓库代码', - // searchField: 'code', - // searchTitle: '仓库基础信息', - // searchAllSchemas: Warehouse.allSchemas, - // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // }, - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // enterSearch: true, - // isSearchList: true, - // searchListPlaceholder: '请选择从仓库代码', - // searchField: 'code', - // searchTitle: '仓库基础信息', - // searchAllSchemas: Warehouse.allSchemas, - // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // } - // } - }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, tableForm: { enterSearch: true, isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从库位代码', + searchListPlaceholder: '请选择从仓库代码', searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'out', - isMainValue: false - }], + searchTitle: '仓库基础信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.pageBusinessTypeToWarehouse, verificationParams: [{ key: 'code', action: '==', @@ -153,87 +93,12 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', + isSearchList: true, + searchListPlaceholder: '请选择从仓库代码', searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'out', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch: true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'in', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, - searchCondition: [ - { - key: 'type', - value: 'businessType', - isMainValue: true - },{ - key: 'isIn', - value: 'in', - isMainValue: false - }], + searchTitle: '仓库基础信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.pageBusinessTypeToWarehouse, verificationParams: [{ key: 'code', action: '==', @@ -268,7 +133,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ field: 'requestTime', formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -803,87 +668,88 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - // { - // label: '从库位代码', - // field: 'fromLocationCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm: { - // disabled: true - // }, - // form: { - // componentProps: { - // disabled: true - // } - // } - // }, - // { - // label: '到库位代码', - // field: 'toLocationCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm: { - // enterSearch: true, - // isInpuFocusShow: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择到库位代码', - // searchField: 'code', - // searchTitle: '库位信息', - // searchAllSchemas: Location.allSchemas, - // searchPage: LocationApi.selectBusinessTypeToLocation, - // searchCondition: [ - // { - // key: 'type', - // value: 'businessType', - // isMainValue: true - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }], - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // }, - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // enterSearch: true, - // isSearchList: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择到库位代码', - // searchField: 'code', - // searchTitle: '库位信息', - // searchAllSchemas: Location.allSchemas, - // searchPage: LocationApi.selectBusinessTypeToLocation, - // searchCondition: [ - // { - // key: 'type', - // value: 'businessType', - // isMainValue: true - // },{ - // key: 'isIn', - // value: 'in', - // isMainValue: false - // }], - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // } - // } - // }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + isRepeat:true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'type', + value: 'businessType', + isMainValue: true + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, { label: '从库存状态', field: 'fromInventoryStatus', @@ -1055,6 +921,9 @@ export const InventorymoveRequestDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], fromInventoryStatus: [ { required: true, message: '请选择从库存状态', trigger: 'change' } ], From 1e60826a46074503ffda0bae69e9a893519ccddb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 8 Aug 2024 16:21:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?WMS=E7=94=B5=E8=84=91=E7=AB=AF=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BF=9D=E6=8C=81=E4=B8=8D=E4=BD=8F?= =?UTF-8?q?---=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7-=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain/index.vue | 9 +++++---- .../purchasereceiptRecordMain/index.vue | 4 ++-- .../purchasereceiptRecordRefuseMain/index.vue | 4 ++-- .../purchasereceiptRequestMain/index.vue | 18 +++++++++++------- .../index.vue | 18 +++++++++++------- .../sparereceipt/sparereceiptJobMain/index.vue | 8 ++++---- 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 163060777..80dbd8b06 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -247,13 +247,14 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 拒收 handleClose(row.masterId) + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if(val == 'mainPlanCheckQualityReport'){ // 查看质检报告 checkQualityReport(row) @@ -277,7 +278,7 @@ const handleClose = async (id: number) => { await message.confirm(t('common.confirmColse')) await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } const resonSubmit = async (row)=>{ @@ -308,7 +309,7 @@ const handleRefusal = async (id: number,refuseReason:string) => { try { await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({id,refuseReason}) message.success(t('common.refusalSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 5cc9df20b..b51dbbefd 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -215,7 +215,7 @@ const handleCreatePutawayRequest = async (number:string) => { tableObject.loading = true await PurchasereceiptRecordMainApi.createPutawayRequest(number) message.success(t('ts.上架申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -228,7 +228,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await PurchasereceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue index da3542515..6ca6e1ef0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue @@ -204,7 +204,7 @@ const handleCreatePutawayRequest = async (number:string) => { tableObject.loading = true await PurchasereceiptRecordMainApi.createPutawayRequest(number) message.success(t('ts.上架申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -217,7 +217,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await PurchasereceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 2fe873942..d7dd91517 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -678,7 +678,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -691,7 +691,7 @@ const handleReAdd = async (id: number) => { tableObject.loading = true await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id) message.success(t('common.reAddSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -705,7 +705,7 @@ const handleAgree = async (id: number) => { await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -719,7 +719,7 @@ const handleRefused = async (id: number) => { await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -733,7 +733,7 @@ const handleHandle = async (id: number) => { await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -747,7 +747,7 @@ const handleSubmit = async (id: number) => { await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -819,7 +819,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue index 558faf3a5..d472bab8e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue @@ -607,7 +607,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -620,7 +620,7 @@ const handleReAdd = async (id: number) => { tableObject.loading = true await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id) message.success(t('common.reAddSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -634,7 +634,7 @@ const handleAgree = async (id: number) => { await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -648,7 +648,7 @@ const handleRefused = async (id: number) => { await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -662,7 +662,7 @@ const handleHandle = async (id: number) => { await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -676,7 +676,7 @@ const handleSubmit = async (id: number) => { await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -747,7 +747,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index 2c527f4ad..76e6d66a4 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -207,7 +207,7 @@ const handleExecuteSpare = async (id: number) => { await message.confirm("是否确认执行任务!") await PurchasereceiptJobMainApi.executePurchasereceiptJobMainSpare(id) message.success("执行成功") - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -217,7 +217,7 @@ const handleAbandon = async (id: number) => { await message.confirm("是否确认取消承接!") await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id) message.success("放弃成功") - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -227,7 +227,7 @@ const handleClose = async (id: number) => { await message.confirm(t('common.confirmColse')) await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -237,7 +237,7 @@ const handleAccept = async (id: number) => { await message.confirm("是否承接任务!") await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(id) message.success("承接成功") - await getList() + buttonBaseClick('refresh',null) } catch {} } // 获取部门 用于详情 部门回显 From 77b1a3c3489ef5192d0b93929ba8736491f42a71 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 8 Aug 2024 16:48:45 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueMain/index.vue | 20 +++++++++---------- .../purchasereturnJobMain/index.vue | 6 +++--- .../purchasereturnRequestMain/index.vue | 18 ++++++++++------- .../purchasereturnRequestSpareMain/index.vue | 18 ++++++++++------- .../putaway/putawayJobMain/index.vue | 6 +++--- .../putaway/putawayRequestMain/index.vue | 20 +++++++++++-------- 6 files changed, 50 insertions(+), 38 deletions(-) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index f9634c32c..8ea4298e2 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -347,7 +347,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -358,7 +358,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) PreparetoissueMainApi.generateIssueRequest(row.number) }).catch(err => { tableObject.loading = false @@ -370,7 +370,7 @@ const buttonTableClick = async (val, row) => { PreparetoissueMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -382,7 +382,7 @@ const buttonTableClick = async (val, row) => { await PreparetoissueMainApi.generateIssueRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -445,7 +445,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -514,7 +514,7 @@ const submitForm = async (formType, submitData) => { } else { await PreparetoissueMainApi.updatePreparetoissueMain(data) message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) } formRef.value.dialogVisible = false // 刷新当前列表 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index d2bd5a7e6..07e80cbb0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -200,13 +200,13 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await PurchasereturnJobMainApi.abandonPurchasereturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 handleClose(row.masterId) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await PurchasereturnJobMainApi.acceptPurchasereturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } @@ -216,7 +216,7 @@ const handleClose = async (id: number) => { await message.confirm(t('common.confirmColse')) await PurchasereturnJobMainApi.closePurchasereturnJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 4a3a842db..6c99b8e79 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -669,7 +669,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -683,7 +683,7 @@ const handleReAdd = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id) message.success(t('common.reAddSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -697,7 +697,7 @@ const handleAgree = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id) message.success(t('common.agreeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -711,7 +711,7 @@ const handleRefused = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id) message.success(t('common.refusedSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -725,7 +725,7 @@ const handleHandle = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -739,7 +739,7 @@ const handleSubmit = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id) message.success(t('common.submitSuccess')) - await getList() + buttonBaseClick('refresh',null) tableObject.loading = false } catch { } finally { @@ -951,7 +951,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue index 34084e7eb..bea529f22 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue @@ -619,7 +619,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -633,7 +633,7 @@ const handleReAdd = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id) message.success(t('common.reAddSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -647,7 +647,7 @@ const handleAgree = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id) message.success(t('common.agreeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -661,7 +661,7 @@ const handleRefused = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id) message.success(t('common.refusedSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -675,7 +675,7 @@ const handleHandle = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false @@ -689,7 +689,7 @@ const handleSubmit = async (id: number) => { tableObject.loading = true await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id) message.success(t('common.submitSuccess')) - await getList() + buttonBaseClick('refresh',null) tableObject.loading = false } catch { } finally { @@ -901,7 +901,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index c41b566a0..c4a0dd4b4 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -270,14 +270,14 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 await PutawayJobMainApi.abandonPutawayJobMain(row.masterId) - await getList() + buttonBaseClick('refresh',null) console.log('列表-操作按钮事件-放弃') } else if (val == 'mainJobClo') { // 关闭 handleClose(row.masterId) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await PutawayJobMainApi.acceptPutawayJobMain(row.masterId) - await getList() + buttonBaseClick('refresh',null) } else if (val == 'documentPrint') { // 单据打印 handleDocumentPrint(row) @@ -335,7 +335,7 @@ const handleClose = async (id: number) => { await message.confirm(t('common.confirmColse')) await PutawayJobMainApi.closePutawayJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 97f1b1c63..1223cadad 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -266,7 +266,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await PutawayRequestMainApi.closePutawayRequestMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -279,7 +279,7 @@ const handleReAdd = async (id: number) => { tableObject.loading = true await PutawayRequestMainApi.reAddPutawayRequestMain(id) message.success(t('common.reAddSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -292,7 +292,7 @@ const handleAgree = async (id: number) => { tableObject.loading = true await PutawayRequestMainApi.agreePutawayRequestMain(id) message.success(t('common.agreeSuccess')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -307,7 +307,7 @@ const handleRefused = async (id: number) => { await PutawayRequestMainApi.refusedPutawayRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -321,7 +321,7 @@ const handleHandle = async (id: number) => { await PutawayRequestMainApi.handlePutawayRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -335,7 +335,7 @@ const handleSubmit = async (id: number) => { await PutawayRequestMainApi.submitPutawayRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -393,7 +393,7 @@ const handleDelete = async (id: number) => { await PutawayRequestMainApi.deletePutawayRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -456,7 +456,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } From f8fe927bb7cbe0f1bb7206eb603b919e8bcaf2da Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Thu, 8 Aug 2024 21:09:10 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E3=80=81?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E5=92=8C=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/package/index.vue | 10 ++++---- .../inventoryManage/package/package.data.ts | 23 +++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index df0e9e8e9..8551bc8a0 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -89,9 +89,11 @@ const searchTableParams = ref([ // 查询页面返回 const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => { nextTick(() => { - const setV = {} - setV[formField] = val[0][searchField] - basicFormRef.setValues(setV) + const setV = {} + setV[formField] = val[0][searchField] + setV['itemName'] = val[0]['name'] + basicFormRef.setValues(setV) + basicFormRef.setValues(setV) }) } @@ -103,7 +105,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index ee72aae78..cd0625bf5 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; +import * as ItembasicApi from "@/api/wms/itembasic"; // 表单校验 export const PackageRules = reactive({ @@ -31,10 +33,27 @@ export const Package = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', - isSearch: true, table: { - width: 150, + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } }, + isSearch: true }, { label: '物料名称',