From 1259b0985551ef8dc8d10574f046887b1e8b56c8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 12 Jan 2024 15:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E4=BF=AE=E5=A4=8D=E5=B7=B2?=
=?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/aftersales/aftersalesWorkOrder.vue | 25 +-
.../aftersales/aftersalesWorkOrderAdd.vue | 297 ++++++++++--------
.../aftersales/aftersalesWorkOrderInfo.vue | 10 +-
.../aftersales/aftersalesWorkOrderend.vue | 89 +++---
.../aftersales/aftersalesWorkOrdermodify.vue | 109 +++++--
.../driverArtery/basicdataDriverArtery.vue | 80 ++++-
6 files changed, 402 insertions(+), 208 deletions(-)
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index e2ef7eb9..68b97349 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -188,7 +188,7 @@
确定 {
};
// 首页查看详情按钮
const view = val => {
- console.log(val.row.id);
+ console.log(val.row);
+ // 理赔查看
+ if(TabPermissions.value==4){
+ $router.push({
+ // AppealStatusT为真表示是申诉列表
+ path: '/aftersales/aftersalesWorkOrderInfo',
+ query: {
+ id: val.row.lawoId,
+ appealID: val.row.id, //只有申诉才需要的参数
+ name: val.row.workOrderNumber + '-信息查看',
+ warehouseId: val.row.warehouseId,
+ workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
+ businessId: val.row.businessId,
+ ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
+ RouteIndexs: TabPermissions.value, //当前记录参数
+ Routstate: '', //申诉列表
+ AppealReview: val.row.typesOf ? (val.row.typesOf == '0' ? 'true' : 'false') : 'true', //当前只能查看申诉详情信息
+ },
+ });
+ return
+ }
+
$router.push({
// AppealStatusT为真表示是申诉列表
path: '/aftersales/aftersalesWorkOrderInfo',
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 09e40f12..f5b971ad 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -97,7 +97,13 @@
:content="item.orderCode ? item.orderCode : '订单自编号'"
placement="top"
>
-
+
@@ -105,7 +111,11 @@
-
+
@@ -632,7 +642,7 @@ const fleeingState = ref(false); //窜货件数弹窗
const ShortageList = ref([]); //少货件数
const fleeingList = ref([]); //窜货件数
const valueStrictly = ref();
-const ProcessingreleaseState=ref(false)//是否可以填写处理结果
+const ProcessingreleaseState = ref(false); //是否可以填写处理结果
const routerID = ref(null); //路由参数ID
const routerState = ref(''); //路由状态
const personResponsibleList = ref([]); //责任人列表
@@ -648,7 +658,7 @@ const amplifyurl = ref(''); //当前点击的图片
const amplifysrcList = ref([]); //图片循环列表
const ProcessingList = ref([]); //处理结果已经选择的列表
const Paymentmethod = ref([]); //支付方式
-const Mydata=ref();//当前登录人信息
+const Mydata = ref(); //当前登录人信息
const PackageInfo = ref([
//包件信息
{ packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false },
@@ -764,8 +774,8 @@ const onLoad = () => {
// DeliveryTrainnumber(); //获取司机
console.log($route.query.id, '页面初始化');
routerState.value = $route.query.routerState;
- Mydata.value=JSON.parse(localStorage.getItem('my_data'));//记录本地登录
- console.log(Mydata.value,'记录本地登录');
+ Mydata.value = JSON.parse(localStorage.getItem('my_data')); //记录本地登录
+ console.log(Mydata.value, '记录本地登录');
updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
handle(); //处理方和责任方信息
@@ -959,7 +969,7 @@ const AddPackage = () => {
waybillNumber: '',
brandName: '',
state: false,
- mallName:''
+ mallName: '',
});
};
// 包件移除
@@ -996,7 +1006,14 @@ const ResponsibilityRemoval = val => {
// 顶部标签切换
const TopChange = val => {
PackageInfo.value = [
- { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false,mallName:'' },
+ {
+ packageCode: '',
+ orderCode: '',
+ waybillNumber: '',
+ brandName: '',
+ state: false,
+ mallName: '',
+ },
]; //重置包件信息
Indexform.value = {}; //重置表单
@@ -1131,19 +1148,6 @@ const ConfirmForm = () => {
let processorEntityList = [];
- //责任方信息处理
- if (Indexform.value.processor.length) {
- Indexform.value.processor.forEach(item => {
- let found = warehouseData.value.find(element => element.value == item.toString());
- processorEntityList.push({
- businessName: found ? found.label : '',
- businessId: item,
- conditions: 1,
- typesOf: 2,
- });
- });
- }
-
DataSubmit.processorEntityList = processorEntityList;
DataSubmit.decreaseImageEntityList = JSON.parse(
JSON.stringify(Indexform.value['decreaseImageEntityList'])
@@ -1154,19 +1158,28 @@ const ConfirmForm = () => {
// 如果存在包件信息进行处理
if (PackageInfo.value.length) {
PackageInfo.value.forEach(item => {
- DataSubmit['packageEntityList'].push({
- number: PackageInfo.value.length, //数量
- packageCode: item.packageCode ? item.packageCode : null, //包件码
- waybillNumber: item.waybillNumber ? item.waybillNumber : null, //运单号
- orderCode: item.orderCode ? item.orderCode : null, //订单自编码
- brandName: item.brandName ? item.brandName : null, //品牌
-
- });
+ if (item.packageCode) {
+ DataSubmit['packageEntityList'].push({
+ number: PackageInfo.value.length, //数量
+ packageCode: item.packageCode ? item.packageCode : null, //包件码
+ waybillNumber: item.waybillNumber ? item.waybillNumber : null, //运单号
+ orderCode: item.orderCode ? item.orderCode : null, //订单自编码
+ brandName: item.brandName ? item.brandName : null, //品牌
+ });
+ }
});
- DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(','); //包条码
- DataSubmit.waybillNumber = [...new Set(PackageInfo.value.map(item => item.waybillNumber))].join(','); //运单号
- DataSubmit.brandName = [...new Set(PackageInfo.value.map(item => item.brandName))].join(','); //品牌
- DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(','); //包件信息订单自编码
+ DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(
+ ','
+ ); //包条码
+ DataSubmit.waybillNumber = [
+ ...new Set(PackageInfo.value.map(item => item.waybillNumber)),
+ ].join(','); //运单号
+ DataSubmit.brandName = [...new Set(PackageInfo.value.map(item => item.brandName))].join(
+ ','
+ ); //品牌
+ DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(
+ ','
+ ); //包件信息订单自编码
}
// DataSubmit['packageEntityList'].push({
@@ -1178,7 +1191,7 @@ const ConfirmForm = () => {
// waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //运单号
// orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //订单自编码
// });
-
+
// 总件数
Indexform.value.number = PackageInfo.value.length;
console.log(DataSubmit['packageEntityList'], '包件信息');
@@ -1216,10 +1229,10 @@ const ConfirmForm = () => {
wordOrderId: Indexform.value.workOrderNumber, //异常工单ID
description: item.description ? item.description : null, //说明
personResponsibleId:
- personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id ||
+ item.personResponsibleList.find(obj => obj.id == item.personResponsibleName)?.id ||
null, //责任人ID
personResponsibleName:
- personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)
+ item.personResponsibleList.find(obj => obj.id == item.personResponsibleName)
?.name || null, //责任人名称
responsibilityRatio: item.responsibilityRatio ? item.responsibilityRatio : null, //责任比例
tripartite: item.tripartite ? item.tripartite : null, //三方责任人
@@ -1250,6 +1263,19 @@ const ConfirmForm = () => {
console.log(DataSubmit['personResponsibleDTO'], '新责任方处理的数据');
//console.log(Indexform.value.duty.length);
//责任方信息处理
+ //责任方信息处理
+ if (Indexform.value.processor.length) {
+ Indexform.value.processor.forEach(item => {
+ let found = warehouseData.value.find(element => element.value == item.toString());
+ processorEntityList.push({
+ businessName: found ? found.label : '',
+ businessId: item,
+ conditions: 1,
+ typesOf: 2,
+ });
+ });
+ }
+
if (FangAddList.value.length) {
FangAddList.value.forEach(item => {
console.log(item, 'item');
@@ -1314,9 +1340,6 @@ const ConfirmForm = () => {
delete DataSubmit.processor; //移除多余字段
console.log(DataSubmit, '处理好的数据');
// 提交表单信息stringify
-
-
-
$_submit(DataSubmit)
.then(res => {
if (res.data.code == 200) {
@@ -1435,15 +1458,13 @@ const moneyBtnB = () => {
};
// 是否显示处理结果
-const Processingrelease = ()=>{
- if(Indexform.value.processor.length ==1 && Mydata.value.id==Indexform.value.processor[0] ){
- ProcessingreleaseState.value = true;//显示处理放
- }else{
- ProcessingreleaseState.value = false;//关闭处理方
+const Processingrelease = () => {
+ if (Indexform.value.processor.length == 1 && Mydata.value.id == Indexform.value.processor[0]) {
+ ProcessingreleaseState.value = true; //显示处理放
+ } else {
+ ProcessingreleaseState.value = false; //关闭处理方
}
-}
-
-
+};
// 统计包件个数
const Statistics = () => {
@@ -1469,104 +1490,116 @@ const Statistics = () => {
// 查询包件信息自动回显
const ChangePackageInfo = (val, index) => {
+ // 判断是否有一样的包件
+
if (identifying.value == '2') {
Statistics(); //调用统计包件信息
return;
- }else{
- Statistics(); //调用统计包件信息
- if(!NumberPackages.value){
+ } else {
if (!val) {
- PackageInfo.value[index].orderCode = ''; //订单自编码
- PackageInfo.value[index].waybillNumber = ''; //运单号
- PackageInfo.value[index].orderId = ''; //运单号
- PackageInfo.value[index].brandName = ''; //品牌
- Indexform.value.first = ''; //一级品
- Indexform.value.secondary = ''; //二级品
- Indexform.value.waybillMall = ''; //客户名称(运单商场)
- Indexform.value.typeServiceName = ''; //合作模式
- return;
- // 如果输入框里面没有值就不请求
- }
- }
+ return;
+ }
+ Statistics(); //调用统计包件信息
+ if (!NumberPackages.value) {
+ if (!val) {
+ PackageInfo.value[index].orderCode = ''; //订单自编码
+ PackageInfo.value[index].waybillNumber = ''; //运单号
+ PackageInfo.value[index].orderId = ''; //运单号
+ PackageInfo.value[index].brandName = ''; //品牌
+ Indexform.value.first = ''; //一级品
+ Indexform.value.secondary = ''; //二级品
+ Indexform.value.waybillMall = ''; //客户名称(运单商场)
+ Indexform.value.typeServiceName = ''; //合作模式
+ return;
+ // 如果输入框里面没有值就不请求
+ }
+ }
+ // if (NumberPackages.value > 1) {
+ // const found = PackageInfo.value
+ // .filter(item => item.packageCode !== val)
+ // .some(item => item.packageCode === val);
+
+ // if (found) {
+ // console.log('false');
+ // ElMessage({
+ // message: '存在重复包条码',
+ // type: 'warning',
+ // });
+ // return;
+ // }
+ // }
- if(!val){
- return
- }
- Statistics(); //调用统计包件信息
- let data = {
- packageCode: val,
- };
- $_getAbnormalPackage(data).then(res => {
- console.log(res, '包件信息');
- console.log(res.data.data, '包件信息');
-
- if (res.data.data.length) {
- console.log(NumberPackages.value ,'NumberPackages.value ');
- console.log(PackageInfo.value ,'PackageInfo.value');
- const packageData = res.data.data[0];
- if (NumberPackages.value > 1) {
- let mallName = PackageInfo.value.find(item => item.mallName).mallName;
- console.log(mallName,'筛选出来的值');
- if (mallName != packageData.mallName) {
- ElMessageBox.confirm('请选择运单商场一致的包条码!', 'Warning', {
- confirmButtonText: '确定',
- type: 'warning',
- })
- .then(() => {
- return;
+ Statistics(); //调用统计包件信息
+ let data = {
+ packageCode: val,
+ };
+ $_getAbnormalPackage(data).then(res => {
+ console.log(res, '包件信息');
+ console.log(res.data.data, '包件信息');
+
+ if (res.data.data.length) {
+ console.log(NumberPackages.value, 'NumberPackages.value ');
+ console.log(PackageInfo.value, 'PackageInfo.value');
+ const packageData = res.data.data[0];
+ if (NumberPackages.value > 1) {
+ let mallName = PackageInfo.value.find(item => item.mallName).mallName;
+ console.log(mallName, '筛选出来的值');
+ if (mallName != packageData.mallName) {
+ ElMessageBox.confirm('请选择运单商场一致的包条码!', 'Warning', {
+ confirmButtonText: '确定',
+ type: 'warning',
})
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '请重新输入新包条码',
+ .then(() => {
+ return;
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: '请重新输入新包条码',
+ });
});
- });
- return;
+ return;
+ }
}
- }
- console.log('跑到这里来了');
- // 如果已经有一条数据了,后面运单商场必须和后面的一样
- 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].mallName = packageData.mallName; //运单商场
-
- PackageInfo.value[index].state = false; //状态
-
- 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
- ? packageData.typeServiceName
- : null; //合作模式
- }
- // packageCode; //包件码
- // //订单自编码
- // orderCode: orderId; //运单号
- // workOrderId; //工单id
- // workOrderNumber; //工单名称
+ console.log('跑到这里来了');
+ // 如果已经有一条数据了,后面运单商场必须和后面的一样
+ 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].mallName = packageData.mallName; //运单商场
- console.log(PackageInfo.value, '处理好的参数');
- });
+ PackageInfo.value[index].state = false; //状态
+ 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
+ ? packageData.typeServiceName
+ : null; //合作模式
+ }
+ // packageCode; //包件码
+ // //订单自编码
+ // orderCode: orderId; //运单号
+ // workOrderId; //工单id
+ // workOrderNumber; //工单名称
+ console.log(PackageInfo.value, '处理好的参数');
+ });
}
-
-
};
// 查看历史包件
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 4e1c645c..0640e9a2 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -1008,7 +1008,7 @@ const onLoad = () => {
$_getInfo({ id: $route.query.id }).then(res => {
console.log(res, '回显返回值参数');
Indexform.value = res.data.data;
-
+
Indexform.value['result'] = [];
Indexform.value['processor'] = [];
//图片处理回显
@@ -1037,10 +1037,12 @@ const onLoad = () => {
sum = Number(item.responsibilityRatio) + sum;
});
- let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf);
- if (factorydata.typesOf) {
- groundlineType.value = true; //切换处理方模式
+ if(res.data.data.discoveryNode=='1'){
+ groundlineType.value = '1'
+ }else{
+ groundlineType.value = 'null'
}
+
FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
return {
businessName: res.businessId, //责任人ID
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 4242ec91..2abef258 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1095,6 +1095,11 @@ const onLoad = () => {
endFrom.value.processor = [];
endFrom.value.packageImage = [];
//图片处理回显
+ if(res.data.data.discoveryNode=='1'){
+ groundlineType.value = '1'
+ }else{
+ groundlineType.value = 'null'
+ }
res.data.data.decreaseImageVOList.forEach(res => {
amplifysrcList.value.push(res.imagePath);
endFrom.value['packageImage'].push({
@@ -1304,8 +1309,6 @@ const Chathistory = res => {
$_getTrackRecord({
id: $route.query.id,
}).then(res => {
- resData = res.data.data.surveyRecordEntities;
- console.log(res, '处理记录返回值');
res.data.data.surveyRecordEntities.forEach(item => {
MessageContent.value.unshift({
time: item.createTime, //时间
@@ -1320,6 +1323,12 @@ const Chathistory = res => {
identifying: false, //待回复标识
});
});
+ setTimeout(() => {
+ const container = scrollContainer.value;
+ if (container) {
+ container.scrollTop = container.scrollHeight;
+ }
+ }, 0);
Msgloading.value = false; //关闭加载效果
console.log(res, '聊天记录');
});
@@ -1327,41 +1336,41 @@ const Chathistory = res => {
$_getSurveyRecord({
id: $route.query.id,
}).then(res => {
- resData = res.data.data.surveyRecordEntities;
+ console.log(res, '聊天返回值');
+ console.log(resData, '处理记录返回值');
// 仓库客服不需要操作记录
- MessageContent.value.push({
- time: item.createTime, //时间
- content: item.content, //消息内容
- name: item.addDepartment, //营业部名称
- username: item.addPeople, //用户名
- img: filetype == 'png' ? item.pictureUrl : '',
- file: filetype == 'docx' ? item.pictureUrl : '',
- mp4: filetype == 'mp4' ? item.pictureUrl : '',
- imgList: [filetype == 'png' ? item.pictureUrl : ''],
- difference: item.difference,
- identifying: true, //是否显示待回复按钮
+ if (res.data.data.processorVOList) {
+ if (res.data.data.processorVOList.length) {
+ msgState.value = res.data.data.processorVOList[0].processingStatus; //获取聊天状态
+ }
+ }
+ res.data.data.surveyRecordEntities.forEach(item => {
+ if (item.pictureUrl) {
+ filetype = Fileidentifier(item.pictureUrl);
+ }
+ MessageContent.value.push({
+ time: item.createTime, //时间
+ content: item.content, //消息内容
+ name: item.addDepartment, //营业部名称
+ username: item.addPeople, //用户名
+ img: filetype == 'png' ? item.pictureUrl : '',
+ file: filetype == 'docx' ? item.pictureUrl : '',
+ mp4: filetype == 'mp4' ? item.pictureUrl : '',
+ imgList: [filetype == 'png' ? item.pictureUrl : ''],
+ difference: item.difference,
+ identifying: true, //是否显示待回复按钮
+ });
});
-
+ setTimeout(() => {
+ const container = scrollContainer.value;
+ if (container) {
+ container.scrollTop = container.scrollHeight;
+ }
+ }, 0);
Msgloading.value = false; //关闭加载效果
console.log(res, '聊天记录');
});
}
- resData.forEach(item => {
- if (item.pictureUrl) {
- filetype = Fileidentifier(item.pictureUrl);
- }
- if (res.data.data.processorVOList) {
- if (res.data.data.processorVOList.length) {
- msgState.value = res.data.data.processorVOList[0].processingStatus; //获取聊天状态
- }
- }
- });
- setTimeout(() => {
- const container = scrollContainer.value;
- if (container) {
- container.scrollTop = container.scrollHeight;
- }
- }, 0);
};
onLoad();
@@ -1885,7 +1894,8 @@ const submit = () => {
let info = JSON.parse(JSON.stringify(endFrom.value)); //拷贝要提交的数据
let data = {
aftersalesProcessingResultsDTO: {
- ...info,
+ // ...info,
+
},
processingMoneyEntityList: [], //赔付方式
};
@@ -1897,6 +1907,7 @@ const submit = () => {
sum = computeNumber(sum, '+', ProcessingList.value[i].input).result;
}
data.aftersalesProcessingResultsDTO.money = sum; //金额汇总
+ data.resultDescription=endFrom.value.resultDescription;//处理结果说明
// data['compensationMethod'] = Paymentmethod.value.filter(
// item => item.dictKey == endFrom.value.compensationMethod
// )[0].dictValue; //目前是单选
@@ -1907,7 +1918,7 @@ const submit = () => {
data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
.map(item => item.text)
.join(',');
- data['processingMoneyEntityList'] = ProcessingList.value
+ data.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value
.map(item => {
console.log(item);
let match = ProcessingResults.value.find(element => element.dictValue == item.name);
@@ -1933,8 +1944,12 @@ const submit = () => {
})
.filter(item => item !== null);
// data.aftersalesProcessingResultsDTO.paymentUnit = paymentUnit.value; //支付单位
- data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
- data['processingMoneyEntityList'];
+
+ data.aftersalesProcessingResultsDTO.paymentUnit = ProcessingList.value
+ .map(item => item.paymentUnit)
+ .join(','); //支付单位
+
+ // data.aftersalesProcessingResultsDTO.processingMoneyEntityList = data['processingMoneyEntityList'];
console.log('走到了这一步');
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value
@@ -2593,12 +2608,12 @@ const CustomerServiceCompleted = () => {
.inputleft {
display: flex;
:deep(.el-fil) {
- background-color: #afbdc3;
+ background-color: #409eff;
border: none;
}
}
:deep(.el_next) {
- background-color: #afbdc3;
+ background-color: #409eff;
border: none;
}
:deep(.el_next:hover) {
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index fd626d10..5a3745b0 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -121,6 +121,7 @@
v-model="Indexform.trainNumber"
placeholder="请输入车次号(干线卸车环节)"
clearable
+ @change="DeliveryTrainnumber"
/>
@@ -407,7 +408,6 @@
/>
总金额:{{ TotalClaimAmount }}
-
-
+
+
+
+
+
+
@@ -497,6 +508,7 @@
placeholder="请填写责任人"
clearable
:rows="2"
+ :disabled="Processingresults"
/>
@@ -531,7 +543,7 @@
-
+
@@ -839,21 +851,8 @@ const responsible = ref([
label: '物流',
},
]);
-
-const DeliveryDriver = ref([
- {
- value: '0',
- label: '兰溪',
- },
- {
- value: '1',
- label: '李华',
- },
- {
- value: '2',
- label: '唐飞',
- },
-]);
+// 司机信息
+const DeliveryDriver = ref([]);
// 图片列表
const fileList = ref([]);
// 字典公共函数
@@ -868,7 +867,33 @@ function updateDictionary(targetArray, dictionaryType) {
});
});
}
-
+// 车次号自动带出时间司机
+function DeliveryTrainnumber() {
+ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
+ Indexform.value.deliveryTime = null;
+ Indexform.value.deliveryDriver = '';
+ DeliveryDriver.value = [];
+ }
+ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
+ return;
+ }
+ let data = {
+ trainNumber: Indexform.value.trainNumber,
+ taskTime: Indexform.value.deliveryTime,
+ };
+ data.current = 1; //页码
+ data.size = 200; //条数
+ $_shippingInformation(data).then(res => {
+ console.log(res, '查询返回值');
+ DeliveryDriver.value = res.data.data.records; //获取到的信息
+ // 如果是精确搜索自动带入日期
+ if (res.data.data.records.length == 1 && groundlineType.value != 3) {
+ Indexform.value.deliveryTime = res.data.data.records[0].taskTime; //配送时间
+ Indexform.value.deliveryDriver = res.data.data.records[0].id; //配送人
+ // Indexform.value.trainNumber = res.data.data.records[0].trainNumber; //车次号
+ }
+ });
+}
// 图片上传必须携带TOKEN
const headers = computed(() => {
return { 'Blade-Auth': 'Bearer ' + getToken() };
@@ -963,6 +988,11 @@ const onLoad = () => {
handle(); //处理方和责任方信息
$_getInfo({ id: $route.query.id }).then(res => {
+ if(res.data.data.discoveryNode=='1'){
+ groundlineType.value = '1'
+ }else{
+ groundlineType.value = 'null'
+ }
oldData.value = JSON.parse(JSON.stringify(res.data.data));
console.log(oldData.value, '旧数据');
console.log(res, '回显返回值参数');
@@ -998,9 +1028,9 @@ const onLoad = () => {
let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf);
- if (factorydata.typesOf) {
- groundlineType.value = true; //切换处理方模式
- }
+ // if (factorydata.typesOf) {
+ // groundlineType.value = true; //切换处理方模式
+ // }
FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
ResponsiblepartyData.value.push(res);
@@ -1163,6 +1193,31 @@ const onLoad = () => {
});
};
onLoad(); //初始化程序
+
+// 统计包件个数
+const Statistics = () => {
+ // 订单统计包件个数
+ if (identifying.value == 1) {
+ Indexform.value.number = 0;
+ PackageInfo.value.map(res => {
+ if (res.packageCode) {
+ Indexform.value.number++;
+ }
+ });
+ } else {
+ // 零担统计包件个数
+ Indexform.value.number = 0;
+ PackageInfo.value.map(res => {
+ console.log(res);
+ if (res.waybillNumber) {
+ Indexform.value.number++;
+ }
+ });
+ }
+};
+
+
+
// 异常类型事件
const abnormalChange = val => {
console.log(val, '异常事件类型');
@@ -1239,7 +1294,7 @@ const AddPackage = () => {
packageCode: '',
orderCode: '',
waybillNumber: '',
- state: 1,
+ state: 0,
brandName: '',
});
};
@@ -1822,7 +1877,9 @@ const Arbitrationcompleted = () => {
let data = {
id: $route.query.id,
// workOrderId: $route.query.id, //异常工单ID
+ resultDescription:Indexform.value.resultDescription,//处理结果说明
aftersalesProcessingResultsDTO: {
+ resultDescription:Indexform.value.resultDescription,//处理结果说明
id: $route.query.id,
},
};
@@ -1843,6 +1900,7 @@ const Arbitrationcompleted = () => {
resultName: item.name, //处理结果名字
paymentUnit: item.paymentUnit, //支付单位
id:item.id, //id
+ compensationTime:item.compensationTime,//时间
};
} else {
return null;
@@ -2132,6 +2190,9 @@ const moneyBtnB = () => {
};
// 查询包件信息自动回显
const ChangePackageInfo = (val, index) => {
+ if(!val){
+ return
+ }
PackageInfo.value[index].orderCode = ''; //订单自编码
PackageInfo.value[index].waybillNumber = ''; //运单号
PackageInfo.value[index].orderId = ''; //运单号
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index a8516ba7..fbfa1e03 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -30,11 +30,32 @@
@click="handleDelete"
>删 除
+
+ 导 入
+
+
+ 导 出
+
+
+
+
+
+
+
+
+
+ 点击下载
+
+
+
+
+
@@ -64,6 +85,33 @@ import { getDetail as getDetailDelineNode } from '@/api/basic/basicDelineNode';
export default {
data() {
return {
+ excelBox:false,
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: '文件上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '文件上传,请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data',
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: '/api/logpm-basicdata/driverArtery/mport-stockArticle',
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
form: {},
query: {},
search: {},
@@ -640,6 +688,16 @@ export default {
},
},
methods: {
+ //导入
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
rowSave(row, done, loading) {
console.log(row, 'row信息');
if (Array.isArray(row.bindVehicles)) {
@@ -732,16 +790,11 @@ export default {
});
},
handleExport() {
- let downloadUrl = `/blade-basicdataDriverArtery/basicdataDriverArtery/export-basicdataDriverArtery?${
+ let downloadUrl = `/api/logpm-b1asicdata/driverArtery/export-basicdataDriverArteryMb?${
this.website.tokenHeader
}=${getToken()}`;
- const { name, phone, type, jobType } = this.query;
- let values = {
- name_like: name,
- phone_like: phone,
- type_equal: type,
- jobType_equal: jobType,
- };
+ const {} = this.query;
+ let values = {};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -749,10 +802,19 @@ export default {
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
- downloadXls(res.data, `司机信息表${dateNow()}.xlsx`);
+ downloadXls(res.data, `司机信息${dateNow()}.xlsx`);
NProgress.done();
});
});
+ },
+ //下载模板
+ handleTemplate() {
+ console.log('下载模板!!!');
+ exportBlob(
+ `/api/logpm/basicdata/driverArtery/export-basicdataDriverArteryMb?${this.website.tokenHeader}=${getToken()}`
+ ).then(res => {
+ downloadXls(res.data, '物料数据模板.xlsx');
+ });
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {