java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复代码合并丢失

dev-xx
马远东 1 year ago
parent
1cc13b4fb3
commit
015c4ebe89
2 changed files with 265 additions and 45 deletions
Split View
  1. 308
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 2
      src/views/aftersales/aftersalesWorkOrderAdd.vue

308
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -19,7 +19,7 @@
<div class="topText">
<el-form-item label="工单号" class="el-times">
<el-input
type="text"
type="text"
v-model="query.workOrderNumber"
placeholder="请输入工单号"
/>
@ -27,11 +27,13 @@
<el-form-item label="订单自编号" class="el-times">
<el-input
type="text"
type="text"
v-model="query.orderCode"
placeholder="请输入订单自编号"
/>
</el-form-item>
</div>
<!-- <div class="el_times">
@ -568,6 +570,8 @@
/>
</div>
<div class="sk_input" v-if="item.state == 0">
<span>责任人</span>
<el-input
@ -580,6 +584,7 @@
<div class="sk_input" v-if="item.state == 1"></div>
<el-button type="danger" round @click="payremove(item.state, index)"
>移除</el-button
>
@ -1064,7 +1069,7 @@ import {
MallassignmentColumnList,
customerserviceColumnList,
} from '@/option/aftersales/vueTvemp.js';
import { processRowProperty, isNumber, computeNumber } from '@/utils/util';
import { processRowProperty, isNumer, computeNumber } from '@/utils/util';
import { useRouter } from 'vue-router';
import { downloadXls } from '@/utils/util';
import dayjs from 'dayjs';
@ -1734,12 +1739,12 @@ const Statusprocessing = val => {
});
};
// 页面初始化数据
const IndexTable = (val,Refresh) => {
const IndexTable = (val,Refresh) => {
console.log(!TabList.value.find(res=>res.name == TabPermissions.value).request,Refresh,'Refresh');
if(!TabList.value.find(res=>res.name == TabPermissions.value).request && !Refresh){
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
page.value.total = TabList.value.find(res=>res.name == TabPermissions.value).total
return
return
}
ClaimStatus.value = false;
@ -1802,7 +1807,7 @@ const IndexTable = (val,Refresh) => {
TabList.value.find(res=>res.name == TabPermissions.value).DataList = res.data.data.records
TabList.value.find(res=>res.name == TabPermissions.value).total = res.data.data.total
TabList.value.find(res=>res.name == TabPermissions.value).request=false
console.log(TabList.value,'当前存储的值');
// details.data = res.data.data.records;
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
@ -2487,6 +2492,29 @@ const inputsc = async(index, row) => {
await DataRendering(TabPermissions.value, details.query,true);
TabList.value.find(res=>res.name == TabPermissions.value).request=false
return;
console.log('没有执行');
if (TabPermissions.value == '4') {
// 理赔金额未出
settlementclaim(details.query);
return;
}
if (AppealStatusT.value && TabPermissions.value == '6') {
// 申诉列表
appealFn(details.query);
return;
}
if (TabPermissions.value == '8') {
// 待回复
ProcessingPartyFun(details.query);
return;
}
if (TabPermissions.value == '7') {
TimeoutHandling(details.query); //超时未处理
return;
}
IndexTable(details.query); //首页初始化信息
// =======
@ -2521,6 +2549,19 @@ const searchChange = () => {
DataRendering(TabPermissions.value, details.query,true);
return;
if (ClaimStatus.value) {
// 表示这是理赔查询
settlementclaim();
details.search = false; //关闭搜索
return;
}
details.search = false; //关闭搜索
if (!ProcessingPartyState.value) {
IndexTable(details.query); //首页初始化信息
} else {
ProcessingPartyFun(details.query); //处理方信息
}
};
const emptyvalues = data => {
@ -2570,6 +2611,14 @@ const timesc = async(index, row) => {
return
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
details.query[row.prop] = index;
if (!index) {
delete details.query[row.prop];
}
};
/** 表格表头输入框搜索 */
@ -2589,6 +2638,29 @@ const selectsc = async(index, row) => {
return;
if (TimeoutStatus.value) {
// 超时列表
TimeoutHandling(details.query);
return;
}
if (AppealStatus.value) {
// 申诉列表
appealFn(details.query);
return;
}
if (ClaimStatus.value) {
// 这是理赔搜索
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
IndexTable(details.query); //首页初始化信息
} else {
ProcessingPartyFun(details.query); //处理方信息
}
};
// 反字典公共请求
@ -2617,6 +2689,30 @@ const currentChange = async (val) => {
await DataRendering(TabPermissions.value, details.query,true);
TabList.value.find(res=>res.name == TabPermissions.value).request=false
return;
// 超时
if (TimeoutStatus.value) {
TimeoutHandling(details.query);
return;
}
if (AppealStatus.value) {
// 申诉列表
appealFn(details.query);
return;
}
if (ClaimStatus.value) {
// 这是理赔
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
//表示当前不是处理方
IndexTable(details.query);
} else {
ProcessingPartyFun(details.query);
}
};
// 每页多少条
const sizeChange = async val => {
@ -2625,6 +2721,29 @@ const sizeChange = async val => {
await DataRendering(TabPermissions.value, details.query,true);
TabList.value.find(res=>res.name == TabPermissions.value).request=false
return;
// 超时
if (TimeoutStatus.value) {
TimeoutHandling(details.query);
return;
}
if (AppealStatus.value) {
// 申诉列表
appealFn(details.query);
return;
}
if (ClaimStatus.value) {
// 这是理赔
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
//表示当前不是处理方
IndexTable(details.query);
} else {
ProcessingPartyFun(details.query);
}
};
const changeProcessingResults = val => {
// 首先删除取消的项目
@ -2674,7 +2793,7 @@ const settlementclaim = (val,Refresh) => {
if(!TabList.value.find(res=>res.name == TabPermissions.value).request && !Refresh){
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
page.value.total = TabList.value.find(res=>res.name == TabPermissions.value).total
return
return
}
details.loadingObj.list = true; //开启动画加载
console.log(Claimsfield, '理赔数据');
@ -2735,7 +2854,7 @@ const settlementclaim = (val,Refresh) => {
} else {
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList;
}
}
})
.catch(res => {
@ -2769,12 +2888,12 @@ const appealFn = val => {
TabList.value.find(res=>res.name == TabPermissions.value).DataList = res.data.data.records
TabList.value.find(res=>res.name == TabPermissions.value).total = res.data.data.total
TabList.value.find(res=>res.name == TabPermissions.value).request=false
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
page.value.total = TabList.value.find(res=>res.name == TabPermissions.value).total;
} else {
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList;
}
})
.catch(res => {
details.loadingObj.list = false; //关闭动画加载
@ -2874,7 +2993,7 @@ const TimeoutHandling = (val,Refresh) => {
if(!TabList.value.find(res=>res.name == TabPermissions.value).request && !Refresh){
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
page.value.total = TabList.value.find(res=>res.name == TabPermissions.value).total
return
return
}
timeoutList[3].checkarr = []; //异常类型名称
timeoutList[4].checkarr = []; //发现环节
@ -3047,8 +3166,109 @@ const tabChenge = async (val, input,Refresh=false) => {
};
await empty();
DataRendering(TabPermissions.value, input,Refresh);
return;
if (val == 0) {
ProcessingPartyState.value = false; //关闭处理方
ArbitrationStatus.value = true; //可以以申请仲裁
if (UserPermissions.value == '仓库客服') {
//全部
data.workOrderStatus = 1000;
details.query.workOrderStatus = 1000;
Tableheaderswitching(columnList);
IndexTable(data);
} else {
details.query.workOrderStatus = null;
Tableheaderswitching(columnList);
IndexTable();
}
} else if (val == 1) {
// 处理中
if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 20;
details.query.workOrderStatus = 20;
} else {
data.workOrderStatus = 40;
details.query.workOrderStatus = 40;
}
ProcessingPartyState.value = false; //关闭处理方
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
IndexTable(data);
} else if (val == 2) {
//处理完毕
data.workOrderStatus = 30;
details.query.workOrderStatus = 30;
ProcessingPartyState.value = false; //关闭处理方
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
IndexTable(data);
} else if (val == 3) {
// 待处理
ProcessingPartyState.value = true; //开启处理方
if (UserPermissions.value != '仓库客服') {
data.workOrderStatus = 500;
details.query.workOrderStatus = 500;
} else {
data.workOrderStatus = 10;
details.query.workOrderStatus = 10;
}
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
IndexTable(data);
} else if (val == 4) {
// 理赔金额未出
ProcessingPartyState.value = false; //关闭处理方
details.query.workOrderStatus = null;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(Claimsfield); //切换表格
settlementclaim(data);
} else if (val == 5) {
// 仲裁中
ProcessingPartyState.value = false; //关闭处理方
data.workOrderStatus = 70;
details.query.workOrderStatus = 70;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList); //表头切换
IndexTable(data);
} else if (val == 6 && AppealStatusT.value) {
console.log('申诉列表');
data.workOrderStatus = null;
details.query.workOrderStatus = null;
AppealListFn(data); //申诉列表函数
} else if (val == 6) {
// 完结
ProcessingPartyState.value = false; //关闭处理方
data.workOrderStatus = 80;
details.query.workOrderStatus = 80;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList); //表头切换
IndexTable(data);
var bodyContent = document.querySelectorAll('.maboxhi');
const _height = getWinHight();
// 设置列表的高度
bodyContent.forEach(val => {
val.style.height = _height - val.getBoundingClientRect().top - (65 + 20) + 'px';
});
} else if (val == 7) {
// 超时未处理
ProcessingPartyState.value = false; //关闭处理方
data.workOrderStatus = null;
details.query.workOrderStatus = null;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(timeoutList); //表头切换
TimeoutHandling(); //调用超时未出理
} else if (val == 8) {
// 待回复按钮
if (UserPermissions.value == '仓库客服') {
// 不是仓库客服看不见待回复按钮
data.workOrderStatus = null;
details.query.workOrderStatus = null;
Tableheaderswitching(columnList);
ProcessingPartyFun(data);
}
}
console.log('执行完毕');
};
/**
* 设置列表 -- 固定函数
@ -3078,7 +3298,7 @@ const ProcessingPartyFun = (val,Refresh) => {
if(!TabList.value.find(res=>res.name == TabPermissions.value).request && !Refresh){
details.data = TabList.value.find(res=>res.name == TabPermissions.value).DataList
page.value.total = TabList.value.find(res=>res.name == TabPermissions.value).total
return;
return;
}
console.log('触发了待回复');
ClaimStatus.value = false; //关闭理赔状态
@ -3099,7 +3319,7 @@ const ProcessingPartyFun = (val,Refresh) => {
$_getProcessor(data)
.then(res => {
details.loadingObj.list = false; //关闭动画加载
// page.value.total = res.data.data.total; //总页数
// page.value.total = res.data.data.total; //总页数
if (res.data.data.records.length) {
Statusprocessing(res.data.data.records);
TabList.value.find(res=>res.name == TabPermissions.value).DataList = res.data.data.records
@ -3145,6 +3365,11 @@ const reply = val => {
},
});
return;
console.log(val, 'ID++++++++');
console.log(val.row);
dialogcustomerService.value = true; //开启回复弹窗
ListRow.value = val.row; //存储当前行点击数据
FKList();
};
// 处理方数据
const ProcessingParty = () => {
@ -3741,7 +3966,7 @@ const amountMoney = () => {
TotalamountCompensation.value = 0;
TotalamountReceived.value = 0;
CompensationParty.value.forEach(item => {
const _num = isNumber(item.num) ? item.num : 0;
const _num = isNumer(item.num) ? item.num : 0;
// 统计赔款方【0】
if (item.state == 0) {
TotalamountCompensation.value = computeNumber(
@ -3985,7 +4210,7 @@ const exportReport = () => {
});
})
.catch(() => {
});
};
// 超时导出
@ -4005,16 +4230,16 @@ const TimedoutExport = () => {
});
})
.catch(() => {
});
};
// 默认指派
const defaultAssignments = () => {
CustomerServicea.value = true; //开启弹窗
let data = {
current: details.page.currentPage,
size: details.page.pageSize,
typesOf:AssignmentType.value,
current: assigncurrentPage.value,
size: assignpageSize.value,
typesOf: AssignmentType.value,
};
CustomerLoad.value = true; //开启加载
$_aftersalesCustomerMall(data)
@ -4116,24 +4341,17 @@ const CreateAdditions = () => {
});
};
// 指派切换
const AssignSwitch = val => {
const AssignSwitch = val => {
console.log(val);
if (val.props.name == '0') {
if (val.props.name == '0') {
// 总部指派
AssignmentType.value = '1';
} else if (val.props.name == '1') {
AssignmentType.value = '1';
} else if (val.props.name == '1') {
// 商场指派
AssignmentType.value = '2';
AssignmentType.value = '2';
}
defaultAssignments();
};
defaultAssignments();
};
// 指派提交
const AssignSubmission = () => {
@ -4145,9 +4363,12 @@ const AssignSubmission = () => {
customerServiceId: AssignCustomerservice.value.find(data => data.id == res).id, //仓库客服名称ID
customerServiceName: AssignCustomerservice.value.find(data => data.id == res).realName, //客服名称
clientId: BatchFrom.value.AssignWarehouse, //客服仓库ID
clientName: warehouseData.value.find(res => res.value == BatchFrom.value.AssignWarehouse)
.label, //客服绑定仓库
typesOf:AssignmentType.value,
clientName:
AssignmentType.value == '1'
? warehouseData.value.find(res => res.value == BatchFrom.value.AssignWarehouse).label
: Malldropdown.value.find(res => res.id == BatchFrom.value.AssignWarehouse)
.tripartiteMall, //客服绑定仓库
typesOf: AssignmentType.value,
conditions: '2',
});
});
@ -4166,7 +4387,6 @@ const AssignSubmission = () => {
AssignCustomerlist.value = []; //清空选中列表
BatchFrom.value.AssignWarehouse = ''; //清空选择
defaultAssignments();
defaultAssignments();
})
.catch(() => {});
}
@ -4395,13 +4615,13 @@ const AssignSubmission = () => {
margin-left: 20px;
width: 20%;
display: flex;
span {
width: 70px;
font-size: 16px;
font-weight: 300;
display: flex;
align-items: center;
justify-content: flex-start;
span{
width: 70px;
font-size: 16px;
font-weight: 300;
display: flex;
align-items: center;
justify-content: flex-start;
}
}
.el-button {
@ -4437,9 +4657,9 @@ const AssignSubmission = () => {
:deep(.el_tims_box) {
width: 100%;
display: flex;
.el-form-item {
margin: 6px 0;
}
.el-form-item {
margin: 6px 0;
}
}
.el-fr-d {
margin: 6px 0px;
@ -4451,7 +4671,7 @@ const AssignSubmission = () => {
flex-direction: row;
margin-right: 0;
margin-bottom: 0;
:deep(.el-form-item__content) {
:deep(.el-form-item__content){
flex-direction: row;
flex-wrap: nowrap;
}
@ -4483,8 +4703,8 @@ const AssignSubmission = () => {
}
.topText {
width: 100%;
:deep(.el-form-item) {
margin-right: 4px;
:deep(.el-form-item){
margin-right:4px;
}
}
.content {

2
src/views/aftersales/aftersalesWorkOrderAdd.vue
Unescape View File

@ -1622,7 +1622,7 @@ const ChangePackageInfo = (val, index) => {
}
// 车次号处理
if(groundlineType.value == 3){
TrainnumberList.value=[]
res.data.data.forEach(item=>{
item.trunklines.forEach(itemChid=>{
TrainnumberList.value.push({label:itemChid.trainNumber,value:itemChid.trainNumber})//车次号

Write Preview
Loading…
Cancel
Save