From e499bda2db2de780e79cdb153dfd4ada5a69b0a4 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Wed, 3 Jan 2024 18:36:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/inventory/distrilbutionBillLading.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index aadfca5e..b7b827ac 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2257,6 +2257,7 @@ export default { this.order.orderChooseLoading = true; this.order.query.stockArticleId = this.orderChooseId; this.order.query.conditions = '1'; + this.order.query.orderPackageReservationStatus = '10'; await getList(this.order.currentPage, this.order.pageSize, { ...params, ...this.order.query, From 14f437f78dc54e289a14fa029a0cbbe4f301f980 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 3 Jan 2024 19:27:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 10 +- src/views/aftersales/aftersalesWorkOrder.vue | 33 ++-- .../aftersales/aftersalesWorkOrderAdd.vue | 29 ++-- .../aftersales/aftersalesWorkOrderInfo.vue | 1 + .../aftersales/aftersalesWorkOrderend.vue | 147 ++++++++---------- .../turndelivery/deliveryDiscuss.vue | 30 +++- 6 files changed, 130 insertions(+), 120 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 579be389..5eb6a6a7 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -374,11 +374,19 @@ export const $_updateWorkList = (data) => { }) } -// 处理结果存储 +// 处理结果确定 export const $_updateWorkOrderStatus = (data) => { return request({ url: '/api/logpm-aftersales/aftersalesWorkOrder/updateWorkOrderStatus', method: 'put', data }) +} +// 完结结果确定 +export const $_updateManagerConfirmed = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/updateManagerConfirmed', + method: 'put', + data + }) } \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index f41405b3..7a933e5e 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -672,7 +672,6 @@ const TabList = ref([ { name: 8, label: '待回复' }, { name: 1, label: '处理中' }, { name: 2, label: '处理完毕' }, - { name: 9, label: '预订单' }, { name: 6, label: '完结' }, { name: 5, label: '仲裁中' }, { name: 4, label: '理赔金额未出' }, @@ -1961,19 +1960,12 @@ const tabChenge = val => { ProcessingPartyState.value = false; //关闭处理方 ArbitrationStatus.value = true; //可以申请仲裁 } else if (val == 2) { - if (UserPermissions.value == '仓库客服') { + console.log('处理完毕'); data.workOrderStatus = 30; details.query.workOrderStatus = 30; Tableheaderswitching(columnList); empty(); - ProcessingPartyFun(data); - } else { - data.workOrderStatus = 50; - details.query.workOrderStatus = 50; - Tableheaderswitching(columnList); - empty(); IndexTable(data); - } // 处理完毕 ProcessingPartyState.value = false; //关闭处理方 ArbitrationStatus.value = false; //不可以申请仲裁 @@ -1981,13 +1973,21 @@ const tabChenge = val => { // 待处理 console.log(UserPermissions.value, '当前身份'); console.log('待处理'); - ProcessingPartyState.value = true; //开启处理方 - data.workOrderStatus = 10; - details.query.workOrderStatus = 10; - ArbitrationStatus.value = true; //可以申请仲裁 - Tableheaderswitching(columnList); - empty(); - IndexTable(data); + if (UserPermissions.value == '仓库客服') { + ProcessingPartyState.value = true; //开启处理方 + data.workOrderStatus = 10; + details.query.workOrderStatus = 10; + ArbitrationStatus.value = true; //可以申请仲裁 + Tableheaderswitching(columnList); + empty(); + IndexTable(data); + } else { + data.workOrderStatus = 50; + details.query.workOrderStatus = 50; + Tableheaderswitching(columnList); + empty(); + ProcessingPartyFun(data); //单独接口 + } } else if (val == 4) { ProcessingPartyState.value = false; //关闭处理方 // 理赔金额未出 @@ -2737,6 +2737,7 @@ const CompletedSubmission = () => { .name { display: flex; margin: 10px 5%; + span { display: block; width: 90px; diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 74fd9a15..056b11c0 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -488,7 +488,7 @@
处理结果-理赔金额
- {{ item.name }}: + {{ item.name }}:
{{ item.payment ? item.text : '支付方式' }}
+
+ +
{ payment: '', text: '', compensationTime: '', + paymentUnit:'', }; // 根据num为newItem的name字段赋值 switch (num) { @@ -1055,17 +1062,17 @@ const CompanyProportionInput = () => { const ConfirmForm = () => { // 提货责任方 // 支付方式校验 - if(ProcessingList.value.length){ + if (ProcessingList.value.length) { for (let item of ProcessingList.value) { - if (!item.payment) { - ElMessage({ - message: `请选择${item.name}的支付方式`, - type: 'warning', - }); - return; + if (!item.payment) { + ElMessage({ + message: `请选择${item.name}的支付方式`, + type: 'warning', + }); + return; + } } } - } console.log(Indexform.value.businessMame, '提货责任方'); let DataSubmit = { personResponsibleDTO: [], @@ -1269,6 +1276,7 @@ const ConfirmForm = () => { : '未知支付方式', resultName: item.name, //处理结果名字 compensationTime: item.compensationTime, //支付时间 + paymentUnit:item.paymentUnit,//支付单位 }; } else { return null; @@ -1863,4 +1871,7 @@ const ViewPackageDetails = val => { .el_Processingresults { margin-top: 12px; } +.el_PaymentUnit{ + margin: 0 4px; +} diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index ea16be32..46ca23d5 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -757,6 +757,7 @@ const ButtonPermissions = computed(() => { ArbitrationCompleted: false, //客服仲裁完结 edit: false, //编辑 }; + case RouteIndexs.value == 8: //待回复 return { reply: UserPermissions.value == '仓库客服', //回复按钮 diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 84fb9388..dbb67046 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -329,6 +329,7 @@
{{ item.payment ? item.text : '支付方式' }}
+
- +
+ 支付单位: + +
总金额:{{ TotalClaimAmount }}元
@@ -548,7 +552,11 @@ >提交 - 确定 @@ -799,6 +807,7 @@ import { $_getList, $_getProcessor, $_updateWorkOrderStatus, + $_updateManagerConfirmed, } from '@/api/aftersales/aftersalesWorkOrder'; import { columnList, recordList } from '@/option/aftersales/vueTvemp.js'; import { getToken } from '@/utils/auth'; @@ -822,6 +831,7 @@ const TotalamountReceived = ref(0); //收款金额合计 const personResponsibleList = ref([]); //责任人列表 const msgHight = ref(100); //聊天框消息高度 const msgTop = ref(0); //聊天框吸顶距离 +const paymentUnit = ref(''); //支付单位 const scrollContainer = ref(null); //客服实例 const KFfeel = ref([]); //附件链接 const MessageResponsibility = ref([]); //消息的处理方选择 @@ -1094,6 +1104,7 @@ const onLoad = () => { name: item.resultTypeName, text: item.compensationMethodName, compensationTime: item.compensationTime, + // paymentUnit:item.paymentUnit, }; } ); @@ -1281,6 +1292,7 @@ const changeProcessingResults = val => { payment: '', text: '', compensationTime: '', + // paymentUnit:'', }; // 根据num为newItem的name字段赋值 switch (num) { @@ -1346,7 +1358,6 @@ const fellSuccess = (response, uploadFile) => { } }; - // 视频上传成功 const ViodSuccess = response => { if (response.success == true) { @@ -1620,87 +1631,39 @@ const PaymentConfirmation = val => { }; // 确定存储 -const DetermineStorage=()=>{ - console.log($route.query.id, '异常ID'); - console.log(ProcessingList.value, 'ProcessingList12312'); - let data = { - aftersalesProcessingResultsDTO: { - }, - processingMoneyEntityList: [], //赔付方式 - assignList:[{}] - }; - let a={} - a=$route.query.id - data['assignList'].push(a) - data.id = $route.query.id; - data.aftersalesProcessingResultsDTO['workOrderId'] = $route.query.id; //异常工单ID - let sum = 0; //金额总计 - for (let i = 0; i < ProcessingList.value.length; i++) { - console.log(ProcessingList.value[i].input); - sum = computeNumber(sum, '+', ProcessingList.value[i].input).result; - } - data.aftersalesProcessingResultsDTO.money = sum; //金额汇总 - // data['compensationMethod'] = Paymentmethod.value.filter( - // item => item.dictKey == endFrom.value.compensationMethod - // )[0].dictValue; //目前是单选 - - // data['compensationMethod'] = endFrom.value.compensationMethod.join(','); //赔付方式多选 - // console.log(data['compensationMethod']); - console.log(Paymentmethod.value, 'Paymentmethod.value'); - data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value - .map(item => item.text) - .join(','); - data['processingMoneyEntityList'] = ProcessingList.value - .map(item => { - console.log(item); - let match = ProcessingResults.value.find(element => element.dictValue == item.name); - if (match) { - let paymentMethodMatch = Paymentmethod.value.find( - paymentMethod => paymentMethod.dictKey == item.payment - ); - return { - resultType: match.dictKey, //赔方式的key - money: item.input, //金额 - typesOf: 1, //固定参数 - compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式', - compensationMethodName: paymentMethodMatch - ? paymentMethodMatch.dictValue - : '未知支付方式', - resultName: item.name, //处理结果名字 - compensationTime: item.compensationTime, //赔付时间 - }; - } else { - return null; - } - }) - .filter(item => item !== null); - data.aftersalesProcessingResultsDTO.processingMoneyEntityList = - data['processingMoneyEntityList']; - console.log('走到了这一步'); - data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID - data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value - .map(item => item.name) - .join(','); //处理结果说明文字拼接 - let imgLink = ''; //存储图片地址 - // 图片处理存在问题 - // if (endFrom.value['packageImage'].length) { - // imgLink = endFrom.value['packageImage'].map(item => item.response.data.link).join(','); //图片处理 - // } - if (videoUrl.value && imgLink) { - data.aftersalesProcessingResultsDTO['annex'] = videoUrl.value + ',' + imgLink; - } else { - data.aftersalesProcessingResultsDTO['annex'] = imgLink; - } - - console.log(data, '处理好的数据'); - delete data.aftersalesProcessingResultsDTO.id; //删除ID字段 - - data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //仓库ID +const DetermineStorage = () => { + let data = { + assignList: [], + }; + let a = {}; + a = $route.query.id; + data['assignList'].push(a); + if (routerState.value == 'end') { + $_updateManagerConfirmed(data).then(res => { + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + console.log(res, '完结确定'); + }); + // 赔款方 + console.log(data, '处理好的值'); + } else { + console.log(a); console.log(data, '处理好的数据'); - // $_updateWorkOrderStatus(data).then(res=>{ - // console.log(res,'确定提交存储'); - // }) -} + $_updateWorkOrderStatus(data).then(res => { + console.log(res, '确定提交存储'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + }); + } +}; // 提交信息 const submit = () => { @@ -1842,12 +1805,14 @@ const submit = () => { : '未知支付方式', resultName: item.name, //处理结果名字 compensationTime: item.compensationTime, //赔付时间 + // paymentUnit: item.paymentUnit, //赔付单位 }; } else { return null; } }) .filter(item => item !== null); + data.aftersalesProcessingResultsDTO.paymentUnit = paymentUnit.value; //支付单位 data.aftersalesProcessingResultsDTO.processingMoneyEntityList = data['processingMoneyEntityList']; console.log('走到了这一步'); @@ -1888,7 +1853,6 @@ const submit = () => { // 消息回复 const replyMessage = () => { console.log(MessageContent.value, '当前的聊天记录'); - console.log(warehouseData.value, '参数1212312312312312'); console.log(MessageResponsibility, '责任方'); let msgData = { @@ -2119,7 +2083,7 @@ const CustomerServiceCompleted = () => { display: flex; margin-bottom: 20px; height: 30px; - width: 46%; + width: 68%; span { display: block; width: 30%; @@ -2297,7 +2261,7 @@ const CustomerServiceCompleted = () => { } // 数字输入框 :deep(.el-input-number) { - width: 47%; + width: 26%; } .contemtMax { display: flex; @@ -2567,4 +2531,15 @@ const CustomerServiceCompleted = () => { .el-endtabs { margin-top: 26px; } +.el_PaymentUnit { + display: flex; + span { + display: flex; + align-items: center; + width: 120px; + } + :deep(.el-input) { + width: 150px; + } +} diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 425b891f..1ad7e24e 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -403,14 +403,15 @@
- + 订单总件数:{{Totalnumberoforders}} + / + 在库总件数:{{Totalnumberofitemsinstock}} +
+