Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
commit
f8b9a05523
  1. 1
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 2
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  3. 48
      src/views/aftersales/aftersalesWorkOrderend.vue
  4. 356
      src/views/aftersales/aftersalesWorkOrdermodify.vue
  5. 22
      src/views/distribution/signfor/distributionSignfortreat.vue
  6. 29
      src/views/warehouse/parcelList/distributionParcelList.vue

1
src/views/aftersales/aftersalesWorkOrder.vue

@ -1753,6 +1753,7 @@ const view = val => {
warehouseId: val.row.warehouseId,
workOrderNumber: val.row.workOrderNumber, //
businessId: val.row.businessId,
ProcessType:TabPermissions.value==2?'2':TabPermissions.value==3?'1':'', // 1 2
},
});
return;

2
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -1096,6 +1096,7 @@ const EditInformation = () => {
warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber,
RouterState: true,
ProcessType:$route.query.ProcessType, // 1 2
},
});
};
@ -1378,6 +1379,7 @@ const EndJump = () => {
flex-wrap: wrap;
margin-top: 26px;
justify-content: space-between;
justify-content: flex-start;
.name {
display: flex;
margin-bottom: 20px;

48
src/views/aftersales/aftersalesWorkOrderend.vue

@ -1071,8 +1071,9 @@ const onLoad = () => {
//
//
CompensationParty.value = [];
if (res.data.data.completionRecipientEntityList.length > 0) {
CompensationParty.value = [];
res.data.data.completionRecipientEntityList.forEach((item, index) => {
TotalamountReceived.value += Number(item.money);
CompensationParty.value.push({
@ -1532,7 +1533,7 @@ const PaymentConfirmation = val => {
//
const submit = () => {
console.log(UserPermissions.value, '当前角色');
// if (UserPermissions.value == '' || UserPermissions.value == '' ) {
if (UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理' ) {
//
//
@ -1605,25 +1606,25 @@ const submit = () => {
//
console.log(data, '处理好的值');
// $_addCompletionEnd(data).then(res => {
// $router.push('/aftersales/aftersalesWorkOrder');
// console.log(res, '');
// if (res.data.code == 200) {
// ElMessage({
// showClose: true,
// message: res.data.msg,
// type: 'success',
// });
// }
// });
// }else{
// ElMessage({
// message: '',
// type: 'warning',
// });
// console.log(UserPermissions.value);
// return;
// }
$_addCompletionEnd(data).then(res => {
$router.push('/aftersales/aftersalesWorkOrder');
console.log(res, '完结成功返回值');
if (res.data.code == 200) {
ElMessage({
showClose: true,
message: res.data.msg,
type: 'success',
});
}
});
}else{
ElMessage({
message: '权限不足',
type: 'warning',
});
console.log(UserPermissions.value);
return;
}
} else {
if (UserPermissions.value != '仓库客服') {
ElMessage({
@ -1684,8 +1685,7 @@ 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
@ -1705,7 +1705,7 @@ const submit = () => {
console.log(data, '处理好的数据');
delete data.aftersalesProcessingResultsDTO.id; //ID
(data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId), //ID
data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //ID
console.log(data, '处理好的数据');
$_addProcessingResults(data).then(res => {
console.log(res, '提交后的参数');

356
src/views/aftersales/aftersalesWorkOrdermodify.vue

@ -635,7 +635,7 @@ const deletePackageInfo = ref([]); //被删除的包间信息
const unDecreaseImageEntityList = ref([]); //
const NewImageAddress = ref([]); //
const InitialresponsibleParty = ref(); //
const ProcessingParty =ref();//
const ProcessingParty = ref(); //
const CompensationParty = ref([
{ name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //
{ name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //
@ -818,7 +818,8 @@ const onLoad = () => {
Indexform.value.processor.push(item.businessId);
}
});
ProcessingParty.value = JSON.parse(JSON.stringify(Indexform.value.processor))//
ProcessingParty.value = JSON.parse(JSON.stringify(Indexform.value.processor)); //
console.log(ProcessingParty.value, '拷贝的处理方');
console.log(Indexform.value.processor, ' Indexform.value.processor');
getDictionaryBiz('pc_work_order').then(res => {
//
@ -868,33 +869,38 @@ const onLoad = () => {
Indexform.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
//
Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
//
CompensationParty.value = [];
if (res.data.data.completionRecipientEntityList) {
if (res.data.data.completionRecipientEntityList.length > 0) {
res.data.data.completionRecipientEntityList.forEach((item, index) => {
TotalamountReceived.value += Number(item.money);
if (
res.data.data.completionRecordEntities.length ||
res.data.data.completionRecipientEntityList.length
) {
//
CompensationParty.value = [];
//
if (res.data.data.completionRecordEntities.length) {
res.data.data.completionRecordEntities.forEach((item, index) => {
TotalamountCompensation.value += Number(item.money);
CompensationParty.value.push({
state: 1, //
state: 0, //
num: item.money, //
name: item.recipient, //
reason: item.reasonReceivingPayment, //
name: item.indemnitor, //
reason: item.reason, //
explains: item.explains, //
cld: index + 1,
});
});
}
}
if (res.data.data.completionRecordEntities) {
//
if (res.data.data.completionRecordEntities.length > 0) {
res.data.data.completionRecordEntities.forEach((item, index) => {
TotalamountCompensation.value += Number(item.money);
//
if (res.data.data.completionRecipientEntityList.length) {
res.data.data.completionRecipientEntityList.forEach((item, index) => {
TotalamountReceived.value += Number(item.money);
CompensationParty.value.push({
state: 0, //
state: 1, //
num: item.money, //
name: item.indemnitor, //
reason: item.reason, //
name: item.recipient, //
reason: item.reasonReceivingPayment, //
explains: item.explains, //
cld: index + 1,
});
@ -902,6 +908,7 @@ const onLoad = () => {
}
}
Indexform.value.arbitrate = res.data.data.reasonArbitration; //
//
SelectType.value = IndexException.value.find(
item => item.value == Indexform.value.workOrderType
@ -1149,14 +1156,14 @@ const ConfirmForm = () => {
packageEntityList: [], // ()
unPpackageEntityList: [], //ID
processorEntityList: [], //
unProcessorEntityList: [], //
processorEntityList: [], //()
unProcessorEntityList: [], //
decreaseImageEntityList: [], //
unDecreaseImageEntityList: [], //
completionRecipientEntities: [], //
completionRecordEntities: [], //
aftersalesProcessingResultsDTO: {}, //
completionRecipientEntities: [], //()
completionRecordEntities: [], //()
aftersalesProcessingResultsDTO: {}, //
personResponsibleDTO: [], //()
unPersonResponsibleDTO: [], //
@ -1169,6 +1176,13 @@ const ConfirmForm = () => {
objB => !unPackageInfo.value.some(objA => JSON.stringify(objA) === JSON.stringify(objB))
); //
//
DataSubmit.surveyRecordDTO = {
content: Indexform.value.investigationPocess, //'
workOrderId: $route.query.id, //ID
// pictureUrl: KFfeel.value.join(','), //
};
if (Modified.length) {
//
Modified.forEach(item => {
@ -1214,6 +1228,7 @@ const ConfirmForm = () => {
});
}
}
// ID
DataSubmit['unPpackageEntityList'] = deletePackageInfo.value.map(item => item.id);
@ -1230,90 +1245,171 @@ const ConfirmForm = () => {
modifyresponsibility.forEach(item => {
DataSubmit['personResponsibleDTO'].push({
wordOrderId: Indexform.value.workOrderNumber, //ID
personResponsibleId:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //ID
personResponsibleName:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //
personResponsibleId:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //ID
personResponsibleName:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //
businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //ID
businessName:warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, ////
responsibilityRatio:item.responsibilityRatio, //
businessName: warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, ////
responsibilityRatio: item.responsibilityRatio, //
description: item.description, //
});
});
//
if(unProcessorEntityList.value.length){
unProcessorEntityList.value.forEach(item=>{
DataSubmit['unPersonResponsibleDTO'].push({
wordOrderId: Indexform.value.workOrderNumber, //ID
personResponsibleId:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //ID
personResponsibleName:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //
businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //ID
businessName:warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, ////
responsibilityRatio:item.responsibilityRatio, //
description: item.description, //
//
if (unProcessorEntityList.value.length) {
unProcessorEntityList.value.forEach(item => {
DataSubmit['unPersonResponsibleDTO'].push({
wordOrderId: Indexform.value.workOrderNumber, //ID
personResponsibleId:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //ID
personResponsibleName:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name ||
null, //
businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //ID
businessName:
warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, ////
responsibilityRatio: item.responsibilityRatio, //
description: item.description, //
});
});
})
}
}
//
DataSubmit['processorEntityList'].push({
businessName:'',//
businessId:'',//ID
workOrderId:$route.query.id,//ID
conditions:2,// 1 2 3
typesOf:2,// 1 2
processingStatus:'',// 1 2
warehouseId:$route.query.warehouseId,//ID
assignTime:'',//
})
//
DataSubmit['unProcessorEntityList'].push({
businessName:'',//
businessId:'',//ID
workOrderId:$route.query.id,//ID
conditions:2,// 1 2 3
typesOf:2,// 1 2
processingStatus:'',// 1 2
warehouseId:$route.query.warehouseId,//ID
assignTime:'',//
})
//
Indexform.value.processor.forEach(item=>{
msgData['processorEntityList'].push({
businessName: warehouseData.value.find(obj => obj.value == item).label, //
businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
workOrderId: $route.query.id, //ID
conditions:2,// 1 2 3
typesOf: 2, //1 2
warehouseId: $route.query.warehouseId, //ID
processingStatus:'',// 1 2
assignTime:'',//
});
})
//
Indexform.value.processor.forEach(item=>{
msgData['unProcessorEntityList'].push({
businessName: warehouseData.value.find(obj => obj.value == item).label, //
businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
workOrderId: $route.query.id, //ID
conditions:3,// 1 2 3
typesOf: 2, //1 2
warehouseId: $route.query.warehouseId, //ID
processingStatus:'',// 1 2
assignTime:'',//
//
let arraysAreEqual =
ProcessingParty.value.length === Indexform.value.processor.length &&
ProcessingParty.value.every(aElement => Indexform.value.processor.includes(aElement));
if (arraysAreEqual) {
Indexform.value.processor.forEach(item => {
DataSubmit['processorEntityList'].push({
businessName: warehouseData.value.find(obj => obj.value == item).label, //
businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
workOrderId: $route.query.id, //ID
conditions: 1, // 1 2 3
typesOf: 2, //1 2
warehouseId: $route.query.warehouseId, //ID
processingStatus: $route.query.ProcessType, // 1 2
});
});
})
console.log('处理方没有发送改变');
} else {
//
console.log(ProcessingParty.value, '初始值处理方');
//
let changedElements = Indexform.value.processor.filter(
bElement => !ProcessingParty.value.some(aElement => aElement === bElement)
);
console.log(changedElements, '发送改变的处理方');
//
if (changedElements) {
//
changedElements.forEach(item => {
DataSubmit['processorEntityList'].push({
businessName: warehouseData.value.find(obj => obj.value == item).label, //
businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
workOrderId: $route.query.id, //ID
conditions: 2, // 1 2 3
typesOf: 2, //1 2
warehouseId: $route.query.warehouseId, //ID
processingStatus: $route.query.ProcessType, // 1 2
});
});
}
//
let removedElements = ProcessingParty.value.filter(
aElement => !Indexform.value.processor.includes(aElement)
);
console.log(removedElements, '被移除的处理方');
if (removedElements.length) {
//
Indexform.value.processor.forEach(item => {
DataSubmit['unProcessorEntityList'].push({
businessName: warehouseData.value.find(obj => obj.value == item).label, //
businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
workOrderId: $route.query.id, //ID
conditions: 3, // 1 2 3
typesOf: 2, //1 2
warehouseId: $route.query.warehouseId, //ID
processingStatus: $route.query.ProcessType, // 1 2
});
});
}
}
// //
// 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);
@ -1337,38 +1433,42 @@ const Arbitrationcompleted = () => {
},
};
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //ID
CompensationParty.value.forEach(item => {
if (item.state == 0) {
//
data['completionRecordEntities'].push({
indemnitor: item.name, //
reason: item.reason, //
money: Number(item.num), //
reasonArbitration: item.reason, //
workOrderId: $route.query.id, //
warehouseId: $route.query.warehouseId, //ID
});
} else {
//
data['completionRecipientEntities'].push({
recipient: item.name, //
reasonReceivingPayment: item.reason, //
money: Number(item.num), //
responsibleParty: FangAddList.value
.map(aItem =>
warehouseData.value
.filter(bItem => bItem.value === aItem.businessName)
.map(match => match.label)
.join(',')
)
.join(','),
workOrderNumber: $route.query.workOrderNumber, //
workOrderId: $route.query.id, //
warehouseId: $route.query.warehouseId, //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, //
};
});
//
data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value

22
src/views/distribution/signfor/distributionSignfortreat.vue

@ -814,9 +814,29 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'unloadedNumber',
label: '未装车件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'receivedQuantity',
label: '司机签收数',
label: '签收件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'unreceivedQuantity',
label: '未签收件数',
type: 1,
values: '',
width: '130',

29
src/views/warehouse/parcelList/distributionParcelList.vue

@ -224,6 +224,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'warehouseEntryTimeEnd',
label: '入库时间',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageCode',
label: '包条码',
@ -728,10 +738,29 @@ export default {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
formatDateTime(dateTimeString) {
// "00:00:00"
if (dateTimeString.endsWith('00:00:00')) {
//
return dateTimeString.slice(0, -9);
} else {
//
return dateTimeString;
}
},
onLoad(page, params = {}) {
this.loading = true;
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(res,'获取到的页面初始值');
res.data.data.records.forEach(item=>{
if( item.warehouseEntryTimeEnd){
item.warehouseEntryTimeEnd= this.formatDateTime(item.warehouseEntryTimeEnd)
}
})
this.page.total = data.total;
this.data = data.records.map(val => {
val.conditionsType = val.conditions === 1 ? '定制品' : '库存品';

Loading…
Cancel
Save