From fa3f76ae5ae995e4573e32219c3608f7bac0bac1 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 25 Oct 2024 11:22:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E9=85=8D=E8=BD=BD=E8=B7=AF=E7=BA=BF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/artery/AddVehicleStowage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index 58c64a92..dfcd21f1 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -2705,6 +2705,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => { // 步骤条 :deep(.el-steps) { flex-wrap: wrap; + width: 100%; } :deep(.el-step.is-horizontal) { From 337b54379613215f36db68a0a9a0f7736a1dee52 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 25 Oct 2024 13:55:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/finance/WaybillAudit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue index 3d9898ec..293af583 100644 --- a/src/views/finance/WaybillAudit.vue +++ b/src/views/finance/WaybillAudit.vue @@ -395,7 +395,7 @@ const initData = async () => { // 服务类型 getDictionaryBiz('distribution_type').then(res => handleData('服务类型', res)), // 送货方式 - getDictionaryBiz('mainline_waybill_shippingmethod').then(res => handleData('服务类型', res)), + getDictionaryBiz('mainline_waybill_shippingmethod').then(res => handleData('送货方式', res)), // 支付方式 getDictionaryBiz('open_order_pay_type').then(res => handleData('支付方式', res)), // 付款方式 From 8d7ac24d55805c35460e71b0a513e58e4670aa95 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 25 Oct 2024 21:01:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=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 | 18 +- src/views/aftersales/aftersalesWorkOrder.vue | 42 +- .../aftersales/aftersalesWorkOrderAdd.vue | 3 - .../aftersales/aftersalesWorkOrderInfo.vue | 2 +- .../aftersales/aftersalesWorkOrderTemp.vue | 721 ++++++++++++++++++ 6 files changed, 783 insertions(+), 31 deletions(-) create mode 100644 src/views/aftersales/aftersalesWorkOrderTemp.vue diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index f600ff19..2ba92f21 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -19,7 +19,7 @@ export const columnList = [ label: '异常类型', type: 3, values: '', - width: '110', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -30,7 +30,7 @@ export const columnList = [ label: '发现节点', type: 3, values: '', - width: '110', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -41,23 +41,23 @@ export const columnList = [ label: '异常工单号', type: 13, values: '', - width: '120', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'packageCode', + label: '包条码', + type: 2, + values: '', + width: '150', checkarr: [], fixed: false, sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { prop: 'waybillNumber', label: '运单号', diff --git a/src/router/views/index.js b/src/router/views/index.js index 74f545e3..14fa626b 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1436,7 +1436,23 @@ export default [ }, ], }, - + { + path: '/aftersales/aftersalesWorkOrderTemp', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrderTemp', + children: [ + { + meta: { + i18n: 'dict', + keepAlive: true, + }, + path: '/aftersales/aftersalesWorkOrderTemp', + name: '工单模板', + component: () => import('@/views/aftersales/aftersalesWorkOrderTemp.vue'), + }, + ], + }, + { path: '/aftersales/aftersalesWorkOrderInfo', component: Layout, diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 64bf9867..7b0a6070 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -396,7 +396,7 @@ @size-change="sizeChange" @current-change="currentChange" :current-page="page.currentPage" - :page-sizes="[30, 50, 80, 120]" + :page-sizes="page.pageSizesList" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total" @@ -1257,16 +1257,16 @@ const AppealeditorState = ref(false); //申诉是否为编辑状态(默认否) const AppealStatusT = ref(false); //是否为申诉列表 const loadingCustomer = ref(false); //客服介入弹窗加载 const TabList = ref([ - { name: 0, label: '全部', state: true, request: true, DataList: [], total: '' }, - { name: 8, label: '待回复', state: false, request: true, DataList: [], total: '' }, - { name: 3, label: '待处理(新建)', state: true, request: true, DataList: [], total: '' }, - { name: 1, label: '处理中', state: true, request: true, DataList: [], total: '' }, - { name: 4, label: '理赔金额未出', state: true, request: true, DataList: [], total: '' }, - { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: '' }, - { name: 5, label: '客服介入', state: true, request: true, DataList: [], total: '' }, - { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' }, - { name: 6, label: '完结', state: true, request: true, DataList: [], total: '' }, - { name: 7, label: '超时未处理', state: true, request: true, DataList: [], total: '' }, + { name: 0, label: '全部', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50,}, + { name: 8, label: '待回复', state: false, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 3, label: '待处理(新建)', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 1, label: '处理中', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 4, label: '理赔金额未出', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 5, label: '客服介入', state: true, request: true, DataList: [], total: 0 ,currentPage: 1,pageSize: 50,}, + { name: 9, label: '待审核', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, + { name: 6, label: '完结', state: true, request: true, DataList: [], total: 0 ,currentPage: 1,pageSize: 50,}, + { name: 7, label: '超时未处理', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, }, ]); //标签栏 const DeliveryDriver = ref([]); @@ -1766,6 +1766,9 @@ const Statusprocessing = val => { }; // 页面初始化数据 const IndexTable = (val, Refresh) => { + console.log(page.value,'page.value'); + console.log('初始化接口'); + console.log( !TabList.value.find(res => res.name == TabPermissions.value).request, Refresh, @@ -1849,6 +1852,7 @@ const IndexTable = (val, Refresh) => { TabList.value.find(res => res.name == TabPermissions.value).DataList = res.data.data.records; TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total; + TabList.value.find(res => res.name == TabPermissions.value).currentPage = res.data.data.current; TabList.value.find(res => res.name == TabPermissions.value).request = false; console.log(TabList.value, '当前存储的值'); details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList; @@ -1856,7 +1860,8 @@ const IndexTable = (val, Refresh) => { console.log(TabList.value, 'TabList.value===>'); } else { TabList.value.find(res => res.name == TabPermissions.value).DataList = []; - TabList.value.find(res => res.name == TabPermissions.value).total = 0; + TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total; + TabList.value.find(res => res.name == TabPermissions.value).currentPage = res.data.data.current; TabList.value.find(res => res.name == TabPermissions.value).request = true; // details.data = res.data.data.records; details.data = res.data.data.records; @@ -2830,7 +2835,12 @@ const selectionChange = list => { /** 页码改变执行的回调 */ const currentChange = async val => { + // let _row= TabList.value.find(res=>res.name==val) + // page.value.pageSize= _row.pageSize + // page.value.currentPage= _row.currentPage TabList.value.find(res => res.name == TabPermissions.value).request = true; + let _row= TabList.value.find(res=>res.name==TabPermissions.value) + _row.currentPage = val page.value.currentPage = val; await DataRendering(TabPermissions.value, details.query, true); TabList.value.find(res => res.name == TabPermissions.value).request = false; @@ -3304,6 +3314,14 @@ const DataRendering = (val, input, Refresh) => { // 标签栏触发 const tabChenge = async (val, input, Refresh = false) => { + console.log(TabList.value, 'TabList.value'); + console.log(val, 'val'); + let _row= TabList.value.find(res=>res.name==val) + page.value.pageSize= _row.pageSize + page.value.currentPage= _row.currentPage + page.value.total= _row.total + console.log(_row,'当前点击的菜单'); + TabPermissions.value = val; //记录当前点击的菜单 if (val != 6) { diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 9fb464c1..1afbefeb 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1177,9 +1177,6 @@ const beforeAvatarUpload = async rawFile => { if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') { ElMessage.error('只能上传格式为PNG/JPG的图片!'); return false; - } else if (rawFile.size / 1024 / 1024 > 3) { - ElMessage.error('图片大小不能大于3MB!'); - return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index ed708daf..ad5a8260 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1368,7 +1368,7 @@ const isRepulse = () => { // 处理结果打回 const Resultreturned = () => { - if (UserPermissions.value == '总部客服') { + if (UserPermissions.value == '总部客服' || UserPermissions.value == '总部客服经理') { if (workOrderStatus == '30') { return true; } diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue new file mode 100644 index 00000000..009d8e67 --- /dev/null +++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue @@ -0,0 +1,721 @@ + + + + + From 81fb98c0d9832839e8782997e1e9714349839afd Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 25 Oct 2024 21:23:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=8C=85=E6=9D=A1=E7=A0=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/aftersales/vueTvemp.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 2ba92f21..407b32df 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -47,17 +47,17 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'packageCode', - label: '包条码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'waybillNumber', label: '运单号', From c5cd85cb47e2c5853844dbf851b92ef3289eaf50 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 25 Oct 2024 23:36:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/abnormalList.js | 30 ++++---- src/option/finance/WaybillAudit.js | 10 +++ src/option/waybill/WaybillOrderList.js | 10 +++ .../distribution/artery/AddVehicleStowage.vue | 6 +- .../distribution/artery/abnormalList.vue | 77 ++++++++++++++----- src/views/finance/CustomerSettlement.vue | 6 +- src/views/waybill/TemporaryStorageList.vue | 4 +- src/views/waybill/WaybillOrderList.vue | 52 +++++++++++++ 8 files changed, 156 insertions(+), 39 deletions(-) diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js index bd557152..0fa27015 100644 --- a/src/option/distribution/abnormalList.js +++ b/src/option/distribution/abnormalList.js @@ -29,6 +29,19 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'abnormalStatusName', + label: '异常状态', + type: 14, + values: '', + width: '130', + checkarr: [ + { value: 0, label: '待处理' }, + { value: 1, label: '完结' }, + ], + fixed: false, + sortable: true, + }, { prop: 'abnormalTypeName', label: '异常类型', @@ -114,11 +127,11 @@ export const columnList = [ checkarr: [ { label: '是', - value: '1', + value: 1, }, { label: '否', - value: '0', + value: 0, }, ], fixed: false, @@ -146,19 +159,6 @@ export const columnList = [ fixed: false, sortable: true, }, - { - prop: 'abnormalStatusName', - label: '异常状态', - type: 14, - values: '', - width: '130', - checkarr: [ - { value: 0, label: '待处理' }, - { value: 1, label: '完结' }, - ], - fixed: false, - sortable: true, - }, { prop: 'upTime', label: '上报时间', diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js index 8a0ae86e..4da52239 100644 --- a/src/option/finance/WaybillAudit.js +++ b/src/option/finance/WaybillAudit.js @@ -58,6 +58,16 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'consigneeCode', + label: '收货单位编码', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'consignee', label: '收货单位', diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js index 2efc1418..6a1c2563 100644 --- a/src/option/waybill/WaybillOrderList.js +++ b/src/option/waybill/WaybillOrderList.js @@ -138,6 +138,16 @@ export const columnList = [ fixed: false, sortable: true, }, + { + prop: 'consigneeCode', + label: '收货单位编码', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'consignee', label: '收货单位', diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index dfcd21f1..01e4602b 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -799,7 +799,7 @@ export default {