From 171dcb9bf452e887a35b17ee2db83c550fb42a59 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 21 Dec 2023 09:47:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 10 +++++----- src/views/aftersales/aftersalesWorkOrdermodify.vue | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 3e5efa02..3a8a1da0 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1561,11 +1561,11 @@ const IndexTable = val => { res.data.data.records.forEach(item => { console.log(item, 'item'); // 对为null的数据进行处理 - for (const property in item) { - if (item[property] == null) { - item[property] = '/'; - } - } + // for (const property in item) { + // if (item[property] == null) { + // item[property] = '/'; + // } + // } // 对状态进行处理 if (item.workOrderType == 1) { item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 96be3bca..8c17dc6a 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -1460,17 +1460,17 @@ const ConfirmForm = () => { DataSubmit['processorEntityList'].push({ businessName: warehouseData.value.find(obj => obj.value == item).label, //名称 businessId: warehouseData.value.find(obj => obj.value == item).value, //ID - workOrderId: $route.query.id, //异常工单ID + workOrderId: $route.query.id=='/'?'':$route.query.id, //异常工单ID conditions: 1, //状态 1正常 2新增 3取消 typesOf: 2, //1 责任方 2 处理方 warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, //仓库ID - processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理 + processingStatus: $route.query.ProcessType=='/'?'':$route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理 }); }); // 新增处理方要携带调查经过 DataSubmit.surveyRecordDTO = { content: Indexform.value.investigationProcess, //内容' - workOrderId: $route.query.id, //工单ID + workOrderId: $route.query.id =='/'?'':$route.query.id, //工单ID // pictureUrl: KFfeel.value.join(','), //附件路径 }; } @@ -1549,7 +1549,7 @@ const ConfirmForm = () => { money: Number(item.num), // 金额 reasonArbitration: item.reason, // 说明 workOrderId: $route.query.id, // 异常工单 - warehouseId: $route.query.warehouseId, // 仓库ID + warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID }); } else { DataSubmit['completionRecipientEntities'].push({ @@ -1565,7 +1565,7 @@ const ConfirmForm = () => { .join(',') ) .join(','), - warehouseId: $route.query.warehouseId, // 仓库ID + warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID workOrderId: $route.query.id, //异常工单 }); } From d15359f5fea8589634c927ab75d0f186c4877fda Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 21 Dec 2023 10:09:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrderAdd.vue | 4 ++++ vite.config.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 30f49d2a..4cc607e7 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1102,6 +1102,10 @@ const Statistics = () => { // 查询包件信息自动回显 const ChangePackageInfo = (val, index) => { + if(!val){ + return + // 如果输入框里面没有值就不请求 + } PackageInfo.value[index].orderCode = ''; //订单自编码 PackageInfo.value[index].waybillNumber = ''; //运单号 PackageInfo.value[index].orderId = ''; //运单号 diff --git a/vite.config.js b/vite.config.js index 6353e045..f18c7559 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,7 @@ export default ({ mode, command }) => { '/api': { // target: 'http://192.168.10.126:8889', // hy - target: 'http://192.168.10.48:13000', + // target: 'http://192.168.10.48:13000', // lmy // target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.101:8888', @@ -25,7 +25,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.6.122:8777', // target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.57:13000', - // target: 'http://192.168.6.122:8777', + target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', // tjj // sst From ce983a86cba9f5f87eda731d542b0692188b3b86 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 21 Dec 2023 10:09:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 7 ++++--- .../reservation/reservationAddFrom.vue | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 39c59ef0..18e858b4 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -171,7 +171,7 @@ -
+
勾选合计: {{ item.label + ':' }} @@ -502,7 +502,7 @@ function timeclear(value, column: TableColumnType) { } function handleDelete(index: number, row: TableDataType) {} const getSummaries = (param: any) => { - selectCount.value = []; + const _arr = []; const { columns, data } = param; let newarr = []; let tji = 0; @@ -518,7 +518,7 @@ const getSummaries = (param: any) => { tji = computeNumber(tji, '+', Number(ite[props.columnList[index]?.prop] || 0)).result; } newarr[index] = tji; - selectCount.value.push({ + _arr.push({ label: props.columnList[index]?.label, value: 0, prop: props.columnList[index]?.prop, @@ -528,6 +528,7 @@ const getSummaries = (param: any) => { newarr[index] = null; } }); + selectCount.value = _arr; // console.log(columns) return newarr; }; diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 1dee04ba..d4c8e3a2 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -715,6 +715,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -726,6 +727,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -737,6 +739,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -935,6 +938,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, { @@ -945,6 +949,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, /* { @@ -975,6 +980,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, @@ -1017,6 +1023,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -1037,6 +1044,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, { @@ -1077,7 +1085,7 @@ export default { label: '序号', type: 0, values: '', - width: '50', + width: '55', checkarr: [], fixed: false, sortable: true, @@ -1235,6 +1243,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -1246,6 +1255,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, { @@ -1497,6 +1507,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, { @@ -1507,6 +1518,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, /* { @@ -1537,6 +1549,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, { @@ -1548,6 +1561,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, @@ -1599,6 +1613,7 @@ export default { width: '130', checkarr: [], fixed: false, + isshowSummary: true, sortable: true, }, { @@ -1808,6 +1823,7 @@ export default { checkarr: [], fixed: false, sortable: true, + isshowSummary: true, head: false, }, {