diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index b2e6793c..70683ae5 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1927,8 +1927,8 @@ const tabChenge = val => { } else if (val == 3) { console.log(UserPermissions.value, '当前身份'); if (UserPermissions.value == '仓库客服') { - data.workOrderStatus = 10; - details.query.workOrderStatus = 10; + data.workOrderStatus = ''; + details.query.workOrderStatus = ''; ArbitrationStatus.value = true; //可以申请仲裁 Tableheaderswitching(columnList); empty(); diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 82bdeaab..2ccd8cda 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -42,55 +42,60 @@ - + - -
-
添加信息
-
-
-
- 包条码: - -
- -
- 订单自编码: - -
- -
- 运单号: - + +
+
添加信息
+
+
+
+ 包条码: + +
+ +
+ 订单自编码: + +
+ +
+ 运单号: + +
+ +
+ 品牌: + +
-
- 品牌: - +
+ + 查看历史包件 + + 移除
- -
- - 查看历史包件 - - 移除 +
+ 总件数:{{ NumberPackages }}
-
- 总件数:{{ NumberPackages }} -
-
- - + + - - + - @@ -404,7 +407,6 @@ -
占比: @@ -417,11 +419,11 @@ /> %
-
+
三方责任人: - +
- +
说明: { // 车次号自动带出时间司机 function DeliveryTrainnumber() { - if(!Indexform.value.trainNumber){ - Indexform.value.deliveryTime='' - Indexform.value.deliveryDriver='' - DeliveryDriver.value =[] + if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) { + Indexform.value.deliveryTime = null; + Indexform.value.deliveryDriver = ''; + DeliveryDriver.value = []; } - if(!Indexform.value.trainNumber){ - return + if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) { + return; } let data = { trainNumber: Indexform.value.trainNumber, @@ -799,7 +807,7 @@ const responsibleParty = () => { FangAddList.value.push({ businessName: '', personResponsibleName: '', - tripartite:'', + tripartite: '', responsibilityRatio: '', description: '', }); @@ -975,7 +983,7 @@ const ConfirmForm = () => { personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称 responsibilityRatio: item.responsibilityRatio, //责任比例 - tripartite:item.tripartite,//三方责任人 + tripartite: item.tripartite, //三方责任人 }); }); } @@ -991,7 +999,7 @@ const ConfirmForm = () => { personResponsibleId: '', personResponsibleName: item.personResponsibleName, //责任人名称 responsibilityRatio: item.responsibilityRatio, //责任比例 - tripartite:item.tripartite,//三方责任人 + tripartite: item.tripartite, //三方责任人 }); }); } @@ -1169,7 +1177,7 @@ const ChangePackageInfo = (val, index) => { // PackageInfo.value[index].second = ''; //二级品 // PackageInfo.value[index].mallName = ''; //客户名称 // PackageInfo.value[index].mallId = ''; //客户ID - + Statistics(); //调用统计包件信息 let data = { packageCode: val, @@ -1179,28 +1187,33 @@ const ChangePackageInfo = (val, index) => { console.log(res.data.data, '包件信息'); if (res.data.data.length) { const packageData = res.data.data[0]; + console.log(packageData,'获取的第一个参数'); PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码 PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号 PackageInfo.value[index].orderId = packageData.orderId; //运单号 PackageInfo.value[index].brandName = packageData.brandName; //品牌 PackageInfo.value[index].state = false; //状态 - Indexform.value.first=packageData.first;//一级品 - Indexform.value.secondary=packageData.secondary;//二级品 - console.log(packageData,'处理的包件参数'); - console.log(Indexform.value.firsts,'一级品'); - console.log(Indexform.value.second,'二 级品'); + + 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; //状态 } - }); + }); + + Indexform.value.first = packageData.firsts; //一级品 + Indexform.value.secondary = packageData.second; //二级品 + Indexform.value.waybillMall = packageData.mallName;//客户名称(运单商场) } // packageCode; //包件码 // //订单自编码 // orderCode: orderId; //运单号 // workOrderId; //工单id // workOrderNumber; //工单名称 + console.log(PackageInfo.value, '处理好的参数'); }); }; @@ -1458,7 +1471,7 @@ const ViewPackageDetails = val => { margin-bottom: 10px; width: 97%; border-left: none; - .el-tabs__header{ + .el-tabs__header { } } .NumTotal { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index f92ed37f..58d728ef 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -182,12 +182,12 @@ text icon="el-icon-view" @click="handleSignone(slotProps.scope.row)" - - >一键签收 - + " + >一键签收 +