From 8cde2c0e5b2ec13c7ded6cfb045d18a21d161ce1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 11:17:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-1355=E6=96=B0=E5=A2=9E=EF=BC=8C=E9=A1=BA?= =?UTF-8?q?=E5=BC=95=E5=8D=95=E6=8D=AE=E5=8F=B7=E3=80=81=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E5=BA=94=E6=9C=89=E8=BE=93=E5=85=A5=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 6 ++++-- .../inducedProduct/deliverRecordMain/index.vue | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 8f0e4322d..5da600857 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -526,7 +526,8 @@ export const DeliverRecordMainRules = reactive({ { required: true, message: '请选择发运时间', trigger: 'blur' } ], billNo: [ - { required: true, message: '请输入顺引单据号', trigger: 'blur' } + { required: true, message: '请输入顺引单据号', trigger: 'blur' }, + { max: 18, message: '字符不得超过18位', trigger: 'blur' }, ] }) @@ -1015,7 +1016,8 @@ export const DeliverRecordDetailRules = reactive({ { required: true, message: '请输入数量', trigger: 'blur' } ], serialNo: [ - { required: true, message: '请输入顺序号', trigger: 'blur' } + { required: true, message: '请输入顺序号', trigger: 'blur' }, + { max: 64, message: '字符不得超过64位', trigger: 'blur' }, ], classes: [ { required: true, message: '请选择班次', trigger: 'blur' } diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 7f7ccf528..3d481bad0 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -394,6 +394,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) => { + console.log(type) if (type == 'tableForm') { if(formField == 'itemCode') { const tableFormKeys = {} @@ -413,10 +414,14 @@ const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) newRow['id'] = item['id'] tableData.value.push(newRow) }) - }else{ + } else { row[formField] = val[0][searchField] } - } + }else if(formField == 'customerCode'){ + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } } From 96c8f0c2a8201b41c4ef082ca28674c20f5270f3 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 29 Nov 2024 11:17:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-1362=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BC=BA=E5=B0=91=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseClaimRecordMain/index.ts | 9 +++++++-- .../purchaseClaim/purchaseClaimRecord/index.vue | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchaseClaimRecordMain/index.ts b/src/api/wms/purchaseClaimRecordMain/index.ts index 257144e5c..d291715ad 100644 --- a/src/api/wms/purchaseClaimRecordMain/index.ts +++ b/src/api/wms/purchaseClaimRecordMain/index.ts @@ -60,10 +60,15 @@ export const rejectPurchaseClaimRecordMain = async (id: number) => { // 导出采购索赔主 Excel export const exportPurchaseClaimRecordMain = async (params) => { - return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchaseClaim-record-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchaseClaim-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue index 9da9ec473..6b1f47fce 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue @@ -181,7 +181,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: `wms:purchaseClaimRecord:create` }), // 新增 defaultButtons.defaultImportBtn({ hasPermi: `wms:purchaseClaimRecord:import` }), // 导入 - defaultButtons.defaultExportBtn({ hasPermi: `wms:purchaseClaimRecord:export` }), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置