From b8389e67798ce08226693997d21c7346c32c9ae5 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 23 Dec 2023 10:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/aftersales/aftersalesWorkOrder.vue | 3 +-
.../aftersales/aftersalesWorkOrderAdd.vue | 58 ++++---
.../aftersales/aftersalesWorkOrderInfo.vue | 155 ++++++++++--------
3 files changed, 120 insertions(+), 96 deletions(-)
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index c8b0d566..558d7624 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -1366,7 +1366,7 @@ const ButtonPermissions = computed(() => {
batchReject: UserPermissions.value == '职能客服', //批量打回
assignment: UserPermissions.value == '客服经理', //工单指派
applyArbitration: UserPermissions.value == '仓库客服', //申请仲裁
- batchFinish: UserPermissions.value == '职能客服', //批量完结
+ batchFinish: UserPermissions.value != '仓库客服', //批量完结
appeal: false, //申诉
};
case 1: //处理中
@@ -1737,6 +1737,7 @@ const view = val => {
workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
businessId: val.row.businessId,
ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
+ RouteIndexs:TabPermissions.value,//当前记录参数
},
});
return;
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 425a2550..d90a714d 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -159,7 +159,7 @@
@@ -185,7 +185,6 @@
clearable
@change="DeliveryTrainnumber"
/>
-
-->
-
-
@@ -653,7 +650,6 @@ const ImgSuccess = (response, uploadFile) => {
console.log(response);
console.log(Indexform.value['packList'], '图片列表');
amplifysrcList.value.push(response.data.link);
-
}
};
@@ -672,9 +668,9 @@ const beforeAvatarUpload = rawFile => {
// 点击图片列表回调
const pictureList = val => {
console.log(val, '图片列表');
- dialogImgList.value=true;
+ dialogImgList.value = true;
console.log(val, '图片列表');
- amplifyurl.value=val.url;
+ amplifyurl.value = val.url;
};
// 点击图片移除
const ImgListRemove = val => {
@@ -745,7 +741,7 @@ const DiscoveringNodesChange = val => {
function DeliveryTrainnumber() {
let data = {
trainNumber: Indexform.value.trainNumber,
- taskTime:Indexform.value.deliveryTime
+ taskTime: Indexform.value.deliveryTime,
};
data.current = 1; //页码
data.size = 999; //条数
@@ -848,7 +844,20 @@ const ConfirmForm = () => {
});
}
}
-
+ if (SelectType.value == 1 && DataSubmit['decreaseImageEntityList'].length < 2) {
+ ElMessage({
+ message: '货损至少提供2张图片附件',
+ type: 'warning',
+ });
+ return;
+ }
+ if (SelectType.value == 3 && !DataSubmit['decreaseImageEntityList'].length) {
+ ElMessage({
+ message: '窜货必须提供图片附件',
+ type: 'warning',
+ });
+ return;
+ }
console.log(DataSubmit['decreaseImageEntityList'], '处理好的图片');
//司机信息处理
if (Indexform.value.deliveryDriver) {
@@ -1027,12 +1036,12 @@ const ConfirmForm = () => {
});
};
// 选择司机带出车次号日期
-const changeDeliveryDriver=(val)=>{
-console.log(val);
-console.log(DeliveryDriver.value,'司机信息');
-Indexform.value.trainNumber= DeliveryDriver.value.find(res=>res.id==val).trainNumber;//车次号
-Indexform.value.deliveryTime= DeliveryDriver.value.find(res=>res.id==val).taskTime;//日期
-}
+const changeDeliveryDriver = val => {
+ console.log(val);
+ console.log(DeliveryDriver.value, '司机信息');
+ Indexform.value.trainNumber = DeliveryDriver.value.find(res => res.id == val).trainNumber; //车次号
+ Indexform.value.deliveryTime = DeliveryDriver.value.find(res => res.id == val).taskTime; //日期
+};
// 少货件数对应事件
const ShortageTtems = val => {
ShortageList.value = []; //进入之前重置参数
@@ -1152,12 +1161,12 @@ const ChangePackageInfo = (val, index) => {
PackageInfo.value[index].orderId = packageData.orderId; //运单号
PackageInfo.value[index].brandName = packageData.brandName; //品牌
PackageInfo.value[index].state = false; //状态
- res.data.data.find(item=>{
- if(item.workOrderId && item.workOrderNumber){
+ res.data.data.find(item => {
+ if (item.workOrderId && item.workOrderNumber) {
HistoricalPackageList.value = res.data.data;
- PackageInfo.value[index].state = true; //状态
+ PackageInfo.value[index].state = true; //状态
}
- })
+ });
}
// packageCode; //包件码
// //订单自编码
@@ -1216,7 +1225,7 @@ const ViewPackageDetails = val => {
flex-wrap: wrap;
justify-content: flex-start;
border: 1px solid #ccc;
- border-bottom: none;
+ border-bottom: none;
.el-form-item {
height: 46px;
display: flex;
@@ -1351,11 +1360,11 @@ const ViewPackageDetails = val => {
width: 80%;
display: flex;
justify-content: space-between;
- .el_zb{
+ .el_zb {
width: 140px;
margin-right: 50px;
text-align: right;
- :deep(.el-input){
+ :deep(.el-input) {
margin-left: 10px;
text-align: right;
}
@@ -1443,11 +1452,10 @@ const ViewPackageDetails = val => {
border-bottom: 1px solid #e4e7ed !important;
}
:deep(.topClass) {
- border-bottom:none;
+ border-bottom: none;
.el-tabs__content {
padding: 0;
}
-
}
.foot_btn {
position: fixed;
@@ -1471,7 +1479,7 @@ const ViewPackageDetails = val => {
align-items: center;
justify-content: center;
}
-.box-card{
+.box-card {
height: 100% !important;
overflow-y: scroll;
}
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 2d5146f4..af9d159b 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -432,26 +432,26 @@
-
-
+
+
@@ -495,14 +495,12 @@