From 8eef755da8b2da4864457818f0d02427c0ad3292 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 11 Nov 2024 18:32:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=89=E6=96=B9=E5=95=86=E5=9C=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=94=AE=E5=90=8E=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9C=AA=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 8 + src/api/basicdata/ThreePartyMallManagement.js | 9 + src/option/aftersales/vueTvemp.js | 220 ++++----- .../basicdata/ThreePartyMallManagement.js | 72 +++ src/views/aftersales/aftersalesWorkOrder.vue | 4 +- .../aftersales/aftersalesWorkOrderAdd.vue | 241 ++++++---- .../aftersales/aftersalesWorkOrderTemp.vue | 30 +- .../brand/ThreePartyMallManagement.vue | 436 ++++++++++++++++++ .../inventory/distrilbutionBillLadingView.vue | 8 + .../warehouseWarehouseingAddReceipt.vue | 79 ++-- 10 files changed, 857 insertions(+), 250 deletions(-) create mode 100644 src/api/basicdata/ThreePartyMallManagement.js create mode 100644 src/option/basicdata/ThreePartyMallManagement.js create mode 100644 src/views/basicdata/brand/ThreePartyMallManagement.vue diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index e8630911..7d966557 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -548,4 +548,12 @@ export const $_exportaftersalesOvertimeFine = (params) => { params, responseType: 'blob', }) +} +// 干线查询 +export const $_getAdvanceAbnormalPackage = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAbnormalPackage/getAdvanceAbnormalPackage', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/api/basicdata/ThreePartyMallManagement.js b/src/api/basicdata/ThreePartyMallManagement.js new file mode 100644 index 00000000..5acc91c8 --- /dev/null +++ b/src/api/basicdata/ThreePartyMallManagement.js @@ -0,0 +1,9 @@ +import request from '@/axios'; + +export const $_pageList = params => { + return request({ + url: '/api/logpm-basicdata/basicdataTripartiteMall/pageList', + method: 'get', + params, + }); +}; diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 664d94f9..7232b253 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -41,17 +41,17 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'a', - label: '工单创建仓', - type: 1, - values: '', - width: '140', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'a', + // label: '工单创建仓', + // type: 1, + // values: '', + // width: '140', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'workOrderNumber', label: '异常工单号', @@ -163,17 +163,17 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'a', - label: '责任方', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'a', + // label: '责任方', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'createTime', label: '工单创建时间', @@ -185,72 +185,72 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'a', - label: '工单最晚处理时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '工单最新处理时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '处理结果', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '处理结果—理赔金额', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '营业部处理客服', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '总部处理客服', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'a', + // label: '工单最晚处理时间', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '工单最新处理时间', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '处理结果', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '处理结果—理赔金额', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '营业部处理客服', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '总部处理客服', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'overTime', @@ -263,28 +263,28 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'a', - label: '是否申诉', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '申诉状态', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'a', + // label: '是否申诉', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'a', + // label: '申诉状态', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'processNumber', label: '钉钉号', diff --git a/src/option/basicdata/ThreePartyMallManagement.js b/src/option/basicdata/ThreePartyMallManagement.js new file mode 100644 index 00000000..ae72f58e --- /dev/null +++ b/src/option/basicdata/ThreePartyMallManagement.js @@ -0,0 +1,72 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'clientName', + label: '客户名称', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'tripartiteMall', + label: '商场名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'tripartiteCoding', + label: '商场编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'typeServiceNameS', + label: '配送类型', + type: 1, + values: '', + width: '150', + checkarr: [ + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '80', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 7b0a6070..a67f6af2 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1503,7 +1503,7 @@ const ButtonPermissions = computed(() => { return { add: false, //新增按钮 batchReject: UserPermissions.value == '总部客服', //批量打回 - assignment: false, //工单指派 + assignment: true, //工单指派 applyArbitration: false, //客服介入 DingTalkNumber: false, //钉钉号填 batchFinish: false, //批量完结 @@ -1520,7 +1520,7 @@ const ButtonPermissions = computed(() => { return { add: false, //新增按钮 batchReject: false, //批量打回 - assignment: false, //工单指派 + assignment: true, //工单指派 applyArbitration: false, //客服介入 batchFinish: false, //批量完结 appeal: false, //申诉 diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 4a220912..450374e8 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -481,10 +481,9 @@ -
+ @@ -738,6 +737,7 @@ import { $_getBusinessDepartmentUser, $_getAbnormalPackage, $_shippingInformation, + $_getAdvanceAbnormalPackage, } from '@/api/aftersales/aftersalesWorkOrder'; import { useRouter, useRoute } from 'vue-router'; import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方 @@ -816,20 +816,39 @@ const ruleForm = reactive({ deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: ['blur', 'change'] }], warehousingTime: [{ required: true, message: '请选择入库时间', trigger: ['blur', 'change'] }], discoveryTime: [{ required: true, message: '请选择发现时间', trigger: ['blur', 'change'] }], - waybillMall: [{ required: true, message: '请输入运单商场', trigger: ['blur'] }], + waybillMall: [ + { required: true, message: '请输入运单商场', trigger: ['blur'] }, + { max: 20, message: '运单商场最多20位', trigger: 'change' }, + ], typeServiceName: [{ required: false, message: '请输入合作模式', trigger: ['blur', 'change'] }], investigationProcess: [ { required: true, message: '请输入调查经过', trigger: ['blur', 'change'] }, + { max: 200, message: '调查经过最多200位', trigger: 'change' }, ], result: [{ required: false, message: '请输选择处理结果', trigger: ['blur'] }], processor: [{ required: true, message: '请选择处理方', trigger: ['blur'] }], processorEntityList: [{ required: true, message: '请选择责任方', trigger: ['blur'] }], }, - packageCode: [{ required: true, message: '请输入包条码', trigger: ['blur', 'change'] }], - waybillNumber: [{ required: true, message: '请输入运单号', trigger: ['blur', 'change'] }], - orderCode: [{ required: true, message: '请输入订单自编号', trigger: ['blur', 'change'] }], - first: [{ required: false, message: '请输入一级品', trigger: ['blur', 'change'] }], - secondary: [{ required: false, message: '请输入二级品', trigger: ['blur', 'change'] }], + packageCode: [ + { required: true, message: '请输入包条码', trigger: ['blur', 'change'] }, + { max: 64, message: '包条码最多64位', trigger: 'change' }, + ], + waybillNumber: [ + { required: true, message: '请输入运单号', trigger: ['blur', 'change'] }, + { max: 30, message: '运单号最多30位', trigger: 'change' }, + ], + orderCode: [ + { required: true, message: '请输入订单自编号', trigger: ['blur', 'change'] }, + { max: 30, message: '订单自编号最多30位', trigger: 'change' }, + ], + first: [ + { required: false, message: '请输入一级品', trigger: ['blur', 'change'] }, + { max: 10, message: '订单自编号最多10位', trigger: 'change' }, + ], + secondary: [ + { required: false, message: '请输入二级品', trigger: ['blur', 'change'] }, + { max: 10, message: '订单自编号最多10位', trigger: 'change' }, + ], brandName: [{ required: false, message: '请输入品牌', trigger: ['blur', 'change'] }], businessId: [{ required: true, message: '请选择责任方', trigger: ['blur', 'change'] }], personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['blur', 'change'] }], @@ -932,6 +951,7 @@ const PackageListReset = async () => { orderCode: '', //订单自编号 first: '', //一级品 secondary: '', //二级品 + thirdProduct: '', //三级品 brandName: '', //品牌 history: false, //是否有历史包间 id: 1, @@ -1032,6 +1052,7 @@ const Addpackages = () => { orderCode: '', //订单自编号 first: '', //一级品 secondary: '', //二级品 + thirdProduct: '', //三级品 brandName: '', //品牌 history: false, //是否有历史包件 HistoricalPackageList: [], //历史包件存储 @@ -1218,13 +1239,33 @@ const resetFormData = () => { // 包条码查询信息 const ChangePackageInfo = async item => { + if (!form.value.basis.workOrderType || !form.value.basis.discoveryNode) { + const messages = []; + + if (!form.value.basis.workOrderType) { + messages.push('【异常类型】'); + } + + if (!form.value.basis.discoveryNode) { + messages.push('【发现节点】'); + } + + ElMessage({ + message: `请先选择${messages.join('和')}`, + type: 'warning', + plain: true, + }); + item.packageCode = ''; + return; + } console.log(item, 'item'); if (!item.packageCode) { item.waybillNumber = ''; //运单号 item.orderCode = ''; //订单自编码 item.first = ''; //一级品 item.secondary = ''; //二级品 - item.brandName = ''; //品牌 + (item.thirdProduct = ''), //三级品 + (item.brandName = ''); //品牌 let data = form.value.PackageList.find(res => res.packageCode); //判断是否已经查询了运单商场 if (!data) { form.value.basis.waybillMall = ''; //运单商场 @@ -1236,7 +1277,8 @@ const ChangePackageInfo = async item => { item.orderCode = ''; //订单自编码 item.first = ''; //一级品 item.secondary = ''; //二级品 - item.brandName = ''; //品牌 + (item.thirdProduct = ''), //三级品 + (item.brandName = ''); //品牌 if (form.value.PackageList == 1) { form.value.basis.waybillMall = ''; //运单商场 form.value.basis.typeServiceName = ''; //合作模式 @@ -1264,99 +1306,109 @@ const ChangePackageInfo = async item => { packageCode: item.packageCode, //输入框参数 }; form.value.Pageloading = true; //开启页面加载 - $_getAbnormalPackage(data) - .then(async res => { - console.log(res, '查询包条'); - let packageData = {}; - if (res.data.code == 200 && res.data && res.data.data.length) { - form.value.Pageloading = false; //关闭页面加载 - packageData = res.data.data[0]; //取第一个值,内容相同 - // 判断输入的是否为同一批货 - let state = await form.value.PackageList.find(res => res.orderCode || res.brandName); - if (state) { - if ( - state.orderCode != packageData.orderCode || - state.waybillNumber != packageData.waybillNumber - ) { - ElMessage({ - message: '请选择相同订单自编和运单号的包条码', - type: 'warning', - }); - return; - } - } + let res = null; + try { + if (form.value.basis.discoveryNode == 3) { + res = await $_getAdvanceAbnormalPackage(data); + console.log(res, '干线查询包条'); + } else { + res = await $_getAbnormalPackage(data); + } + } catch (e) { + console.log(e, 'error'); + } finally { + form.value.Pageloading = false; //关闭页面加载 + } + + console.log(res, '查询包条'); + let packageData = {}; + if (res.data.code == 200 && res.data && res.data.data.length) { + form.value.Pageloading = false; //关闭页面加载 + packageData = res.data.data[0]; //取第一个值,内容相同 + // 判断输入的是否为同一批货 + let state = await form.value.PackageList.find(res => res.orderCode || res.brandName); + if (state) { + if ( + state.orderCode != packageData.orderCode || + state.waybillNumber != packageData.waybillNumber + ) { ElMessage({ - message: '查询成功', - type: 'success', - }); - item.waybillNumber = packageData.waybillNumber || ''; //运单号 - item.orderCode = packageData.orderCode || ''; //订单自编码 - item.first = packageData.firsts || ''; //一级品 - item.secondary = packageData.second || ''; //二级品 - item.brandName = packageData.brandName || ''; //品牌 - form.value.basis.waybillMall = packageData.mallName || ''; //运单商场 - form.value.basis.typeServiceName = packageData.typeServiceName || ''; //合作模式 - // 是否显示历史包件按钮,存在多个包件则展示 - const results = res.data.data.filter(item => { - return item.workOrderId && item.workOrderNumber; + message: '请选择相同订单自编和运单号的包条码', + type: 'warning', }); - // 存储历史订单 - if (results.length) { - item.history = true; - item.HistoricalPackageList = results; - } else { - item.history = false; - } - console.log(form.value.basis.discoveryNode, 'form.value.discoveryNode'); - // 判断发现节点(干线车次号、车辆线路处理) - if (['3'].includes(form.value.basis.discoveryNode)) { - let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号 - res.data.data.forEach(item => { - if (item.trunklines && item.trunklines.length) { - item.trunklines.forEach(itemChid => { - if (!addedTrainNumbers.includes(itemChid.trainNumber)) { - form.value.Trainoptions.push({ - trainNumber: itemChid.trainNumber, // 车次号 - vehicleRoute: itemChid.vehicleRoute, // 车辆线路 - }); - addedTrainNumbers.push(itemChid.trainNumber); - } + return; + } + } + ElMessage({ + message: '查询成功', + type: 'success', + }); + item.waybillNumber = packageData.waybillNumber || ''; //运单号 + item.orderCode = packageData.orderCode || ''; //订单自编码 + item.first = packageData.firsts || ''; //一级品 + item.secondary = packageData.second || ''; //二级品 + item.thirdProduct = packageData.thirdProduct || ''; //三级品 + item.brandName = packageData.brandName || ''; //品牌 + form.value.basis.waybillMall = packageData.mallName || ''; //运单商场 + form.value.basis.typeServiceName = packageData.typeServiceName || ''; //合作模式 + // 是否显示历史包件按钮,存在多个包件则展示 + const results = res.data.data.filter(item => { + return item.workOrderId && item.workOrderNumber; + }); + // 存储历史订单 + if (results.length) { + item.history = true; + item.HistoricalPackageList = results; + } else { + item.history = false; + } + console.log(form.value.basis.discoveryNode, 'form.value.discoveryNode'); + // 判断发现节点(干线车次号、车辆线路处理) + if (['3'].includes(form.value.basis.discoveryNode)) { + let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号 + form.value.Trainoptions = []; + res.data.data.forEach(item => { + if (item.trunklines && item.trunklines.length) { + item.trunklines.forEach(itemChid => { + if (!addedTrainNumbers.includes(itemChid.trainNumber)) { + form.value.Trainoptions.push({ + trainNumber: itemChid.trainNumber, // 车次号 + vehicleRoute: itemChid.vehicleRoute, // 车辆线路 }); + addedTrainNumbers.push(itemChid.trainNumber); } }); - console.log(form.value.Trainoptions, 'form.value.Trainoptions'); } - // 配送环节车次号处理 - if (['5'].includes(form.value.basis.discoveryNode)) { - let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号 - res.data.data.forEach(item => { - if (item.deliver && item.deliver.length) { - item.deliver.forEach(itemChid => { - if (!addedTrainNumbers.includes(itemChid.trainNumber)) { - form.value.deliver.push({ - driverName: itemChid.driverName, // 主司机 - taskTime: itemChid.taskTime, // 配送时间 - trainNumber: itemChid.trainNumber, //车次号 - }); - addedTrainNumbers.push(itemChid.trainNumber); - } + }); + console.log(form.value.Trainoptions, 'form.value.Trainoptions'); + } + // 配送环节车次号处理 + if (['5'].includes(form.value.basis.discoveryNode)) { + let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号 + res.data.data.forEach(item => { + if (item.deliver && item.deliver.length) { + form.value.deliver = []; + item.deliver.forEach(itemChid => { + if (!addedTrainNumbers.includes(itemChid.trainNumber)) { + form.value.deliver.push({ + driverName: itemChid.driverName, // 主司机 + taskTime: itemChid.taskTime, // 配送时间 + trainNumber: itemChid.trainNumber, //车次号 }); + addedTrainNumbers.push(itemChid.trainNumber); } }); - console.log(form.value.Trainoptions, 'form.value.Trainoptions'); } - } else { - form.value.Pageloading = false; //关闭页面加载 - ElMessage({ - message: '暂无查询内容,请检查参数是否正确!', - type: 'warning', - }); - } - }) - .catch(error => { - console.log(error, 'error'); - form.value.Pageloading = false; //关闭页面加载 + }); + console.log(form.value.Trainoptions, 'form.value.Trainoptions'); + } + } else { + form.value.Pageloading = false; //关闭页面加载 + ElMessage({ + message: '暂无查询内容,请检查参数是否正确！或【手动录入信息】', + type: 'warning', }); + } }; // 查看历史包件详情 const Viewdetails = value => { @@ -1502,6 +1554,7 @@ const onSubmit = () => { orderCode: item.orderCode, //订单自编号 first: item.first, //一级品 secondary: item.secondary, //二级品 + thirdProduct: item.thirdProduct, //三级品 brandName: item.brandName, //品牌 }); }); diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue index 9d78aaae..48e0537c 100644 --- a/src/views/aftersales/aftersalesWorkOrderTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue @@ -728,7 +728,7 @@ const ButtonPermissions = computed(() => { Financial_accounting: false, //财务入账 Result_review: UserPermissions.value == Useridentity.Headquarters_customer_service, //结果审核（总部审核处理结果） defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 2: //处理完毕 @@ -745,7 +745,7 @@ const ButtonPermissions = computed(() => { Result_review: false, //结果审核（总部审核处理结果） Financial_accounting: false, //财务入账 defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 3: //待处理 @@ -762,7 +762,7 @@ const ButtonPermissions = computed(() => { Result_review: false, //结果审核（总部审核处理结果） Financial_accounting: false, //财务入账 defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 4: //理赔金额未出 @@ -779,7 +779,7 @@ const ButtonPermissions = computed(() => { Financial_accounting: false, //财务入账 Result_review: false, //结果审核（总部审核处理结果） defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 5: //客服介入 @@ -796,7 +796,7 @@ const ButtonPermissions = computed(() => { Financial_accounting: false, //财务入账 Result_review: false, //结果审核（总部审核处理结果） defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 6: //完结 @@ -813,7 +813,7 @@ const ButtonPermissions = computed(() => { Financial_accounting: UserPermissions.value != Useridentity.Warehouse_customer_service, //财务入账 defaultassignments: false, //默认指派 Result_review: false, //结果审核（总部审核处理结果） - export_Report: false, //导出报表 + export_Report: true, //导出报表 Timed_outexport: false, //超时导出 }; case 7: //超时未处理 @@ -844,7 +844,7 @@ const ButtonPermissions = computed(() => { ArbitrationDetermination: false, //批量完结确定 Financial_accounting: false, //财务入账 defaultassignments: false, //默认指派 - export_Report: false, //导出报表 + export_Report: true, //导出报表 Result_review: false, //结果审核（总部审核处理结果） Timed_outexport: false, //超时导出 }; @@ -860,6 +860,22 @@ const ButtonPermissions = computed(() => { ArbitrationDetermination: false, //批量完结确定 Financial_accounting: false, //财务入账 defaultassignments: false, //默认指派 + export_Report: true, //导出报表 + Result_review: false, //结果审核（总部审核处理结果） + Timed_outexport: false, //超时导出 + }; + case 10: //申诉列表 + return { + add: false, //新增按钮 + batchReject: false, //批量打回 + assignment: false, //工单指派 + applyArbitration: false, //客服介入 + batchFinish: false, //批量完结 + Batchdetermination: false, //批量确定 + ManagerConfirmed:false, //处理完毕下面的客服经理批量确定 + ArbitrationDetermination: false, //批量完结确定 + Financial_accounting: false, //财务入账 + defaultassignments: false, //默认指派 export_Report: false, //导出报表 Result_review: false, //结果审核（总部审核处理结果） Timed_outexport: false, //超时导出 diff --git a/src/views/basicdata/brand/ThreePartyMallManagement.vue b/src/views/basicdata/brand/ThreePartyMallManagement.vue new file mode 100644 index 00000000..6236dbc9 --- /dev/null +++ b/src/views/basicdata/brand/ThreePartyMallManagement.vue @@ -0,0 +1,436 @@ + + + + + diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index fda2ccb8..3fcc1c5e 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -1948,6 +1948,14 @@ export default { onLoad() { //查询详情 if (!!this.$route.query.id) { + if (this.siginImgList?.length) { + this.siginImgList.forEach(item => { + if (item.imgList?.length) { + item.imgList = []; + } + }); + } + this.loading = true; let id = this.$route.query.id; getViewDetailOwn(id).then(res => { diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue index 0ff0ad14..27660487 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue @@ -258,7 +258,7 @@
@@ -334,49 +334,50 @@ :rules="rules" > - - - - - + + - - + + + + + + - + - + @@ -497,8 +503,7 @@ export default { total: 40, }, // 表单数据 - form: { - }, + form: {}, formDetail: {}, // 选择行 selectionList: [], @@ -1004,13 +1009,13 @@ export default { getDictionaryBiz('distribution_type').then(res => { // console.log("...",res.data.data); this.distributionType = []; - this.distributionType= res.data.data.map(item=>{ - if(item.dictKey=='2'){ - console.log(item,'item==???/'); - return item - } - }) - this.form.serviceType='2' + this.distributionType = res.data.data.map(item => { + if (item.dictKey == '2') { + console.log(item, 'item==???/'); + return item; + } + }); + this.form.serviceType = '2'; // this.distributionType }); getDictionaryBiz('logpm_unit').then(res => { @@ -1061,7 +1066,7 @@ export default { message: '操作成功!', }); this.form = {}; - this.form.serviceType='2' + this.form.serviceType = '2'; this.data = []; } else { this.$message.warning('请添加物资详情！！！'); @@ -1072,7 +1077,7 @@ export default { this.form.totalInput = null; } this.form.type = '1'; - this.form.serviceType='2' + this.form.serviceType = '2'; this.form.list = this.data; await update(this.form); this.box = false; @@ -1113,7 +1118,7 @@ export default { }); }); this.form = {}; - this.form.serviceType='2' + this.form.serviceType = '2'; this.data = []; // 操作完成后关闭本页标签 this.$store.commit('DEL_TAG', this.$store.state.tags.tag); @@ -1351,10 +1356,10 @@ export default { width: 25vw; min-width: 20vw; } -.drawer-footer{ - position: fixed; - bottom: 10px; - left: 50%; - z-index: 999; +.drawer-footer { + position: fixed; + bottom: 10px; + left: 50%; + z-index: 999; } From fd9918d197e34aaf03da8b2158b41271990c2f98 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 11 Nov 2024 18:34:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85?= =?UTF-8?q?=E5=8D=B8=E8=BD=A6=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/truckLoadingDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/distribution/truckLoadingDetails.js b/src/api/distribution/truckLoadingDetails.js index 3719421a..21c94d47 100644 --- a/src/api/distribution/truckLoadingDetails.js +++ b/src/api/distribution/truckLoadingDetails.js @@ -127,7 +127,7 @@ export const postUnloadZero = data => { */ export const postZeroUnloadEnter = data => { return request({ - url: '/api/logpm-trunkline/api/carsLoad/zeroUnloadEnter ', + url: '/api/logpm-trunkline/carsLoad/zeroUnloadEnter ', method: 'post', data, }); From bb9666623f442c8dc71a68924842d831a4b88199 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 11 Nov 2024 18:47:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=95=86=E5=9C=BA=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brand/ThreePartyMallManagement.vue | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/basicdata/brand/ThreePartyMallManagement.vue b/src/views/basicdata/brand/ThreePartyMallManagement.vue index 6236dbc9..2f6577c9 100644 --- a/src/views/basicdata/brand/ThreePartyMallManagement.vue +++ b/src/views/basicdata/brand/ThreePartyMallManagement.vue @@ -108,7 +108,6 @@ @click="handleSubmit" >提 交 - 取 消 @@ -320,6 +319,20 @@ const remoteMethod = value => { }); }); }; +const GeBrandListt = async () => { + let res = await getBrandList(); + const { + code, + data: { records }, + } = res.data; + if (code !== 200) return; + brandList.value = records.map(val => { + return { + value: val.id, + label: val.brandName, + }; + }); +}; // 字典公共函数 function updateDictionary(targetArray, dictionaryType) { getDictionaryBiz(dictionaryType).then(res => { @@ -369,12 +382,15 @@ const onLoadPage = async () => { details.loadingObj.list = true; await Dictionaryrequest(); onLoad(); + GeBrandListt(); }; // 页面初始化 onLoadPage(); // 编辑 const edit = async row => { + details.loadingObj.list = true; let res = await getDetail(row.id); + details.loadingObj.list = false; malldialog.value = true; form.value = res.data.data; console.log(res); @@ -390,7 +406,7 @@ const handleSubmit = async () => { } }; // 删除 -const ViewDelete = () => { +const ViewDelete = (row) => { ElMessageBox.confirm('是否确认删除数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',