From ae267579325d8e93f37a1f4c6944c6319d58f65e Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 16 Dec 2023 01:12:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A2=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 20 + src/option/aftersales/vueTvemp.js | 23 +- src/router/views/index.js | 24 +- src/views/aftersales/aftersalesWorkOrder.vue | 10 +- .../aftersales/aftersalesWorkOrderAdd.vue | 8 +- .../aftersales/aftersalesWorkOrderInfo.vue | 500 ++- .../aftersales/aftersalesWorkOrderend.vue | 346 +- .../aftersales/aftersalesWorkOrdermodify.vue | 2855 ++++++++++------- 8 files changed, 2250 insertions(+), 1536 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 7e45a83a..9c8e5aad 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -313,4 +313,24 @@ export const $_arbitrateEnd = (data) => { method: 'post', data }) +} + +// 查询处理记录 +export const $_getTrackRecord = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/getTrackRecord', + method: 'get', + params + }) +} + + + +// 修改工单数据 +export const $_modifyData = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/submit', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 8cd484c3..a702d328 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -306,7 +306,7 @@ export const columnList = [ export const recordList = [ { - prop: 'entryTime', + prop: 'createTime', label: '跟进时间', type: 1, values: '', @@ -317,7 +317,7 @@ export const recordList = [ head: false, }, { - prop: 'entryTime', + prop: 'followWarehouseName', label: '跟进仓库', type: 1, values: '', @@ -328,7 +328,7 @@ export const recordList = [ head: false, }, { - prop: 'entryTime', + prop: 'addDepartment', label: '跟进人', type: 1, values: '', @@ -339,7 +339,7 @@ export const recordList = [ head: false, }, { - prop: 'entryTime', + prop: 'processingResults', label: '处理结果', type: 1, values: '', @@ -350,7 +350,7 @@ export const recordList = [ head: false, }, { - prop: 'entryTime', + prop: 'remark', label: '备注', type: 1, values: '', @@ -361,7 +361,7 @@ export const recordList = [ head: false, }, { - prop: 'entryTime', + prop: 'pictureUrl', label: '图片', type: 1, values: '', @@ -371,17 +371,6 @@ export const recordList = [ sortable: false, head: false, }, - { - prop: 'entryTime', - label: '更新日志', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: false, - head: false, - }, ] diff --git a/src/router/views/index.js b/src/router/views/index.js index 3b05b17c..d67ccfa4 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1203,18 +1203,18 @@ export default [ ], }, - // { - // path: '/aftersales/VueTemp', - // component: Layout, - // redirect: '/aftersales/VueTemp', - // children: [ - // { - // path: '/aftersales/VueTemp', - // name: '工单', - // component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), - // }, - // ], - // }, + { + path: '/aftersales/aftersalesWorkOrder', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrder', + children: [ + { + path: '/aftersales/aftersalesWorkOrder', + name: '异常工单', + component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), + }, + ], + }, { path: '/aftersales/aftersalesWorkOrderAdd', component: Layout, diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 1f95b6e6..e3b5152f 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -158,16 +158,16 @@
- 查看 - 申诉 + > -->
修改金额 { page.value.total = res.data.data.total; //总页数 if (res.data.data.records.length) { res.data.data.records.forEach(item => { + console.log(item,'item'); // 对为null的数据进行处理 for (const property in item) { if (item[property] == null) { diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 77dc32d1..d592a902 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -44,7 +44,7 @@
- 总件数:{{ Indexform.number }} + 总件数:{{ PackageInfo.length }}
@@ -269,6 +269,11 @@ + + + + + @@ -1119,6 +1124,7 @@ const ViewPackageDetails = val => { margin-left: 20px; font-size: 14px; width: 100px !important; + justify-content: flex-start; } .el-form-item { margin: 0; diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 18ce73b9..6282e06c 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1,17 +1,8 @@