From ba152f795fa0afa58c5e2f1396de0a99c99aad79 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 15 Oct 2024 20:28:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/reportforms/DeliveryDetailsVtwo.js | 1068 +++++++++-------- 1 file changed, 535 insertions(+), 533 deletions(-) diff --git a/src/option/reportforms/DeliveryDetailsVtwo.js b/src/option/reportforms/DeliveryDetailsVtwo.js index 8052141c..18f35c47 100644 --- a/src/option/reportforms/DeliveryDetailsVtwo.js +++ b/src/option/reportforms/DeliveryDetailsVtwo.js @@ -1,535 +1,537 @@ export const columnList = [ - { - prop: '', - label: '复选框', - type: 0, - width: 55, - fixed: true, - }, - { - prop: '', - label: '序号', - type: 12, - values: '', - width: 55, - fixed: true, - }, - { - prop: 'trainNumber', - label: '车次', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'reservationCode', - label: '预约单号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'taskTime', - label: '配送日期', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'trainNumber', + label: '车次', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reservationCode', + label: '预约单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'taskTime', + label: '配送日期', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, - { - prop: 'warehouseName', - label: '仓库', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'brand', - label: '品牌', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'signNum', - label: '签收数量', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - isshowSummary: true, - head: false, - }, - { - prop: 'loadingMode', - label: '装车方式', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'signType', - label: '签收方式', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'type', - label: '配送类型', - type: 3, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'kind', - label: '配送种类', - type: 3, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'vehicleName', - label: '配送车辆', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'driverName', - label: '配送司机', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'distributionCompany', - label: '配送公司', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'drConsignee', - label: '客户名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryPhone', - label: '客户电话', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryAddress', - label: '地址', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'consignee', - label: '运单收货单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'consigneeName', - label: '运单收货人', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'consigneeMobile', - label: '运单收货电话', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'waybillNo', - label: '运单号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockArticleId', - label: '订单自编码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'orderPackageCode', - label: '包条码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'customerTrain', - label: '客户车次号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'conditions', - label: '包件类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'firsts', - label: '一级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'decond', - label: '二级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'thirdProduct', - label: '三级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'materialCode', - label: '物料编码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'materialName', - label: '物料名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'startWar', - label: '始发仓', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'startWarInTime', - label: '始发仓入库日期', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'startWarOutTime', - label: '始发仓发货日期', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseEntryTimeEnd', - label: '入库时间', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'driverSigning', - label: '司机签收状态', - type: 3, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'unloadTime', - label: '装车时间', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'unAdministratorsName', - label: '装车人', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'sjsigningTime', - label: '签收时间', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'ldsSigneeName', - label: '签收人', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'signingStatus', - label: '文员审核状态', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'signingTime', - label: '文员审核时间', - type: 4, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'examineUserName', - label: '审核人名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'abnormalSigning', - label: '是否异常签收', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'abnormalLoading', - // label: '是否异常装车', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'auditingStatus', - // label: '异常审核状态', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'auditingUser', - // label: '审核人', - // type: 2, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'auditingTime', - // label: '审核时间', - // type: 4, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'createUserName', - // label: '操作', - // type: 6, - // values: '', - // width: '200', - // checkarr: [], - // fixed: 'right', - // sortable: false, - // }, - ] \ No newline at end of file + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brand', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'type', + label: '配送类型', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'kind', + label: '配送种类', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'vehicleName', + label: '配送车辆', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverName', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'distributionCompany', + label: '配送公司', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'drConsignee', + label: '客户名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryPhone', + label: '客户电话', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryAddress', + label: '地址', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consignee', + label: '运单收货单位', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeName', + label: '运单收货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeMobile', + label: '运单收货电话', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillNo', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockArticleId', + label: '订单自编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '包条码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerTrain', + label: '客户车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'conditions', + label: '包件类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'firsts', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'decond', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'thirdProduct', + label: '三级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'materialCode', + label: '物料编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'materialName', + label: '物料名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'startWar', + label: '始发仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'startWarInTime', + label: '始发仓入库日期', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'startWarOutTime', + label: '始发仓发货日期', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseEntryTimeEnd', + label: '入库时间', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'loadingMode', + label: '装车方式', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'unloadTime', + label: '装车时间', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'unAdministratorsName', + label: '装车人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverSigning', + label: '司机签收状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'sjsigningTime', + label: '签收时间', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'ldsSigneeName', + label: '签收人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signType', + label: '签收方式', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signNum', + label: '签收数量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + head: false, + }, + { + prop: 'signingStatus', + label: '文员审核状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signingTime', + label: '文员审核时间', + type: 4, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'examineUserName', + label: '审核人名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'abnormalSigning', + label: '是否异常签收', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'abnormalLoading', + // label: '是否异常装车', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'auditingStatus', + // label: '异常审核状态', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'auditingUser', + // label: '审核人', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'auditingTime', + // label: '审核时间', + // type: 4, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'createUserName', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // sortable: false, + // }, +]; From 5b59e6adfd9c7ca051b36ea856cff563935106ba Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 15 Oct 2024 20:32:09 +0800 Subject: [PATCH 2/3] dev --- vite.config.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vite.config.js b/vite.config.js index f2375925..b2e81c52 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,12 +15,14 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.126:8889', // hy // target: 'http://192.168.3.12:13000', + // longge + // target: 'http://192.168.3.16:13000', // xiaohei - // target: 'http://192.168.3.65:13000', + // target:'http://192.168.3.65:13000', // lmy // target: 'http://192.168.10.123:8889', // cg - // target: 'http://192.168.3.2:13000', + // target: 'http://192.168.3.73:13000', // target: 'http://192.168.10.101:8888', // 老zyc // target: 'http://192.168.10.75:8777', @@ -35,7 +37,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.29:13000', // target: 'http://192.168.3.5:13000',//？ // target: 'http://h5uapi.huitongys.com', - target: 'http://test.api.huo5you.com', + target: 'http://test.api.huo5u.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, @@ -46,6 +48,9 @@ export default ({ mode, command }) => { }, }, }, + esbuild:{ + drop: ['console','debugger'] + }, resolve: { alias: { '~': resolve(__dirname, './'), From c20f430d116afc7a65c67ed8ef8db2586a3cd4ba Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 16 Oct 2024 15:39:20 +0800 Subject: [PATCH 3/3] =?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 --- .../Pricesystem/Price/PriceWarehousing.vue | 12 ++++++----- .../aftersales/aftersalesWorkOrderInfo.vue | 20 ++++++++----------- .../signdetail/distributionSigndetail.vue | 3 ++- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue index 5211bd8d..883d9312 100644 --- a/src/views/Pricesystem/Price/PriceWarehousing.vue +++ b/src/views/Pricesystem/Price/PriceWarehousing.vue @@ -336,9 +336,9 @@ const onLoad = async () => { function handleFormUpdate(disableIndexAndCategory, unitLabel, tableTitle, perPiece = false) { const unitMapping = { - 按件计费: `${unitLabel}/件`, - '按重量计费(t)': `${unitLabel}/KG`, - '按吨计费(t)': `${unitLabel}/t`, + '按件计费': `${unitLabel}`, + '按重量计费(t)': `${unitLabel}`, + '按吨计费(t)': `${unitLabel}`, }; const unit = unitMapping[tableTitle] || unitLabel; @@ -346,8 +346,10 @@ const onLoad = async () => { updateLabelsWithUnit(unit, { '30天内': '30天内', '30天-60天': '30天-60天', - '60天外': '60天外', - 上限: '上限', + '60天-90天': '60天-90天', + '60天-90天': '60天-90天', + '90天外': '90天外', + '上限': '上限', }); tabform.value.title = tableTitle; diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index fe9eb9d4..f3116a97 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1104,22 +1104,18 @@ const handle = () => { }); }; // 是否可以查看完结信息 -const Completionpermissions = computed(async () => { - if (await localStorage.getItem('my_data')) { - Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 +const Completionpermissions = computed(() => { + const myDataStr = localStorage.getItem('my_data'); + if (myDataStr) { + Mydata.value = JSON.parse(myDataStr); } - if (CompensationParty.value.length) { - console.log(CompletedView.value, 'CompletedView.value'); + if (CompensationParty.value && CompensationParty.value.length) { + if (CompletedView.value.includes(Mydata.value.id) || UserPermissions.value != '仓库客服') { - console.log( - CompletedView.value.includes(Mydata.id), - 'CompletedView.value.includes(Mydata.id)' - ); return true; - } else { - return false; - } + } } + return false; }); const onLoad = async () => { pageState.value = true; //开启页面加载 diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue index 71f70c8e..57adabc6 100644 --- a/src/views/distribution/signdetail/distributionSigndetail.vue +++ b/src/views/distribution/signdetail/distributionSigndetail.vue @@ -33,7 +33,7 @@