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

dev-xx
qb 11 months ago
parent
f5090ca61f 9957dd00d8
commit
8d1358142f
2 changed files with 268 additions and 200 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 426
      src/views/aftersales/aftersalesWorkOrderAddTemp.vue
  2. 42
      src/views/distribution/inventory/distrilbutionBillLadingList.vue

426
src/views/aftersales/aftersalesWorkOrderAddTemp.vue
Unescape View File

@ -73,12 +73,6 @@
v-loading="form.Packageloading" v-loading="form.Packageloading"
> >
<el-tab-pane label="包件信息" name="0"> <el-tab-pane label="包件信息" name="0">
<div class="el_top">
<div class="el_Package_num">
<span>共计包件:{{ form.PackageList.length }}</span>
</div>
</div>
<template v-for="(item, index) in form.PackageList" :key="index"> <template v-for="(item, index) in form.PackageList" :key="index">
<div class="el_Package"> <div class="el_Package">
<div class="Package"> <div class="Package">
@ -166,6 +160,11 @@
<!-- 按钮 --> <!-- 按钮 -->
</div> </div>
</template> </template>
<!-- <div class="el_top">
<div class="el_Package_num">
<span>共计包件:{{ form.PackageList.length }}</span>
</div>
</div> -->
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -359,12 +358,6 @@
v-loading="form.Packageloading" v-loading="form.Packageloading"
> >
<el-tab-pane label="内部责任划分" name="0"> <el-tab-pane label="内部责任划分" name="0">
<div class="el_top">
<div class="el_Package_num">
<span>公司占比:{{ form.Proportion }}%</span>
</div>
</div>
<div class="el_responsibilities"> <div class="el_responsibilities">
<template v-for="(item, index) in form.responsibilitiesList" :key="index"> <template v-for="(item, index) in form.responsibilitiesList" :key="index">
<div class="el_responsibilities_box"> <div class="el_responsibilities_box">
@ -494,6 +487,11 @@
<div></div> <div></div>
</template> </template>
</div> </div>
<div class="el_top">
<div class="el_Package_num">
<span>公司占比:{{ form.Proportion }}(%)</span>
</div>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -539,6 +537,7 @@
:max="9999999" :max="9999999"
:controls="false" :controls="false"
:value-on-clear="0" :value-on-clear="0"
@change="Totalamount"
/> />
</el-form-item> </el-form-item>
@ -585,6 +584,22 @@
</div> </div>
</div> </div>
</template> </template>
<!-- resultDescription -->
</div>
<el-form-item label="处理结果说明">
<el-input
v-model="form.basis.resultDescription"
placeholder="请输入处理结果说明"
type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }"
clearable
/>
</el-form-item>
<div class="el_top">
<div class="el_Package_num">
<span>总计金额:{{ form.Totalamount }}(元)</span>
</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -648,6 +663,8 @@
import { ref, reactive, computed } from 'vue'; import { ref, reactive, computed } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { useStore } from 'vuex';
const $store = useStore();
import { import {
$_getList, $_getList,
$_submit, $_submit,
@ -661,12 +678,12 @@ import { useRouter, useRoute } from 'vue-router';
import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
import { deepClone } from '@/utils/util'; import { deepClone } from '@/utils/util';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import error from '@/error';
const $router = useRouter(); const $router = useRouter();
const formCopy = ref({}); //用于重置表单 const formCopy = ref({}); //用于重置表单
const form = ref({ const form = ref({
basis: { basis: {}, //基础信息
workOrderType: null, Totalamount: 0, //总金额
}, //基础信息
TabactiveName: '0', //工单类型菜单 TabactiveName: '0', //工单类型菜单
activPackage: '0', //包件信息菜单 activPackage: '0', //包件信息菜单
responsibilities: '0', //内部责任菜单 responsibilities: '0', //内部责任菜单
@ -797,12 +814,8 @@ const Handling = async () => {
} }
}); });
}; };
// 页面初始化数据处理 // 内部责任划分初始化
const PageState = () => { const responsibilities = () => {
if (localStorage.getItem('my_data')) {
myData.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
}
// 内部责任划分处理 // 内部责任划分处理
form.value.responsibilitiesList = [ form.value.responsibilitiesList = [
{ {
@ -826,6 +839,15 @@ const PageState = () => {
id: 1, id: 1,
}, },
]; ];
};
// 页面初始化数据处理
const PageState = () => {
if (localStorage.getItem('my_data')) {
myData.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
}
// 内部责任划分初始化
responsibilities();
//包件列表 //包件列表
form.value.PackageList = [ form.value.PackageList = [
{ {
@ -891,7 +913,13 @@ const DiscoveringNodesChange = value => {
workOrderType: form.value.basis.workOrderType, workOrderType: form.value.basis.workOrderType,
discoveryNode: form.value.basis.discoveryNode, discoveryNode: form.value.basis.discoveryNode,
workOrderNumber: form.value.basis.workOrderNumber, workOrderNumber: form.value.basis.workOrderNumber,
typeServiceName: form.value.basis.typeServiceName,
waybillMall: form.value.basis.waybillMall,
}; };
// 公司占比重置
form.value.Proportion = 0;
// 内部责任化初始值
responsibilities();
ruleFormRef.value.clearValidate(); ruleFormRef.value.clearValidate();
}; };
// 菜单切换显示输入框 // 菜单切换显示输入框
@ -1016,6 +1044,16 @@ const CompanyProportionInput = value => {
calculateMaxValues(); calculateMaxValues();
}; };
// 理赔总金额计算
const Totalamount = () => {
console.log(form.value.Claimamount);
form.value.Totalamount = form.value.Claimamount.map(res => res.money).reduce(
(accumulator, currentValue) => accumulator + currentValue,
0
);
};
const Claimssettlement = value => { const Claimssettlement = value => {
console.log(value, '理赔金额'); console.log(value, '理赔金额');
console.log(Processingresultsoptions.value, '参数列表'); console.log(Processingresultsoptions.value, '参数列表');
@ -1126,73 +1164,80 @@ const ChangePackageInfo = async item => {
let data = { let data = {
packageCode: item.packageCode, //输入框参数 packageCode: item.packageCode, //输入框参数
}; };
$_getAbnormalPackage(data).then(async res => { form.value.Pageloading = true; //开启页面加载
console.log(res, '查询包条'); $_getAbnormalPackage(data)
let packageData = {}; .then(async res => {
if (res.data.code == 200 && res.data && res.data.data.length) { console.log(res, '查询包条');
packageData = res.data.data[0]; //取第一个值,内容相同 let packageData = {};
// 判断输入的是否为同一批货 if (res.data.code == 200 && res.data && res.data.data.length) {
let state = await form.value.PackageList.find(res => res.orderCode || res.brandName); form.value.Pageloading = false; //关闭页面加载
if (state) { packageData = res.data.data[0]; //取第一个值,内容相同
if (state.orderCode != packageData.orderCode || state.brandName != packageData.brandName) { // 判断输入的是否为同一批货
ElMessage({ let state = await form.value.PackageList.find(res => res.orderCode || res.brandName);
message: '请选择相同订单自编号和品牌的包条码!', if (state) {
type: 'warning', if (
}); state.orderCode != packageData.orderCode ||
return; state.brandName != packageData.brandName
} ) {
} ElMessage({
ElMessage({ message: '请选择相同订单自编号和品牌!',
message: '查询成功', type: 'warning',
type: 'success',
});
item.waybillNumber = packageData.waybillNumber || ''; //运单号
item.orderCode = packageData.orderCode || ''; //订单自编码
item.first = packageData.firsts || ''; //一级品
item.secondary = packageData.second || ''; //二级品
item.brandName = packageData.brandName || ''; //品牌
form.value.basis.waybillMall = packageData.mallName || ''; //运单商场
form.value.basis.typeServiceName = packageData.typeServiceName || ''; //合作模式
// 是否显示历史包件按钮,存在多个包件则展示
const results = res.data.data.filter(item => {
return item.workOrderId && item.workOrderNumber;
});
// 存储历史订单
if (results.length) {
item.history = true;
item.HistoricalPackageList = results;
} else {
item.history = false;
}
} else {
ElMessage({
message: '暂无查询内容,请检查参数是否正确!',
type: 'warning',
});
}
// 判断发现节点(干线车次号、车辆线路处理)
if (form.value.discoveryNode == '3') {
let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号
res.data.data.forEach(item => {
item.trunklines.forEach(itemChid => {
if (!addedTrainNumbers.includes(itemChid.trainNumber)) {
form.value.Trainoptions.push({
trainNumber: itemChid.trainNumber, // 车次号
vehicleRoute: itemChid.vehicleRoute, // 车辆线路
}); });
addedTrainNumbers.push(itemChid.trainNumber); return;
} }
}
ElMessage({
message: '查询成功',
type: 'success',
}); });
}); item.waybillNumber = packageData.waybillNumber || ''; //运单号
} item.orderCode = packageData.orderCode || ''; //订单自编码
item.first = packageData.firsts || ''; //一级品
// item.mallName = packageData.mallName; //运单商场 item.secondary = packageData.second || ''; //二级品
item.brandName = packageData.brandName || ''; //品牌
form.value.basis.waybillMall = packageData.mallName || ''; //运单商场
form.value.basis.typeServiceName = packageData.typeServiceName || ''; //合作模式
// 是否显示历史包件按钮,存在多个包件则展示
const results = res.data.data.filter(item => {
return item.workOrderId && item.workOrderNumber;
});
// 存储历史订单
if (results.length) {
item.history = true;
item.HistoricalPackageList = results;
} else {
item.history = false;
}
// Indexform.value.waybillMall = packageData.mallName; //客户名称（运单商场） // 判断发现节点(干线车次号、车辆线路处理)
// Indexform.value.typeServiceName = packageData.typeServiceName if (form.value.discoveryNode == '3') {
// ? packageData.typeServiceName let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号
// : ''; //合作模式 res.data.data.forEach(item => {
}); if (item.trunklines && item.trunklines.length) {
item.trunklines.forEach(itemChid => {
if (!addedTrainNumbers.includes(itemChid.trainNumber)) {
form.value.Trainoptions.push({
trainNumber: itemChid.trainNumber, // 车次号
vehicleRoute: itemChid.vehicleRoute, // 车辆线路
});
addedTrainNumbers.push(itemChid.trainNumber);
}
});
}
});
}
} else {
form.value.Pageloading = false; //关闭页面加载
ElMessage({
message: '暂无查询内容,请检查参数是否正确!',
type: 'warning',
});
}
})
.catch(error => {
console.log(error, 'error');
form.value.Pageloading = false; //关闭页面加载
});
}; };
// 查看历史包件详情 // 查看历史包件详情
const Viewdetails = value => { const Viewdetails = value => {
@ -1254,7 +1299,6 @@ const DeliveryTrainnumber = value => {
}; };
// 提交 // 提交
const onSubmit = () => { const onSubmit = () => {
console.log(form.value.fileList);
console.log(form.value); console.log(form.value);
ruleFormRef.value.validate(valid => { ruleFormRef.value.validate(valid => {
if (!valid) { if (!valid) {
@ -1264,6 +1308,26 @@ const onSubmit = () => {
}); });
return; return;
} }
// 货损照片上传判断
if (form.value.groundlineType == '1') {
if (form.value.fileList.length < 2) {
ElMessage({
message: '请上传最低2张图片附件',
type: 'warning',
});
return;
}
}
// 串货图片附件
if (form.value.groundlineType == '3') {
if (!form.value.fileList.length) {
ElMessage({
message: '请上传图片附件',
type: 'warning',
});
return;
}
}
const message = `注意信息填写正确!点击确定将<span style="color: red;">提交工单</span>是否继续?`; const message = `注意信息填写正确!点击确定将<span style="color: red;">提交工单</span>是否继续?`;
ElMessageBox.confirm(message, '提示', { ElMessageBox.confirm(message, '提示', {
@ -1275,66 +1339,7 @@ const onSubmit = () => {
form.value.Pageloading = true; //开启页面加载 form.value.Pageloading = true; //开启页面加载
let submitData = { let submitData = {
// 包件信息
// packageEntityList: [
// {
// packageCode: '', //包条码
// waybillNumber: '', //运单号
// orderCode: '', //订单自编号
// first: '', //一级品
// secondary: '', //二级品
// brandName: '', //品牌
// },
// ],
// 基础信息
...form.value.basis, ...form.value.basis,
// 内部责任划分
// personResponsibleDTO: [
// {
// businessName: '', //责任方
// businessId: '', //责任方id
// personResponsibleName: '', //责任人
// personResponsibleId: '', //责任人ID
// responsibilityRatio: 0, //责任占比
// tripartite: '', //三方责任人
// description: '', //说明
// },
// ],
// 处理方OR责任方
// processorEntityList: [
// {
// businessName: '', //仓库名称
// businessId: '', //仓库ID
// conditions: 1, //固定参数
// typesOf: '', //1责任方 ，2处理方
// },
// ],
// 处理结果
// aftersalesProcessingResultsDTO: {
// compensationMethod: '', //赔付方式名称 多个名称逗号拼接 银行卡赔付,现付款中扣除
// money: 0, //总金额
// resultType: '', //处理结果名称 多个逗号拼接 下补单,维修/补漆
// processingMoneyEntityList: [
// {
// compensationMethodName: '', //支付方式名称
// compensationMethod: '2', //支付方式value
// compensationTime: '', //支付时间
// money: 0, //支付金额
// paymentUnit: '', //支付单位
// resultName: '', //处理结果方式 下补单
// resultType: '', //处理结果方式 value
// typesOf: 1, //固定参数
// },
// ],
// },
// 图片
// decreaseImageEntityList: [
// {
// imageName: '', //图片名称
// imagePath: '', //图片地址
// imageType: '', //图片类型
// },
// ],
}; };
// 包件处理 // 包件处理
if (form.value.PackageList.length) { if (form.value.PackageList.length) {
@ -1382,17 +1387,10 @@ const onSubmit = () => {
form.value.responsibilitiesList.forEach(item => { form.value.responsibilitiesList.forEach(item => {
console.log(item); console.log(item);
let data = { let data = {
// businessName: item.Responsibleoptions.find(res => res.id == item.businessId).label || '', //责任方
// businessId: item.businessId, //责任方id
// personResponsibleName: item.ResponsibleoNameptions.find(
// res => res.id == item.personResponsibleId
// ).name, //责任人名称
// personResponsibleId: item.personResponsibleId, //责任人ID
responsibilityRatio: item.responsibilityRatio, //责任占比 responsibilityRatio: item.responsibilityRatio, //责任占比
tripartite: item.tripartite, //三方责任人 tripartite: item.tripartite, //三方责任人
description: item.description, //说明 description: item.description, //说明
}; };
if (form.value.groundlineType == '1') { if (form.value.groundlineType == '1') {
data.personResponsibleName = item.personResponsibleId; //责任人名称 data.personResponsibleName = item.personResponsibleId; //责任人名称
data.businessName = item.Processingoptions.find( data.businessName = item.Processingoptions.find(
@ -1429,33 +1427,78 @@ const onSubmit = () => {
}); });
} }
console.log(submitData, '处理好的参数'); // 处理结果
if (form.value.basis.result.length) {
submitData.aftersalesProcessingResultsDTO = {
money: 0, //金额总和
resultType: [], //处理结果名称
processingMoneyEntityList: [],
};
let PlayName = []; //赔付方式名称
form.value.Claimamount.forEach(item => {
PlayName.push(item.Paymentmethod.find(res => res.value == item.compensationMethod).label);
submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
compensationMethodName: item.Paymentmethod.find(
res => res.value == item.compensationMethod
).label, //支付方式名称
compensationMethod: item.compensationMethod, //支付方式value
compensationTime: item.compensationTime, //支付时间
money: item.money, //支付金额
paymentUnit: item.paymentUnit, //支付单位
resultName: item.title, //处理结果方式 下补单
resultType: Processingresultsoptions.value.find(res => res.label == item.title).value, //处理结果方式 value
typesOf: 1, //固定参数
});
});
submitData.aftersalesProcessingResultsDTO.resultType = form.value.Claimamount.map(
res => res.title
).join(','); //处理结果名称
$_submit(submitData).then(res => { let filteredArray = form.value.Claimamount.map(res => res.money); //金额总和
console.log(res, '提交成功');
});
// 关闭页面加载
let _time = setTimeout(() => {
form.value.Pageloading = false; //开启页面加载
clearTimeout(_time);
}, 300);
// console.log(valid, '校验状态'); submitData.aftersalesProcessingResultsDTO.money = filteredArray.reduce(
// console.log(form.value, 'form表单'); (accumulator, currentValue) => accumulator + currentValue,
// if (!form.value.fileList || !form.value.fileList.length) { 0
// console.log('请上传图片'); );
// return; // 支付方式名称
// } else if (form.value.fileList || form.value.fileList.length) { submitData.aftersalesProcessingResultsDTO.compensationMethod = PlayName.join(',');
// let state = form.value.fileList.every( submitData.aftersalesProcessingResultsDTO.resultDescription =
// item => item.response && item.response.data && item.response.data.link form.value.basis.resultDescription; //处理结果说明
// ); delete form.value.basis.resultDescription; //删除无用信息
// if (!state) { }
// ElMessage({
// message: '图片未上传成功，请重新上传', console.log(submitData, '处理好的参数');
// type: 'warning', form.value.Pageloading = true; //关闭页面加载
// }); $_submit(submitData)
// } .then(res => {
// } ElMessage({
message: res.data.msg || '创建成功',
type: 'success',
});
if (res.data.code == 200) {
form.value.Pageloading = false; //关闭页面加载
ElMessageBox.confirm('当前工单创建成功,是否继续创建?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '返回',
type: 'warning',
})
.then(async () => {
form.value = await deepClone(formCopy.value); //用于拷贝一份重置数据
await PageState();
await ruleFormRef.value.resetFields();
})
.catch(() => {
$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
$router.push({
path: '/aftersales/aftersalesWorkOrder',
});
});
}
})
.catch(error => {
console.log(error, 'error');
form.value.Pageloading = false; //关闭页面加载
});
}); });
}); });
}; };
@ -1583,7 +1626,7 @@ const TabactiveClick = (a, b) => {
} }
} }
.Basicinformation { .Basicinformation {
width: 80%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
:deep(.el-form-item) { :deep(.el-form-item) {
@ -1604,9 +1647,9 @@ const TabactiveClick = (a, b) => {
.el_Basic { .el_Basic {
flex: 1; flex: 1;
display: flex; display: flex;
min-width: 20%; min-width: 38%;
.el_Processing { .el_Processing {
min-width: 430px; min-width: 50%;
} }
:deep(.el_Investigation) { :deep(.el_Investigation) {
flex: 1; flex: 1;
@ -1692,6 +1735,29 @@ const TabactiveClick = (a, b) => {
.is-active { .is-active {
font-weight: bold; font-weight: bold;
} }
.el_top {
display: flex;
align-items: center;
margin-bottom: 10px;
height: 40px;
.el_addPackage {
border: none;
}
.el_Package_num {
font-size: 14px;
height: 80%;
border-bottom: 1px solid #409eff;
display: flex;
align-items: center;
justify-content: center;
padding: 2px;
box-sizing: border-box;
span {
color: #666;
font-weight: 500;
}
}
}
.el_Processingresults { .el_Processingresults {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -1747,6 +1813,6 @@ const TabactiveClick = (a, b) => {
:deep(.el-loading-mask) { :deep(.el-loading-mask) {
position: fixed; position: fixed;
left: 12%; left: 12%;
top: 11%; top: 10%;
} }
</style> </style>

42
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -302,6 +302,26 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{
prop: 'pickUpTime',
label: '提货时间',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'consignee',
label: '提货人',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: false,
},
{ {
prop: 'consigneeUnit', prop: 'consigneeUnit',
label: '收货单位', label: '收货单位',
@ -470,16 +490,7 @@ export default {
fixed: false, fixed: false,
sortable: false, sortable: false,
}, },
{
prop: 'consignee',
label: '提货人',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: false,
},
{ {
prop: 'pickUpPlate', prop: 'pickUpPlate',
label: '提货车牌', label: '提货车牌',
@ -490,16 +501,7 @@ export default {
fixed: false, fixed: false,
sortable: false, sortable: false,
}, },
{
prop: 'pickUpTime',
label: '提货时间',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
sortable: false,
},
{ {
prop: 'deliveryDocument', prop: 'deliveryDocument',
label: '提货证件', label: '提货证件',

Write Preview
Loading…
Cancel
Save