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
88cd430b2f 6d8cf2081a
commit
2788d7781d
5 changed files with 269 additions and 246 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. 88
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  2. 4
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  3. 218
      src/views/aftersales/aftersalesWorkOrdermodify.vue
  4. 191
      src/views/distribution/signfor/distributionSignfortreat.vue
  5. 14
      src/views/distribution/turndelivery/deliveryDiscuss.vue

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

@ -8,7 +8,7 @@
<!-- <el-divider content-position="left">
<span> {{ routerState ? '信息查看' : '工单新增' }}</span>
</el-divider> -->
<el-tabs type="border-card" class="PackageInformation">
<el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
<el-tab-pane label="包件信息">
<div class="ResponsibilityBoxS">
<div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div>
@ -34,6 +34,11 @@
<span class="title">运单号:</span>
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable />
</div>
<div class="maxBox">
<span class="title">品牌:</span>
<el-input v-model="item.brandName" placeholder="请输入品牌" clearable />
</div>
</div>
<div class="el-btn">
@ -44,7 +49,7 @@
</div>
</div>
<div class="NumTotal">
<span>总件数:{{ PackageInfo.length }}</span>
<span>总件数:{{ NumberPackages }}</span>
</div>
</div>
</el-tab-pane>
@ -270,10 +275,8 @@
<el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
</el-form-item>
<el-form-item >
</el-form-item>
<el-form-item >
</el-form-item>
<el-form-item> </el-form-item>
<el-form-item> </el-form-item>
</el-form>
<!-- 必填 -->
@ -334,7 +337,7 @@
<el-select
v-else
v-model="item.businessName"
filterable
filterable
placeholder="请选择责任方"
@change="ResponsiblePartychange(item.businessName, index)"
>
@ -553,9 +556,10 @@ const identifying = ref(1); //订单，零担状态
const dialogHistoricalPackage = ref(false); //历史包件弹窗
const HistoricalPackageList = ref([]); //历史包件数组
const HistorIndex = ref(0); //历史包件索引
const NumberPackages = ref(0); //包件个数
const PackageInfo = ref([
//包件信息
{ packageCode: '', orderCode: '', waybillNumber: '' },
{ packageCode: '', orderCode: '', waybillNumber: '',brandName:'' },
]);
// 责任方列表
const FangAddList = ref([
@ -722,6 +726,7 @@ const AddPackage = () => {
// 包件移除
const PackagRemoval = val => {
PackageInfo.value.splice(val, 1); //移除当前点击的按钮
Statistics();
};
// 责任方添加
const responsibleParty = () => {
@ -815,19 +820,22 @@ const ConfirmForm = () => {
DataSubmit.decreaseImageEntityList = JSON.parse(
JSON.stringify(Indexform.value['decreaseImageEntityList'])
);
console.log(Indexform.value.workOrderNumber,'Indexform.workOrderNumber12312312');
console.log(Indexform.value.workOrderNumber, 'Indexform.workOrderNumber12312312');
// 包件信息
// packageEntityList
PackageInfo.value.forEach(item=>{
DataSubmit['packageEntityList'].push({
number: PackageInfo.value.length, //数量
packageCode: item.packageCode, //包件码
// warehouseId: '', //仓库ID
waybillNumber:item.waybillNumber, //运单号
orderCode:item.orderCode, //订单自编码
});
})
// 如果存在包件信息进行处理
if (PackageInfo.value.length) {
PackageInfo.value.forEach(item => {
DataSubmit['packageEntityList'].push({
number: PackageInfo.value.length, //数量
packageCode: item.packageCode, //包件码
// warehouseId: '', //仓库ID
waybillNumber: item.waybillNumber, //运单号
orderCode: item.orderCode, //订单自编码
});
});
}
// DataSubmit['packageEntityList'].push({
// workOrderId: Indexform.workOrderNumber, //异常ID
// number: PackageInfo.value.length, //数量
@ -849,11 +857,11 @@ const ConfirmForm = () => {
console.log(DataSubmit.surveyRecordDTO, '调查经过');
// 新责任方处理
// FangAddList.value
// 责任方信息
FangAddList.value.forEach(item => {
if(FangAddList.value.length){
// 如果存在责任方
FangAddList.value.forEach(item => {
DataSubmit['personResponsibleDTO'].push({
businessName: warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称
businessName: warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称
businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null,
wordOrderId: Indexform.value.workOrderNumber, //异常工单ID
description: item.description,
@ -864,6 +872,8 @@ const ConfirmForm = () => {
responsibilityRatio: item.responsibilityRatio, //责任比例
});
});
}
// 责任方信息
let proportion = 0; //责任比例之和
DataSubmit['personResponsibleDTO'].forEach(item => {
proportion += Number(item.responsibilityRatio);
@ -910,16 +920,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'); //添加成功跳转到列表
// }
// });
};
// 少货件数对应事件
@ -1006,8 +1016,19 @@ const moneyBtnB = () => {
}
fleeingState.value = true; //开启弹窗输入
};
// 统计包件个数
const Statistics = () => {
NumberPackages.value = 0;
PackageInfo.value.map(res => {
if (res.packageCode) {
NumberPackages.value++;
}
});
};
// 查询包件信息自动回显
const ChangePackageInfo = (val, index) => {
Statistics(); //调用统计包件信息
let data = {
packageCode: val,
};
@ -1254,6 +1275,7 @@ const ViewPackageDetails = val => {
display: flex;
align-items: center;
width: 30%;
margin-right: 20px;
.title {
width: 140px;
color: #606266;

4
src/views/aftersales/aftersalesWorkOrderInfo.vue
Unescape View File

@ -1081,7 +1081,7 @@ const CustomerServiceCompleted = () => {
businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber,
RouterState: false,
RouterState: 'Kfend',
},
});
};
@ -1095,7 +1095,7 @@ const EditInformation = () => {
businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber,
RouterState: true,
RouterState: 'Infoedit',
ProcessType:$route.query.ProcessType, //类型 1 待处理 2 已处理
},
});

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

@ -472,8 +472,14 @@
<div class="dialog-footer">
<el-button @click="Indexdialog = false">取消</el-button>
<el-button type="primary" @click="ConfirmForm"> 提交 </el-button>
<el-button type="primary" @click="Arbitrationcompleted"> 客服仲裁完结 </el-button>
<el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit'">
提交
</el-button>
<!--编辑提交-->
<el-button type="primary" @click="Arbitrationcompleted" v-if="RouterState == 'Kfend'">
提交
</el-button>
<!--客服仲裁完结 -->
</div>
</el-card>
@ -627,7 +633,7 @@ const HistorIndex = ref(0); //历史包件索引
const ProcessingResults = ref([]); //处理结果列表选项
const TotalClaimAmount = ref(0); //理赔总金额
const TransportlossList = ref([]);
const RouterState = ref(null); //编辑信息
const RouterState = ref(); //编辑信息
const oldData = ref(); //旧数据
const unPackageInfo = ref(); //旧包件信息
const unProcessorEntityList = ref([]); //取消的责任方
@ -636,6 +642,7 @@ const unDecreaseImageEntityList = ref([]); //移除的货损图片
const NewImageAddress = ref([]); //旧的片地址
const InitialresponsibleParty = ref(); //初始的责任方
const ProcessingParty = ref(); //拷贝一份处理方
const CopyingInfo = ref({}); //拷贝的信息
const CompensationParty = ref([
{ name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方
{ name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方
@ -1336,83 +1343,71 @@ const ConfirmForm = () => {
}
}
// // 完结信息修改
// console.log(CompensationParty.value);
// // 异常工单完结赔款方
// DataSubmit['completionRecordEntities'] = CompensationParty.value
// .filter(item => item.state === 0) // 先筛选出状态为 0 的项
// .map(item => {
// return {
// indemnitor: item.name, // 赔款方
// reason: item.reason, // 原因
// money: Number(item.num), // 金额
// reasonArbitration: item.reason, // 说明
// workOrderId: $route.query.id, // 异常工单
// warehouseId: $route.query.warehouseId, // 仓库ID
// };
// });
// // 异常工单完结收款方
// DataSubmit['completionRecipientEntities'] = CompensationParty.value
// .filter(item => item.state === 1) // 先筛选出状态为 1 的项
// .map(item => {
// return {
// recipient: item.name, // 收款方
// reasonReceivingPayment: item.reason, // 原因
// money: Number(item.num), // 金额
// workOrderNumber: $route.query.workOrderNumber, // 工单号
// responsibleParty: FangAddList.value
// .map(aItem =>
// warehouseData.value
// .filter(bItem => bItem.value === aItem.businessName)
// .map(match => match.label)
// .join(',')
// )
// .join(','),
// warehouseId: $route.query.warehouseId, // 仓库ID
// workOrderId: $route.query.id, //异常工单
// };
// });
// // 支付方式
// DataSubmit.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
// .map(item => item.text)
// .join(',');
// DataSubmit.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
// .map(item => {
// console.log(item);
// let match = ProcessingResults.value.find(element => element.dictValue == item.name);
// if (match) {
// let paymentMethodMatch = Paymentmethod.value.find(
// paymentMethod => paymentMethod.dictKey == item.payment
// );
// return {
// resultType: match.dictKey, //赔方式的key
// money: item.input, //金额
// typesOf: 1, //固定参数
// compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式',
// compensationMethodName: paymentMethodMatch
// ? paymentMethodMatch.dictValue
// : '未知支付方式',
// resultName: item.name, //处理结果名字
// };
// } else {
// return null;
// }
// })
// .filter(item => item !== null);
// // 完结信息修改
// console.log(CompensationParty.value);
// // 异常工单完结赔款方
// DataSubmit['completionRecordEntities'] = CompensationParty.value
// .filter(item => item.state === 0) // 先筛选出状态为 0 的项
// .map(item => {
// return {
// indemnitor: item.name, // 赔款方
// reason: item.reason, // 原因
// money: Number(item.num), // 金额
// reasonArbitration: item.reason, // 说明
// workOrderId: $route.query.id, // 异常工单
// warehouseId: $route.query.warehouseId, // 仓库ID
// };
// });
// // 异常工单完结收款方
// DataSubmit['completionRecipientEntities'] = CompensationParty.value
// .filter(item => item.state === 1) // 先筛选出状态为 1 的项
// .map(item => {
// return {
// recipient: item.name, // 收款方
// reasonReceivingPayment: item.reason, // 原因
// money: Number(item.num), // 金额
// workOrderNumber: $route.query.workOrderNumber, // 工单号
// responsibleParty: FangAddList.value
// .map(aItem =>
// warehouseData.value
// .filter(bItem => bItem.value === aItem.businessName)
// .map(match => match.label)
// .join(',')
// )
// .join(','),
// warehouseId: $route.query.warehouseId, // 仓库ID
// workOrderId: $route.query.id, //异常工单
// };
// });
// // 支付方式
// DataSubmit.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
// .map(item => item.text)
// .join(',');
// DataSubmit.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
// .map(item => {
// console.log(item);
// let match = ProcessingResults.value.find(element => element.dictValue == item.name);
// if (match) {
// let paymentMethodMatch = Paymentmethod.value.find(
// paymentMethod => paymentMethod.dictKey == item.payment
// );
// return {
// resultType: match.dictKey, //赔方式的key
// money: item.input, //金额
// typesOf: 1, //固定参数
// compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式',
// compensationMethodName: paymentMethodMatch
// ? paymentMethodMatch.dictValue
// : '未知支付方式',
// resultName: item.name, //处理结果名字
// };
// } else {
// return null;
// }
// })
// .filter(item => item !== null);
//移除的货损图片
console.log(DataSubmit, '处理好的数据');
@ -1435,39 +1430,38 @@ const Arbitrationcompleted = () => {
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
DataSubmit['completionRecordEntities'] = CompensationParty.value
.filter(item => item.state === 0) // 先筛选出状态为 0 的项
.map(item => {
return {
indemnitor: item.name, // 赔款方
reason: item.reason, // 原因
money: Number(item.num), // 金额
reasonArbitration: item.reason, // 说明
workOrderId: $route.query.id, // 异常工单
warehouseId: $route.query.warehouseId, // 仓库ID
};
});
DataSubmit['completionRecipientEntities'] = CompensationParty.value
.filter(item => item.state === 1) // 先筛选出状态为 1 的项
.map(item => {
return {
recipient: item.name, // 收款方
reasonReceivingPayment: item.reason, // 原因
money: Number(item.num), // 金额
workOrderNumber: $route.query.workOrderNumber, // 工单号
responsibleParty: FangAddList.value
.map(aItem =>
warehouseData.value
.filter(bItem => bItem.value === aItem.businessName)
.map(match => match.label)
.join(',')
)
.join(','),
warehouseId: $route.query.warehouseId, // 仓库ID
workOrderId: $route.query.id, //异常工单
};
});
.filter(item => item.state === 0) // 先筛选出状态为 0 的项
.map(item => {
return {
indemnitor: item.name, // 赔款方
reason: item.reason, // 原因
money: Number(item.num), // 金额
reasonArbitration: item.reason, // 说明
workOrderId: $route.query.id, // 异常工单
warehouseId: $route.query.warehouseId, // 仓库ID
};
});
DataSubmit['completionRecipientEntities'] = CompensationParty.value
.filter(item => item.state === 1) // 先筛选出状态为 1 的项
.map(item => {
return {
recipient: item.name, // 收款方
reasonReceivingPayment: item.reason, // 原因
money: Number(item.num), // 金额
workOrderNumber: $route.query.workOrderNumber, // 工单号
responsibleParty: FangAddList.value
.map(aItem =>
warehouseData.value
.filter(bItem => bItem.value === aItem.businessName)
.map(match => match.label)
.join(',')
)
.join(','),
warehouseId: $route.query.warehouseId, // 仓库ID
workOrderId: $route.query.id, //异常工单
};
});
// 处理结果

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

@ -38,30 +38,31 @@
<!-- <el-input v-model="query.querySigningStatus" placeholder="请选择签收状态"></el-input>-->
</el-form-item>
<el-form-item label="配送时间:">
<el-date-picker
v-model="query.taskTimeSection"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
<el-date-picker
v-model="query.taskTimeSection"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item label="装车时间:">
<el-date-picker
v-model="query.loadingTimeSection"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
<el-date-picker
v-model="query.loadingTimeSection"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
</div>
<!-- <el-form-item label="顾客姓名:">-->
<!-- <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>-->
@ -155,27 +156,48 @@
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text
size="small"
v-if="slotProps.scope.row.isHaveAbnormalPackage === 2"
@click="viewAbnormalLoading(slotProps.scope)"
>异 常 审 核</el-text
<template
v-if="slotProps.scope.column.label === '配送件数' || '装车件数' || '司机签收数'"
>
<!-- v-if="
<el-text @click="InformationViewing(slotProps.scope)">
<!-- {{slotProps.scope.row.reservationNum}} -->
{{
slotProps.scope.column.label === '配送件数'
? slotProps.scope.row.reservationNum
: slotProps.scope.column.label === '装车件数'
? slotProps.scope.row.loadedNumber
: slotProps.scope.column.label === '司机签收数'
? slotProps.scope.row.receivedQuantity
: ''
}}
</el-text>
</template>
<template v-else-if="slotProps.scope.column.label === '操作'">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text
size="small"
v-if="slotProps.scope.row.isHaveAbnormalPackage === 2"
@click="viewAbnormalLoading(slotProps.scope)"
>异 常 审 核</el-text
>
<!-- v-if="
slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
" -->
<el-text
v-if="
slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
"
size="small"
@click="handleSign(slotProps.scope.row)"
>复 核</el-text
>
<el-text
v-if="
slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
"
size="small"
@click="handleSign(slotProps.scope.row)"
>复 核</el-text
>
</template>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
@ -533,31 +555,35 @@ export default {
SignForPhotos: [],
reservationId: null, //当前行的ID,
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
shortcuts: [
{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
},
},
{
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
},
},
{
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
},
},
],
},
columnList: [
{
@ -797,27 +823,18 @@ export default {
{
prop: 'reservationNum',
label: '配送件数',
type: 1,
type: 6,
values: '',
width: '130',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadedNumber',
label: '装车件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'unloadedNumber',
label: '未装车件数',
type: 1,
type: 6,
values: '',
width: '130',
checkarr: [],
@ -826,18 +843,8 @@ export default {
},
{
prop: 'receivedQuantity',
label: '签收件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'unreceivedQuantity',
label: '未签收件数',
type: 1,
label: '司机签收数',
type: 6,
values: '',
width: '130',
checkarr: [],
@ -1543,7 +1550,11 @@ export default {
console.log(uploadFile, uploadFiles);
console.log('执行了1回调');
},
// 数字点击
InformationViewing(val) {
console.log(val, '点击数字接收的值');
console.log('12312312');
},
handlePictureCardPreview(uploadFile) {
console.log(uploadFile);
console.log('执行了2回调');
@ -1897,7 +1908,7 @@ export default {
this.search = !this.search;
},
searchChange() {
console.log("this.query>>>>>>>>>>>>>>",this.query);
console.log('this.query>>>>>>>>>>>>>>', this.query);
if (this.query.querySigningStatus) {
this.query.signingStatus = this.query.querySigningStatus;
}
@ -2181,6 +2192,6 @@ export default {
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
align-items: flex-end;
}
</style>

14
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -430,18 +430,11 @@
placeholder="请输入服务号"
/>
</el-form-item>
<el-form-item label="顾客姓名:">
<el-form-item label="运单收货人:">
<el-input
v-model="parameter.customerName"
clearable
placeholder="请输入顾客姓名"
/>
</el-form-item>
<el-form-item label="顾客电话:">
<el-input
v-model="parameter.customerTelephone"
clearable
placeholder="请输入顾客电话"
placeholder="请输入运单收货人"
/>
</el-form-item>
<el-form-item label="顾客地址:">
@ -451,6 +444,9 @@
placeholder="请输入顾客地址"
/>
</el-form-item>
<el-form-item >
</el-form-item>
</el-form>
<!-- <div class="SoBtn">
搜索菜单预留按钮

Write Preview
Loading…
Cancel
Save