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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

master
qb 1 year ago
parent
27cc8e87c1 4401d51c51
commit
badf5d9bd7
6 changed files with 212 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/api/aftersales/aftersalesWorkOrder.js
  2. 47
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 45
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  4. 192
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 16
      src/views/aftersales/aftersalesWorkOrdermodify.vue
  6. 6
      src/views/distribution/signfor/distributionSignfortreat.vue

12
src/api/aftersales/aftersalesWorkOrder.js
Unescape View File

@ -351,3 +351,15 @@ export const $_syncOrder = (data) => {
data
})
}
// /aftersalesWorkOrder/updateWorkList 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
export const $_accounting = (data) => {
return request({
url: '/api/logpm-aftersales/aftersalesCompletionRecord/update',
method: 'post',
data
})
}

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

@ -2395,50 +2395,56 @@ const tabChenge = val => {
console.log('全部');
} else if (val == 1) {
// 处理中
if (UserPermissions.value == '职能客服') {
data.workOrderStatus = 40;
details.query.workOrderStatus = 40;
} else {
if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 20;
details.query.workOrderStatus = 20;
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
} else {
data.workOrderStatus = 40;
details.query.workOrderStatus = 40;
Tableheaderswitching(columnList);
empty();
IndexTable(data);
}
ProcessingPartyState.value = false; //关闭处理方
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 2) {
if (UserPermissions.value == '职能客服') {
data.workOrderStatus = 50;
details.query.workOrderStatus = 50;
} else {
if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 30;
details.query.workOrderStatus = 30;
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
} else {
data.workOrderStatus = 50;
details.query.workOrderStatus = 50;
Tableheaderswitching(columnList);
empty();
IndexTable(data);
}
// 处理完毕
ProcessingPartyState.value = false; //关闭处理方
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 3) {
console.log(UserPermissions.value, '当前身份');
if (UserPermissions.value == '客服经理') {
if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 10;
details.query.workOrderStatus = 10;
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
empty();
IndexTable(data);
ProcessingPartyFun(data); //单独接口
} else {
console.log('待处理');
ProcessingPartyState.value = true; //开启处理方
details.query.workOrderStatus = '';
data.workOrderStatus = 30;
details.query.workOrderStatus = 30;
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
IndexTable(data);
}
} else if (val == 4) {
ProcessingPartyState.value = false; //关闭处理方
@ -2508,7 +2514,6 @@ const ProcessingPartyFun = val => {
details.loadingObj.list = true; //开启动画加载
let data = {
...val,
workOrderStatus: 10,
};
console.log(val, 'val接收的参数');
columnList[2].checkarr = []; //重置下拉搜索框

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

@ -160,7 +160,7 @@
<el-option
v-for="item in DeliveryDriver"
:key="item.value"
:label="item.driverName"
:label="item.driverName + '-'+ item.trainNumber"
:value="item.id"
/>
</el-select>
@ -184,9 +184,9 @@
v-model="Indexform.trainNumber"
placeholder="请输入车次号(干线卸车环节)"
clearable
@change="DeliveryTrainnumber"
/>
<!-- @change="DeliveryTrainnumber" -->
</el-form-item>
<el-form-item
@ -205,8 +205,9 @@
v-model="Indexform.deliveryTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD"
placeholder="请选择配送时间"
@change="DeliveryTrainnumber"
/>
</el-form-item>
<el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
@ -402,16 +403,16 @@
<el-input v-else v-model="item.personResponsibleName" placeholder="请输入责任人" />
</div>
<div class="maxBox">
<div class="maxBox el_zb">
<span class="title">占比:</span>
<el-input
v-model="item.responsibilityRatio"
placeholder="请输入占比 "
clearable
placeholder="占比 "
:rows="2"
v-percentage
@input="CompanyProportionInput"
/>
<span>%</span>
</div>
<div class="maxBox">
@ -732,6 +733,7 @@ const DiscoveringNodesChange = val => {
function DeliveryTrainnumber() {
let data = {
trainNumber: Indexform.value.trainNumber,
taskTime:Indexform.value.deliveryTime
};
data.current = 1; //页码
data.size = 999; //条数
@ -1001,16 +1003,16 @@ const ConfirmForm = () => {
delete DataSubmit.processor; //移除多余字段
console.log(DataSubmit, '处理好的数据');
// 提交表单信息stringify
$_submit(DataSubmit).then(res => {
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
Indexform.value = {}; //重置表单
$router.push('/aftersales/aftersalesWorkOrder'); //添加成功跳转到列表
}
});
// $_submit(DataSubmit).then(res => {
// if (res.data.code == 200) {
// ElMessage({
// message: res.data.msg,
// type: 'success',
// });
// Indexform.value = {}; //重置表单
// $router.push('/aftersales/aftersalesWorkOrder'); //添加成功跳转到列表
// }
// });
};
// 选择司机带出车次号日期
const changeDeliveryDriver=(val)=>{
@ -1335,6 +1337,15 @@ const ViewPackageDetails = val => {
width: 80%;
display: flex;
justify-content: space-between;
.el_zb{
width: 140px;
margin-right: 50px;
text-align: right;
:deep(.el-input){
margin-left: 10px;
text-align: right;
}
}
}
.maxBox {
display: flex;

192
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -294,7 +294,6 @@
disabled
@input="ProportionInput"
/>
</div>
<div class="maxBox">
<span class="title">说明:</span>
@ -368,7 +367,13 @@
<!-- <el-input v-model="item.explain" placeholder="请填写说明" /> -->
</div>
<div class="el_cwBtn">
<el-button type="primary" v-if="item.state == 0 && UserPermissions!='职能客服'"> 财务处理 </el-button>
<!-- <el-button
type="primary"
v-if="item.state == 0 && UserPermissions != '职能客服' && item.accounting!='1'"
@click="accountingBtn(item)"
>
财务处理
</el-button> -->
<el-button type="primary" @click="payremove(item.state, index)">
移除
</el-button>
@ -709,7 +714,13 @@
/>
</div>
<div class="msgHf">
<el-button type="primary" @click="replyMessage()" :disabled="$route.query.index!='0'"> 回复 </el-button>
<el-button
type="primary"
@click="replyMessage()"
:disabled="$route.query.index != '0'"
>
回复
</el-button>
</div>
</div>
</div>
@ -762,6 +773,32 @@
</span>
</template>
</el-dialog>
<!-- 财务处理弹窗 -->
<!-- 弹出框 -->
<el-dialog
v-model="accountingLodading"
title="财务是否处理"
width="30%"
>
<div class='cw_load'>
<el-radio-group v-model="accountingValue" class="ml-4">
<el-radio label="1" size="large">已处理</el-radio>
<el-radio label="2" size="large">未处理</el-radio>
</el-radio-group>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="accountingLodading = false">取消</el-button>
<el-button type="primary" @click="accountingFn">
确定
</el-button>
</span>
</template>
</el-dialog>
</el-card>
</template>
@ -780,6 +817,7 @@ import {
$_getSurveyRecord,
$_getAbnormalPackage,
$_getTrackRecord,
$_accounting,
} from '@/api/aftersales/aftersalesWorkOrder';
import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
import { getToken } from '@/utils/auth';
@ -811,6 +849,9 @@ const HistoricalPackageList = ref([]); //历史包件数组
const dialogHistoricalPackage = ref(false); //包件弹窗
const HistoricalPackageinput = ref(''); //历史包件选择
const UserPermissions = ref(''); //操作权限
const accountingLodading=ref(false);//财务是否处理
const accountingValue=ref('');//财务处理结果
const accountingID=ref();//财务处理当id前值
const PackageInfo = ref([
//包件信息
{ packageCode: '', orderCode: '', waybillNumber: '' },
@ -849,7 +890,7 @@ const CompensationParty = ref([
const ProcessingList = ref([]); //处理结果已经选择的列表
// 责任方列表
const FangAddList = ref([
{ businessName: '', personResponsibleName: '', responsibilityRatio: '' +'%', description: '' },
{ businessName: '', personResponsibleName: '', responsibilityRatio: '' + '%', description: '' },
]);
const TransportlossList = ref([
//运损发现节点
@ -901,9 +942,7 @@ const details = reactive({
// 处理记录
recordList,
// 处理记录数据
recorddata: [
],
recorddata: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
@ -961,7 +1000,6 @@ const TransportChange = val => {
// 页面初始化数据
const onLoad = () => {
// 获取角色权限
getDictionaryBiz('after_sales_visits').then(res => {
console.log(res, '角色字典');
@ -995,7 +1033,7 @@ const onLoad = () => {
});
});
// 包件回显
PackageInfo.value = res.data.data.abnormalPackageVOList
PackageInfo.value = res.data.data.abnormalPackageVOList;
// 责任方回显
FangAddList.value = res.data.data.processorVOList
@ -1046,32 +1084,31 @@ const onLoad = () => {
// 公司占比回显计算
let sum = 0;
FangAddList.value.forEach(item => {
item.responsibilityRatio=item.responsibilityRatio.replace(/%/g, '');
item.responsibilityRatio = item.responsibilityRatio.replace(/%/g, '');
sum = Number(item.responsibilityRatio) + sum;
});
FangAddList.value.forEach(item=>{
item.responsibilityRatio=item.responsibilityRatio+'%'
})
FangAddList.value.forEach(item => {
item.responsibilityRatio = item.responsibilityRatio + '%';
});
companyProportion.value = 100 - sum;
if(res.data.data.processingResultsVO.processingMoneyEntityList.length){
if (res.data.data.processingResultsVO.processingMoneyEntityList.length) {
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
item => {
endFrom.value.result.push(item.resultType);
return {
input: item.money,
min: 0,
max: 9999999999999999999999999999,
state: item.resultType,
payment: item.compensationMethod,
name: item.resultTypeName,
text: item.compensationMethodName,
};
}
);
item => {
endFrom.value.result.push(item.resultType);
return {
input: item.money,
min: 0,
max: 9999999999999999999999999999,
state: item.resultType,
payment: item.compensationMethod,
name: item.resultTypeName,
text: item.compensationMethodName,
};
}
);
}
// 总金额回显
TotalClaimAmount.value = res.data.data.processingResultsVO.money;
// 理赔支付时间
@ -1081,7 +1118,7 @@ const onLoad = () => {
// 完结信息回显
// 收款方
if (res.data.data.completionRecipientEntityList.length > 0) {
CompensationParty.value = [];
res.data.data.completionRecipientEntityList.forEach((item, index) => {
@ -1093,6 +1130,7 @@ const onLoad = () => {
reason: item.reasonReceivingPayment, //收款方原因
explains: item.explains, //收款方说明
cld: index + 1,
id:item.id
});
});
}
@ -1107,20 +1145,22 @@ const onLoad = () => {
reason: item.reason, //收款方原因
explains: item.explains, //收款方说明
cld: index + 1,
id:item.id,
accounting:item.accounting?item.accounting:''
});
});
}
endFrom.value.arbitrate= res.data.data.reasonArbitration; //仲裁原因
endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
});
// 查询处理记录
$_getTrackRecord({
id:$route.query.id
}).then(res=>{
console.log(res,'处理记录返回值');
details.recorddata=res.data.data.surveyRecordEntities
})
// 查询处理记录
$_getTrackRecord({
id: $route.query.id,
}).then(res => {
console.log(res, '处理记录返回值');
details.recorddata = res.data.data.surveyRecordEntities;
});
}
// 异常类型业务字典
@ -1141,13 +1181,13 @@ const onLoad = () => {
getDeptWarehouse({}).then(res => {
// 验证本地仓库用于回复选择，自己不能选择自己仓库
console.log(res, '处理方');
localStorage.getItem('WarehouseName')
console.log(localStorage.getItem('WarehouseName'),'当前本地仓库');
localStorage.getItem('WarehouseName');
console.log(localStorage.getItem('WarehouseName'), '当前本地仓库');
res.data.data.forEach(item => {
warehouseData.value.push({
value: item.id,
label: item.name,
disabled:item.name==localStorage.getItem('WarehouseName')
disabled: item.name == localStorage.getItem('WarehouseName'),
});
});
});
@ -1190,16 +1230,15 @@ const Chathistory = () => {
MessageContent.value = []; //先清空内容，防止内容重复叠加
Msgloading.value = false; //关闭加载效果
console.log(res, '聊天记录');
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()
if (res.data.data.processorVOList) {
if (res.data.data.processorVOList.length) {
msgState.value = res.data.data.processorVOList[0].processingStatus; //获取聊天状态
}
}
MessageContent.value.push({
time: item.createTime, //时间
content: item.content, //消息内容
@ -1211,6 +1250,9 @@ const Chathistory = () => {
imgList: [filetype == 'png' ? item.pictureUrl : ''],
});
});
console.log(MessageContent.value, '处理好的聊天记录');
// 滚动到最后
setTimeout(() => {
const container = scrollContainer.value;
@ -1218,8 +1260,6 @@ const Chathistory = () => {
container.scrollTop = container.scrollHeight;
}
}, 0);
}).catch(res=>{
Msgloading.value = false; //关闭加载效果
});
};
@ -1397,7 +1437,7 @@ const payremove = (state, val) => {
amountMoney();
};
// 公司占比计算
const ProportionInput = (val) => {
const ProportionInput = val => {
console.log(FangAddList.value, '公司占比');
let sum = 0;
FangAddList.value.forEach(item => {
@ -1408,6 +1448,31 @@ const ProportionInput = (val) => {
console.log(sum, '公司占比');
};
// 财务处理
const accountingBtn=(item)=>{
accountingLodading.value=true;//开启财务确定弹窗
accountingID.value=item.id
console.log(accountingID.value,'当前财务处理的ID');
}
const accountingFn=()=>{
let data={
id:accountingID.value,
accounting:accountingValue.value
}
console.log(data,'处理好的值');
$_accounting(data).then(res=>{
console.log(res,'财务处理');
accountingLodading.value=false;//关闭财务确定弹窗
if(res.data.code){
ElMessage({
message: res.data.msg,
type: 'success',
})
}
onLoad()
})
}
// 金额输入汇总
const amountMoney = () => {
// 计算赔款金额总数
@ -1563,13 +1628,6 @@ const submit = () => {
});
return;
}
if (!endFrom.value.arbitrate) {
ElMessage({
message: '请填写仲裁原因',
type: 'warning',
});
return;
}
console.log(CompensationParty.value, 'CompensationParty');
let info = JSON.parse(JSON.stringify(endFrom.value)); //拷贝要提交的数据
console.log(info, 'info');
@ -1630,7 +1688,7 @@ const submit = () => {
type: 'success',
});
}
})
});
} else {
// 新增记录处理结果
console.log($route.query.id, '异常ID');
@ -1683,7 +1741,8 @@ const submit = () => {
}
})
.filter(item => item !== null);
data.aftersalesProcessingResultsDTO.processingMoneyEntityList = data['processingMoneyEntityList'];
data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
data['processingMoneyEntityList'];
console.log('走到了这一步');
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value
@ -1704,7 +1763,7 @@ const submit = () => {
delete data.aftersalesProcessingResultsDTO.id; //删除ID字段
data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //仓库ID
console.log(data, '处理好的数据');
console.log(data, '处理好的数据');
$_addProcessingResults(data).then(res => {
console.log(res, '提交后的参数');
$router.push('/aftersales/aftersalesWorkOrder');
@ -1717,7 +1776,7 @@ const submit = () => {
}
});
}
}
};
// 消息回复
const replyMessage = () => {
console.log(MessageContent.value, '当前的聊天记录');
@ -2126,7 +2185,7 @@ const ViewPackageDetails = val => {
font-size: 14px;
color: #606266;
margin-top: 30px;
.title{
.title {
border: 1px solid #ccc;
padding: 2px 8px;
display: flex;
@ -2263,7 +2322,7 @@ const ViewPackageDetails = val => {
margin-top: 16px;
display: flex;
align-items: center;
span {
width: 120px;
font-size: 14px;
@ -2288,4 +2347,9 @@ const ViewPackageDetails = val => {
.el_lab {
margin-right: 10px !important;
}
.cw_load{
display: flex;
align-items: center;
justify-content: center;
}
</style>

16
src/views/aftersales/aftersalesWorkOrdermodify.vue
Unescape View File

@ -341,13 +341,12 @@
/>
</el-select>
</div>
<div class="maxBox">
<div class="maxBox el_zb">
<span class="title">占比:</span>
<el-input
v-model="item.responsibilityRatio"
placeholder="请输入占比"
placeholder="占比"
:disabled="RouterState == 'Kfend'"
clearable
:rows="2"
@input="ProportionInput"
/>
@ -482,7 +481,7 @@
<el-button type="primary" @click="payremove(item.state, index, item)">
移除
</el-button>
<el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button>
<!-- <el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button> -->
</div>
</div>
</div>
@ -2025,6 +2024,15 @@ const ViewPackageDetails = val => {
width: 80%;
display: flex;
justify-content: space-between;
.el_zb{
width: 140px;
margin-right: 50px;
text-align: right;
:deep(.el-input){
margin-left: 10px;
text-align: right;
}
}
}
.maxBox {
display: flex;

6
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -349,6 +349,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessA"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -367,6 +368,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessB"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -385,6 +387,8 @@
:on-remove="handleRemove"
:on-success="ImgSuccessC"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -403,6 +407,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessD"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -421,6 +426,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessE"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>

Write Preview
Loading…
Cancel
Save