diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 9ac15e99..55f4659c 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -3458,9 +3458,10 @@ const ResultConfirmation = val => { if (ConfirmStatus) { // 走的批量确认 let state = details.selectionList.every(item => item.workOrderStatus == '21'); + console.log(state,'state'); if (!state) { ElMessage({ - message: '批量确认中有状态不符合的必须为处理结果已提交', + message: '勾选单子中有已经确认的请取消勾选!', type: 'warning', }); return; diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 36f935a1..1306506d 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -605,8 +605,6 @@ - - @@ -1069,7 +1067,6 @@ const CompanyProportionInput = value => { // 理赔总金额计算 const Totalamount = () => { console.log(form.value.Claimamount); - form.value.Totalamount = form.value.Claimamount.map(res => res.money).reduce( (accumulator, currentValue) => accumulator + currentValue, 0 @@ -1077,16 +1074,14 @@ const Totalamount = () => { }; const Claimssettlement = value => { - console.log(value, '理赔金额'); - console.log(Processingresultsoptions.value, '参数列表'); - let data = []; - value.forEach(item => { + if(value.length){ + let data = []; + value.forEach(item => { let _data = Processingresultsoptions.value.find(res => res.value == item); if (_data) { data.push(_data); } }); - console.log(data, '筛选出来的值'); form.value.Claimamount = []; if (data && data.length) { data.forEach(item => { @@ -1100,6 +1095,7 @@ const Claimssettlement = value => { }); }); } + } }; // 图片上传必须携带TOKEN const headers = computed(() => { @@ -1377,7 +1373,7 @@ const allFieldsFilled = computed(() => { form.value.Processed = allFilled; return allFilled; }); -// 提交 +// 结果提交 const onSubmit = () => { console.log(form.value); ruleFormRef.value.validate(valid => { @@ -1511,7 +1507,7 @@ const onSubmit = () => { } }); } - + // 处理结果 if (form.value.basis.result.length) { submitData.aftersalesProcessingResultsDTO = { @@ -1550,8 +1546,9 @@ const onSubmit = () => { submitData.aftersalesProcessingResultsDTO.resultDescription = form.value.basis.resultDescription; //处理结果说明 delete form.value.basis.resultDescription; //删除无用信息 + }else{ + delete submitData.result;//删除处理结果字段 } - console.log(submitData, '处理好的参数'); form.value.Pageloading = true; //关闭页面加载 @@ -1559,6 +1556,8 @@ const onSubmit = () => { if (form.value.Processed) { submitData.workOrderStatus = 30; } + //移除责任方表单(必须) + delete submitData.processor; $_submit(submitData) .then(res => { ElMessage({ diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index d6811091..12efc5a8 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -312,6 +312,7 @@
确定审核 --> 完结完结工单 打回 { tripartite: res.tripartite, //三方责任人 }; }); - console.log(FangAddList.value, '责任方回显问题'); res.data.data.processorVOList.forEach(item => { if (item) { if (item.typesOf == 2) { @@ -2241,9 +2241,11 @@ const ResultDetermination = () => { border-bottom: 1px solid #d5d5d563 !important; border-right: 1px solid #d5d5d563 !important; } - .el-endtabs { margin-top: 10px; + :deep(.is-active){ + font-weight: bold; + } } :deep(.custom-tabs-label) { @@ -2408,8 +2410,9 @@ const ResultDetermination = () => { } } .el_top { - display: flex; width: 100%; + padding: 6px 0; + display: flex; justify-content: space-between; :deep(.el-form-item) { display: flex; diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 605206c4..791bf234 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -93,7 +93,13 @@ + +
新 增 + +
+ + 搜索 +
+