From 64637f823456060d36fe9dd0de97c0db0a5c793b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 9 Dec 2024 13:59:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/desk/notice.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js index 3c26a1f0..4c7e7eae 100644 --- a/src/api/desk/notice.js +++ b/src/api/desk/notice.js @@ -2,7 +2,7 @@ import request from '@/axios'; export const getList = (current, size, params) => { return request({ - url: '/blade-desk/notice/list', + url: '/logpm-basic/notice/list', method: 'get', params: { ...params, @@ -15,7 +15,7 @@ export const getList = (current, size, params) => { export const remove = ids => { return request({ - url: '/blade-desk/notice/remove', + url: '/logpm-basic/notice/remove', method: 'post', params: { ids, @@ -26,7 +26,7 @@ export const remove = ids => { export const add = row => { return request({ - url: '/blade-desk/notice/submit', + url: '/logpm-basic/notice/submit', method: 'post', data: row, cryptoToken: true, @@ -35,7 +35,7 @@ export const add = row => { export const update = row => { return request({ - url: '/blade-desk/notice/submit', + url: '/logpm-basic/notice/submit', method: 'post', data: row, cryptoToken: true, @@ -44,7 +44,7 @@ export const update = row => { export const getNotice = id => { return request({ - url: '/blade-desk/notice/detail', + url: '/logpm-basic/notice/detail', method: 'get', params: { id, From ff3cdc7ca7527de9ea3fa451b69df0e6f1d4bc37 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 9 Dec 2024 18:15:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/desk/notice.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js index 4c7e7eae..d38961a4 100644 --- a/src/api/desk/notice.js +++ b/src/api/desk/notice.js @@ -9,7 +9,7 @@ export const getList = (current, size, params) => { current, size, }, - cryptoToken: true, + cryptoToken: false, }); }; @@ -20,7 +20,7 @@ export const remove = ids => { params: { ids, }, - cryptoToken: true, + cryptoToken: false, }); }; @@ -29,7 +29,7 @@ export const add = row => { url: '/logpm-basic/notice/submit', method: 'post', data: row, - cryptoToken: true, + cryptoToken: false, }); }; @@ -38,7 +38,7 @@ export const update = row => { url: '/logpm-basic/notice/submit', method: 'post', data: row, - cryptoToken: true, + cryptoToken: false, }); }; @@ -49,6 +49,6 @@ export const getNotice = id => { params: { id, }, - cryptoToken: true, + cryptoToken: false, }); }; From 3739306a168a07ea39eb87c400f755aded05c68c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 9 Dec 2024 18:22:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=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/api/aftersales/aftersalesWorkOrder.js | 6 +- .../basicdata/ThreePartyMallManagement.js | 11 + .../distribution/distrilbutionBillLading.js | 22 +- src/option/reportforms/DeliveryDetailsVtwo.js | 2 +- .../reportforms/DeliveryStatisticsReport.js | 23 ++ .../Transferwarehousestatistics.js | 91 +++++++- src/utils/util.js | 14 ++ .../Transferwarehousestatistics.vue | 206 +++++++++++++++++- .../reportforms/DeliveryStatisticsReport.vue | 2 + 9 files changed, 346 insertions(+), 31 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 789ad03f..9beaa3ec 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -77,11 +77,11 @@ export const update = (row) => { } // 表格初始化 -export const $_getList = (params) => { +export const $_getList = (data) => { return request({ url: '/api/logpm-aftersales/aftersalesWorkOrder/listOwn', //listOwn - method: 'get', - params + method: 'post', + data }) } diff --git a/src/option/basicdata/ThreePartyMallManagement.js b/src/option/basicdata/ThreePartyMallManagement.js index ae72f58e..9c2a1964 100644 --- a/src/option/basicdata/ThreePartyMallManagement.js +++ b/src/option/basicdata/ThreePartyMallManagement.js @@ -47,6 +47,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'brandName', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'typeServiceNameS', label: '配送类型', diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js index 3208ce27..b5d5cd0e 100644 --- a/src/option/distribution/distrilbutionBillLading.js +++ b/src/option/distribution/distrilbutionBillLading.js @@ -321,17 +321,17 @@ export default { sortable: true, head: false, }, - { - prop: 'inventoryQuantity', - label: '添加数量', - type: 6, - values: '', - width: '100', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'inventoryQuantity', + // label: '添加数量', + // type: 6, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, ], column: [ { diff --git a/src/option/reportforms/DeliveryDetailsVtwo.js b/src/option/reportforms/DeliveryDetailsVtwo.js index 5a4f0b40..65bdfe7f 100644 --- a/src/option/reportforms/DeliveryDetailsVtwo.js +++ b/src/option/reportforms/DeliveryDetailsVtwo.js @@ -62,7 +62,7 @@ export const columnList = [ { prop: 'brand', label: '品牌', - type: 1, + type: 2, values: '', width: '150', checkarr: [], diff --git a/src/option/reportforms/DeliveryStatisticsReport.js b/src/option/reportforms/DeliveryStatisticsReport.js index 105e6c43..7c97fdb1 100644 --- a/src/option/reportforms/DeliveryStatisticsReport.js +++ b/src/option/reportforms/DeliveryStatisticsReport.js @@ -85,6 +85,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'signOnTimeRate', + label: '签收及时率', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'planStockNum', label: '预约库存品数量', @@ -144,6 +155,18 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'reviewOnTimeRate', + label: '符合及时率', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { prop: 'exceptionNum', label: '异常数', diff --git a/src/option/storagecost/Transferwarehousestatistics.js b/src/option/storagecost/Transferwarehousestatistics.js index c8e3a6fd..3df85bc0 100644 --- a/src/option/storagecost/Transferwarehousestatistics.js +++ b/src/option/storagecost/Transferwarehousestatistics.js @@ -17,7 +17,7 @@ export const columnList = [ { prop: 'a1', label: '中转仓', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -27,8 +27,8 @@ export const columnList = [ }, { prop: 'a2', - label: '中转作业结算时间', - type: 2, + label: '目的仓', + type: 1, values: '', width: '150', checkarr: [], @@ -38,7 +38,7 @@ export const columnList = [ }, { prop: 'a3', - label: '月中转入库件数', + label: '中转作业出账时间', type: 1, values: '', width: '150', @@ -49,7 +49,7 @@ export const columnList = [ }, { prop: 'a4', - label: '月中转入库收入', + label: '月中转入库件数', type: 1, values: '', width: '150', @@ -60,7 +60,7 @@ export const columnList = [ }, { prop: 'a5', - label: '月中转出库件数', + label: '月中转入库收入', type: 1, values: '', width: '150', @@ -71,8 +71,19 @@ export const columnList = [ }, { prop: 'a6', + label: '月中转出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', label: '月中转出库收入', - type: 3, + type: 1, values: '', width: '150', checkarr: [], @@ -91,6 +102,72 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'a7', + label: '结算状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '已结算金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '待结算金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '结算人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '结算时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '异常金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'createUserName', label: '操作', diff --git a/src/utils/util.js b/src/utils/util.js index 17c35515..3c995e9b 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -2,6 +2,7 @@ import { validatenull } from './validate'; import sha256 from 'crypto-js/sha256'; import Base64 from 'crypto-js/enc-base64'; import store from '@/store/index'; +import { getToken } from '@/utils/auth'; import { nextTick } from 'vue'; import dayjs from 'dayjs'; //表单序列化 @@ -955,3 +956,16 @@ export const handleFilterData = (data, renderData, { inputQuery, selectQuery, ti export const ChecksWhetherTheWarehouseIsSelected = () => { return localStorage.getItem('WarehouseName') ? true : false; }; +/** + * 文件上传地址 + */ +export const FileUpload = () => { + return '/api/blade-resource/oss/endpoint/put-file'; +}; + +/** + * 文件上传headers + */ +export const headers = () => { + return { 'Blade-Auth': 'Bearer ' + getToken() }; +}; diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue index 0fb8fd1a..7762a1ba 100644 --- a/src/views/cost/storagecost/Transferwarehousestatistics.vue +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -91,9 +91,11 @@ > @@ -118,6 +120,78 @@ + + + + +

结算单号:XXXXXXXXXXXX

+

结算状态:已结算

+
+ 总费用:199999 + 待结算费用:2232 + 已结算费用:23423 + 异常费用:124124 +
+ + + + + + + + + + + + + + + + + + + + + + + + { + if (!value.length) { + callback(new Error('至少上传一张图片')); + } else { + callback(); + } +}; +const Abnormalsettlement = ref({ + dialogVisible: false, + activeName1: '费用信息', + activeName2: '异常记录', + url: '', + dialogurl: false, + form: { + money: null, + fileList: [], //图片列表 + }, + rules: { + money: [ + { + required: true, + message: '此处填写要登记的异常金额，正数表示异常增款，负数表示异常减款', + trigger: ['change', 'blur'], + }, + ], + textarea2: [ + { + required: true, + message: '请填写备注', + trigger: ['change', 'blur'], + }, + ], + fileList: [{ validator: validateFileList, trigger: 'change' }], + }, +}); const details = reactive({ + fileList: [], /** 是否开启搜索 */ search: false, /** 表格搜索条件 */ @@ -183,7 +296,7 @@ const details = reactive({ columnList, /** 列表数据 */ - data: [], + data: [{}], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -314,6 +427,25 @@ const searchHide = () => { const _node = document.querySelector('.tableNode'); setNodeHeight(_node, '', true); }; + +// 上传图片规则 +const beforeAvatarUpload = async rawFile => { + console.log(rawFile, '图片上传前回调'); + const allowedTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml']; + if (!allowedTypes.includes(rawFile.type)) { + ElMessage.error('只能上传格式为PNG/JPG/GIF/WebP/SVG的图片!'); + return false; + } + const res = await compressImageBlob(rawFile); + return res; +}; +const handlePictureCardPreview = uploadFile => { + console.log(uploadFile, '预览'); + Abnormalsettlement.value.url = uploadFile.response.data.link; + console.log(Abnormalsettlement.value.url, 'url'); + + Abnormalsettlement.value.dialogurl = true; +}; // 字典公共函数 function updateDictionary(targetArray, dictionaryType) { getDictionaryBiz(dictionaryType).then(res => { @@ -348,9 +480,7 @@ const MyWarehouseList = () => { }); }; // 页面初始化 -const onLoad = () => { - -}; +const onLoad = () => {}; const PageOnload = () => { onLoad(); //获取列表参数 MyWarehouseList(); //获取仓库 @@ -359,7 +489,21 @@ const PageOnload = () => { //页面初始化方法 PageOnload(); -// 页面初始化方法 +// 异常信息 +const abnormalinformation = () => { + Abnormalsettlement.value.dialogVisible = true; +}; +// 提交 +const AbnormalsettlementSubmit = async () => { + await ruleFormRef.value.validate((valid, fields) => { + if (valid) { + console.log('submit!'); + } else { + console.log('error submit!', fields); + ElMessage.error('表单校验未通过，请检查输入'); + } + }); +}; diff --git a/src/views/reportforms/DeliveryStatisticsReport.vue b/src/views/reportforms/DeliveryStatisticsReport.vue index 400cadd9..5c25e5a4 100644 --- a/src/views/reportforms/DeliveryStatisticsReport.vue +++ b/src/views/reportforms/DeliveryStatisticsReport.vue @@ -457,6 +457,8 @@ const onLoad = async () => { item.signRate = parsePercentage(item.signRate); item.signStockRate = parsePercentage(item.signStockRate); item.planAccuracy = parsePercentage(item.planAccuracy); + item.signOnTimeRate = parsePercentage(item.signOnTimeRate); + item.reviewOnTimeRate = parsePercentage(item.reviewOnTimeRate); } details.data = data.records; From e16e36fc7008915050596657e331416278ba793a Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 9 Dec 2024 18:27:44 +0800 Subject: [PATCH 4/4] =?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/api/aftersales/aftersalesWorkOrder.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 9beaa3ec..789ad03f 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -77,11 +77,11 @@ export const update = (row) => { } // 表格初始化 -export const $_getList = (data) => { +export const $_getList = (params) => { return request({ url: '/api/logpm-aftersales/aftersalesWorkOrder/listOwn', //listOwn - method: 'post', - data + method: 'get', + params }) }