From 5939b6b87af99fce7523e636e1b9825d21bf1ed6 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 1 Feb 2024 16:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/aftersales/vueTvemp.js | 28 ++++---- src/router/views/index.js | 32 ++++----- src/utils/util.js | 24 ++----- src/views/aftersales/aftersalesWorkOrder.vue | 72 +++++++++++++------ .../aftersales/aftersalesWorkOrderAdd.vue | 33 +++++++-- .../distributionDeliveryListdis.vue | 2 +- .../inventory/distrilbutionBillLadingList.vue | 18 ++++- .../signdetail/packageNodeSearch.vue | 3 + 8 files changed, 136 insertions(+), 76 deletions(-) diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 9547a88b..ae7e54c4 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -138,7 +138,7 @@ export const columnList = [ { prop: 'totalAmount', label: '赔款金额', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -149,7 +149,7 @@ export const columnList = [ { prop: 'entryTime', label: '财务入账时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -171,7 +171,7 @@ export const columnList = [ { prop: 'deliverGoodsTime', label: '送货时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -183,7 +183,7 @@ export const columnList = [ { prop: 'discoveryTime', label: '发现时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -194,7 +194,7 @@ export const columnList = [ { prop: 'warehousingTime', label: '入库时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -206,7 +206,7 @@ export const columnList = [ { prop: 'deliveryTime', label: '配送时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -254,7 +254,7 @@ export const columnList = [ { prop: 'overTime', label: '完结时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -265,7 +265,7 @@ export const columnList = [ { prop: 'problemDescription', label: '异常问题描述', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -287,7 +287,7 @@ export const columnList = [ { prop: 'processNumber', label: '钉钉流程号', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -309,7 +309,7 @@ export const columnList = [ { prop: 'auditTime', label: '审核时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -322,7 +322,7 @@ export const columnList = [ { prop: 'remarks', label: '备注', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -814,7 +814,7 @@ export const timeoutList = [ head: false, }, { - prop: 'workOrderTypeName', + prop: 'workOrderTypeNameS', label: '异常类型', type: 3, values: '', @@ -825,7 +825,7 @@ export const timeoutList = [ head: false, }, { - prop: 'discoveryNodeName', + prop: 'discoveryNodeNameS', label: '发现节点名称', type: 3, values: '', @@ -840,7 +840,7 @@ export const timeoutList = [ { prop: 'money', label: '金额', - type: 2, + type: 1, values: '', width: '130', checkarr: [], diff --git a/src/router/views/index.js b/src/router/views/index.js index 3d284675..9eb9d47d 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1247,22 +1247,22 @@ export default [ ], }, - { - path: '/aftersales/aftersalesWorkOrder', - component: Layout, - redirect: '/aftersales/aftersalesWorkOrder', - children: [ - { - meta: { - i18n: 'dict', - keepAlive: false, - }, - path: '/aftersales/aftersalesWorkOrder', - name: '工单', - component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), - }, - ], - }, + // { + // path: '/aftersales/aftersalesWorkOrder', + // component: Layout, + // redirect: '/aftersales/aftersalesWorkOrder', + // children: [ + // { + // meta: { + // i18n: 'dict', + // keepAlive: false, + // }, + // path: '/aftersales/aftersalesWorkOrder', + // name: '工单', + // component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), + // }, + // ], + // }, { path: '/aftersales/aftersalesWorkOrderAdd', component: Layout, diff --git a/src/utils/util.js b/src/utils/util.js index 064a569f..7fb7b0bc 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -511,51 +511,35 @@ export const setNodeHeight = (_node, _height = '') => { const updateDetailQuery = (index, propName, detailsQuery) => { if (index) { detailsQuery[propName] = index; // 设置属性值 - console.log(`Property set: ${propName} = ${index}`); - } else { + } else { if(detailsQuery.hasOwnProperty(propName)) { delete detailsQuery[propName]; // 确保删除属性 - console.log(`Property deleted: ${propName}`); + } else { - console.log(`Property to delete not found: ${propName}`); + } } }; - // 处理 row 属性并更新 details.query export const processRowProperty = (index, row, details) => { console.log(`Processing: ${row.prop}`); - console.log(`Processing: ${row.prop}`); - console.log('Current details.query before processing:', details.query); - - // 先前匹配和删除的代码 ... - - console.log('Current details.query after processing:', details.query); if (typeof row.prop === 'string') { const nameRegex = /([a-zA-Z0-9_]+)NameS$/; const match = row.prop.match(nameRegex); - if (match) { const basePropName = match[1]; - console.log(`Matched: ${basePropName}`); - const fullPropNameS = basePropName + 'NameS'; - console.log(`Full property name with 'NameS': ${fullPropNameS}`); if (details.query.hasOwnProperty(fullPropNameS)) { delete details.query[fullPropNameS]; - console.log(`Property '${fullPropNameS}' deleted`); } else { - console.log(`Property '${fullPropNameS}' not found for deletion`); } - updateDetailQuery(index, basePropName, details.query); } else { - console.log(`No 'NameS' ending found for ${row.prop}`); updateDetailQuery(index, row.prop, details.query); } } else { - console.log(`row.prop is not a string`); + } }; diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 103bc476..c37914e4 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -14,16 +14,26 @@ - +
+ + + + + +
+ + + + + + + + { // 车次号自动带出时间司机 function DeliveryTrainnumber() { + console.log(Indexform.value.trainNumber,'车次号'); + if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) { Indexform.value.deliveryTime = null; Indexform.value.deliveryDriver = ''; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index cab9c1c1..b25d888e 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -963,7 +963,7 @@ export default { } ElMessageBox.confirm( '是否取消配送?', - 'Warning', + '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 9a6e514d..23a585b9 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -257,7 +257,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; import { getToken } from '@/utils/auth'; import dayjs from 'dayjs'; import { downloadXls } from '@/utils/util'; - +import { ElMessage, ElMessageBox } from 'element-plus' export default { data() { return { @@ -883,6 +883,16 @@ export default { this.$message.warning('请选择至少一条数据'); return; } + ElMessageBox.confirm( + '是否取消该任务?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { // 批量取消 let data={ billLodingIds:'' @@ -897,6 +907,12 @@ export default { }).finally(()=>{ this.loading=false;//关闭加载 }) + }) + .catch(() => { + + }) + + }, //签收 handleSign(row, num) { diff --git a/src/views/distribution/signdetail/packageNodeSearch.vue b/src/views/distribution/signdetail/packageNodeSearch.vue index 68643197..55b278ba 100644 --- a/src/views/distribution/signdetail/packageNodeSearch.vue +++ b/src/views/distribution/signdetail/packageNodeSearch.vue @@ -19,6 +19,9 @@ + + +