From 1e2b08435d4ef6e44201d0d92a4484241ddc6c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 17 Aug 2024 13:22:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=20Q3=E6=94=BE=E5=A4=A7?= =?UTF-8?q?=E9=95=9C=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20HL-536?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspectionQ2/inspectionQ2.data.ts | 94 ++++++++++--------- .../qms/inspectionQ3/inspectionQ3.data.ts | 89 +++++++++--------- 2 files changed, 93 insertions(+), 90 deletions(-) diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index f62948b2a..2e2f6a883 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -49,50 +49,7 @@ export const Q2 = useCrudSchemas( fixed: 'left' } }, - { - label: 'Q1通知单号', - field: 'q1Number', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - multiple: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: 'Q1通知单', // 查询弹窗标题 - searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'status', - value: '0', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'number', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - }, - isSearch: true - }, + { label: '状态', field: 'status', @@ -380,6 +337,7 @@ export const Q2 = useCrudSchemas( } } }, + { label: '索赔日期', field: 'claimTime', @@ -422,6 +380,50 @@ export const Q2 = useCrudSchemas( } } }, + { + label: 'Q1通知单号', + field: 'q1Number', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + multiple: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: 'Q1通知单', // 查询弹窗标题 + searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + }, + isSearch: true + }, { label: '描述', field: 'desc', @@ -473,8 +475,8 @@ export const Q2 = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '操作', diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 7a466a93c..3a3bea419 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -48,50 +48,7 @@ export const InspectionQ3Main = useCrudSchemas( fixed: 'left' } }, - { - label: 'Q1通知单号', - field: 'q1Number', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - multiple: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: 'Q1通知单', // 查询弹窗标题 - searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'status', - value: '0', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'number', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, + { label: '负责用户', field: 'responUser', @@ -157,6 +114,50 @@ export const InspectionQ3Main = useCrudSchemas( } } }, + { + label: 'Q1通知单号', + field: 'q1Number', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + multiple: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: 'Q1通知单', // 查询弹窗标题 + searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, { label: '描述', field: 'desc', From dd397d848115304311e2be8cdf1d645e4252eebf Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 17 Aug 2024 13:31:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?HL-5267=20=E7=89=A9=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=8C=BA=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/itemManage/itemarea/itemarea.data.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index df0380761..98b205c6f 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -446,8 +446,14 @@ export const Itemarea = useCrudSchemas(reactive([ label: '超过高储是否允许叫料', field: 'allowIssueRequest', sort: 'custom', + isSearch: false, dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', + // colorType: 'danger', + isTable: true, + table: { + width: 150 + }, form: { component: 'Switch', value: 'TRUE', @@ -456,7 +462,6 @@ export const Itemarea = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, - isTable: false }, // { // label: '优先空库位', @@ -771,7 +776,7 @@ export const ItemareaDetail = useCrudSchemas(reactive([ isFormModel: true, }], verificationPage: LocationApi.getLocationByCodes, // 校验数去焦点输入是否正确的方法 - isShowTableFormSearch: true, // + isShowTableFormSearch: true, // }, form: { // labelMessage: '信息提示说明！！！', From 5402d458754a91c0006dbff315399289f88ba2ec Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Sat, 17 Aug 2024 13:51:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 89fd1cf7c..d9341133d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -48,6 +48,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isSearch: false, sortTableDefault:3 }, + { + label: '明细备注', + field: 'remark', + sort: 'custom', + table: { + width: 180 + }, + isSearch: false, + sortTableDefault:3 + }, { label: '发货单号', field: 'asnNumber', From b1047d08a01795a51f4d13e8c1bf2fc878566b77 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 17 Aug 2024 14:05:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRecordSpareMain/index.vue | 5 +++-- .../purchasereturnRequestSpareMain/index.vue | 3 ++- .../purchasereceiptManage/putaway/putawayJobMain/index.vue | 3 ++- .../putaway/putawayRecordMain/index.vue | 3 ++- .../putaway/putawayRequestMain/index.vue | 3 ++- .../sparereceipt/sparereceiptJobMain/index.vue | 3 ++- .../sparereceipt/sparereceiptRecordMain/index.vue | 3 ++- .../sparereceipt/sparereceiptRequestMain/index.vue | 3 ++- .../purchaseclaim/purchaseclaimRecordMain/index.vue | 3 ++- .../purchaseclaim/purchaseclaimRequestMain/index.vue | 3 ++- 10 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue index a2ec773c7..f3f07b615 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue @@ -169,12 +169,13 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) if(routeName.value.includes('SCP')){ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue index a5de550cc..8469b9ea0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue @@ -706,10 +706,11 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare( tableObject.params ) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index 7dee1ed75..9990aa9ee 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -348,8 +348,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 9aa5e6792..c8257f4de 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -211,8 +211,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index ad499e129..504cdafcf 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -406,8 +406,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index b32591516..86414352e 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -259,8 +259,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index 0682aad0b..072018567 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -160,8 +160,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 8020ef79d..d738b2fc8 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -560,8 +560,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue index 6784b9653..07ce15882 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue @@ -156,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 3b4377640..9456dc032 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -414,8 +414,9 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params) - download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false From 125e02fbb3eaf41834c0f67fa9f5f0ab56cfed9e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 17 Aug 2024 14:28:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5075=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRequestMain/index.ts | 5 +++++ .../purchasereturn/purchasereturnRequestMainNew/index.vue | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts index 6ec472016..880ce56a3 100644 --- a/src/api/wms/purchasereturnRequestMain/index.ts +++ b/src/api/wms/purchasereturnRequestMain/index.ts @@ -101,6 +101,11 @@ export const importTemplateSpare = () => { return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-spare' }) } +// 下载用户导入模板(新) +export const importTemplateNew = () => { + return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-new' }) +} + // 关闭采购退货申请主 Excel export const closePurchasereturnRequestMain = async (id) => { return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index d065fb8d6..749c144f9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -1057,6 +1057,6 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row) /** 初始化 **/ onMounted(async () => { getList() - importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate() + importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew() }) From 24116266bfa0544b8db1066c80671a6450fd0d97 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 17 Aug 2024 14:29:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5075=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMainNew/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index 749c144f9..dd8f6193d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -133,7 +133,7 @@ Date: Sat, 17 Aug 2024 14:43:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7-=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMainNew/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index b89d456ce..d2261df0b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -803,8 +803,8 @@ const onChangeForm = async (field, cur, formRef)=>{ }) }else if(field == 'locationCode' || field == 'itemCode'){ // 退货库位 获取明细列表 - let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode - let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode + let itemCode = formRef.formModel?formRef.formModel.itemCode:formRef.value.formModel.itemCode + let fromLocationCode = formRef.formModel?formRef.formModel.locationCode:formRef.value.formModel.locationCode if(!itemCode||!fromLocationCode){ return }