From d37a361a31784e55d5493ce214ea424c564186fc Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 2 Jan 2024 19:49:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E4=BD=9C=E6=A8=A1?=
=?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A4=84=E7=90=86=E7=BB=93?=
=?UTF-8?q?=E6=9E=9C=E5=8D=95=E6=9D=A1=E5=AF=B9=E5=BA=94=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/aftersales/aftersalesWorkOrder.vue | 2 +-
.../aftersales/aftersalesWorkOrderAdd.vue | 81 +++++++++++--------
2 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 15808050..6bc88dc8 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -97,7 +97,7 @@
<!-- v-if="ButtonPermissions.applyArbitration" -->
<!-- v-if="PermissionButton.apply_arbitration" -->
- <el-button type="primary" @click="arbitrate">申请仲裁</el-button>
+ <el-button type="primary" @click="arbitrate">客服介入</el-button>
<el-button type="primary" @click="DingTalk">钉钉号填写</el-button>
<!-- v-if="ButtonPermissions.batchFinish" -->
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 6d7b198c..7d0685b6 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -277,6 +277,13 @@
<el-form-item label="运单商场">
<el-input v-model="Indexform.waybillMall" placeholder="请输入运单商场" clearable />
</el-form-item>
+
+ <el-form-item label="合作模式">
+ <el-input v-model="Indexform.typeServiceName" disabled placeholder="请输入运单商场" clearable />
+ </el-form-item>
+
+
+
<!-- <el-form-item label="钉钉流程号">
<el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
</el-form-item> -->
@@ -495,7 +502,6 @@
<div class="el_tool">
<span>总金额:{{ TotalClaimAmount }}</span>
</div>
-
</div>
</el-tab-pane>
</el-tabs>
@@ -694,7 +700,7 @@ const ProcessingList = ref([]); //处理结果已经选择的列表
const Paymentmethod = ref([]); //支付方式
const PackageInfo = ref([
//包件信息
- { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' },
+ { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false },
]);
// 责任方列表
const FangAddList = ref([
@@ -978,7 +984,13 @@ const handlePictureCardPreview = uploadFile => {
// 添加包件
const AddPackage = () => {
- PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '', brandName: '' });
+ PackageInfo.value.push({
+ packageCode: '',
+ orderCode: '',
+ waybillNumber: '',
+ brandName: '',
+ state: false,
+ });
};
// 包件移除
const PackagRemoval = val => {
@@ -1228,28 +1240,28 @@ const ConfirmForm = () => {
}
DataSubmit.aftersalesProcessingResultsDTO.money = sum; //金额汇总
DataSubmit.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value
- .map(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);
+ .map(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);
}
delete DataSubmit.duty, //移除多余字段
@@ -1403,16 +1415,21 @@ const ChangePackageInfo = (val, index) => {
console.log(packageData, '处理的包件参数');
console.log(Indexform.value.firsts, '一级品');
console.log(Indexform.value.second, '二 级品');
- res.data.data.find(item => {
- if (item.workOrderId && item.workOrderNumber) {
- HistoricalPackageList.value = res.data.data;
- PackageInfo.value[index].state = true; //状态
- }
+ const results = res.data.data.filter(item => {
+ return item.workOrderId && item.workOrderNumber;
});
-
+ console.log(results, '筛选后的结果');
+ if (results.length > 0) {
+ HistoricalPackageList.value = results;
+ PackageInfo.value[index].state = true; //状态
+ }else{
+ PackageInfo.value[index].state = false; //状态
+ }
+ // 确保在没有满足条件的元素时，不执行 HistoricalPackageList 和 PackageInfo 的赋值操作
Indexform.value.first = packageData.firsts; //一级品
Indexform.value.secondary = packageData.second; //二级品
Indexform.value.waybillMall = packageData.mallName; //客户名称（运单商场）
+ Indexform.value.typeServiceName = packageData.typeServiceName; //合作模式
}
// packageCode; //包件码
// //订单自编码
@@ -1822,7 +1839,7 @@ const ViewPackageDetails = val => {
.Paymentname:hover {
border: 1px solid #172e60;
}
-.el_Processingresults{
+.el_Processingresults {
margin-top: 12px;
}
</style>