From a763ba151c2595bda29304b381affee67c16cc59 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 26 Sep 2024 08:49:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=B8=85=E7=A9=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 21670b425..17f14e1e6 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -59,6 +59,7 @@ @submitForm="submitForm" @onEnter="onEnter" @inputNumberChange="inputNumberChange" + @clearSearchInput="clearSearchInput" /> @@ -725,7 +726,23 @@ const handleDeleteTable = (item, index) => { const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } - +const clearSearchInput = (field)=>{ + console.log('field',field) + if('customerCode' == field){ + //客户代码 + formRef.value.formRef.setValues({ + deliverRecordNumber: '', + customerDockCode:'', + }) + tableData.value = [] + }else if('deliverRecordNumber' == field){ + //发货记录单号 + formRef.value.formRef.setValues({ + customerDockCode:'', + }) + tableData.value = [] + } +} //为true表示子表数据中存在数量为0的数据 const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ From 14a6e3490a43f43b5342b2bedb12b4dedbd35e3d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 26 Sep 2024 09:22:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?HL-6135=E5=92=8C=E5=96=9C=E5=A9=B7=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AE=A2=E6=88=B7=E6=9C=88?= =?UTF-8?q?=E5=8F=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 88 +++++++++---------- .../customerreturnRequestMain/index.vue | 24 ++--- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index f74036ea5..26c490e43 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -256,50 +256,50 @@ export const CustomerreturnRequestMain = useCrudSchemas( } } }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户月台信息', // 查询弹窗标题 - searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'customerCode', - value: 'customerCode', - message: '请填写客户代码！', - isMainValue: true - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, + // { + // label: '客户月台代码', + // field: 'customerDockCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '客户月台信息', // 查询弹窗标题 + // searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 + // searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }, + // { + // key: 'customerCode', + // value: 'customerCode', + // message: '请填写客户代码！', + // isMainValue: true + // } + // ], + // verificationParams: [ + // { + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true + // } + // ] // 失去焦点校验参数 + // } + // } + // }, { label: '承运商', field: 'carrierCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 17f14e1e6..cff712b57 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -211,7 +211,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['deliverRecordNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] // setV['customerCode'] = val[0]['customerCode'] - setV['customerDockCode'] = val[0]['customerDockCode'] + // setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn({pageSize:999,masterId:val[0]['masterId']}).then(res => { @@ -570,10 +570,10 @@ const openForm =async (type: string, row?: number) => { item.componentProps.isSearchList = false, item.componentProps.disabled = true } - if(item.field == 'customerDockCode'){ - item.componentProps.isSearchList = false, - item.componentProps.disabled = true - } + // if(item.field == 'customerDockCode'){ + // item.componentProps.isSearchList = false, + // item.componentProps.disabled = true + // } }) }else { CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => { @@ -583,9 +583,9 @@ const openForm =async (type: string, row?: number) => { if(item.field == 'customerCode'){ item.componentProps.isSearchList = true } - if(item.field == 'customerDockCode'){ - item.componentProps.isSearchList = true - } + // if(item.field == 'customerDockCode'){ + // item.componentProps.isSearchList = true + // } }) CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => { if(itemDetail.field == 'packingNumber'){ @@ -732,14 +732,14 @@ const clearSearchInput = (field)=>{ //客户代码 formRef.value.formRef.setValues({ deliverRecordNumber: '', - customerDockCode:'', + // customerDockCode:'', }) tableData.value = [] }else if('deliverRecordNumber' == field){ //发货记录单号 - formRef.value.formRef.setValues({ - customerDockCode:'', - }) + // formRef.value.formRef.setValues({ + // customerDockCode:'', + // }) tableData.value = [] } } From 0a8d1a8aeb99a62442ec2c4226fd1af097a9e566 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 26 Sep 2024 10:31:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRecordMOrderTypeMain/index.vue | 4 ++-- .../purchasereturn/purchasereturnRecordMain/index.vue | 4 ++-- .../purchasereturnRequestMOrderTypeMain/index.vue | 2 +- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- .../purchasereturn/purchasereturnRequestMainNew/index.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue index 9e4eb4be9..0f06827f3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue @@ -143,7 +143,7 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.requestNumber,row.itemCode) + handleDocumentPrint(row.number,row.itemCode) } } @@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (requestNumber,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record') } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 4a4db0820..8dfa91796 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -143,7 +143,7 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.requestNumber,row.itemCode) + handleDocumentPrint(row.number,row.itemCode) } } @@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (requestNumber,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record') } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index fe72a010c..7bf47d7e8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -637,7 +637,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode+'&reqType=request') } /** 添加/修改操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 58b7ad142..02e56721a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -623,7 +623,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') } /** 添加/修改操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index 81e824a23..cf11e26b5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -539,7 +539,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') } /** 添加/修改操作 */