Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
commit
0eaf9ce14f
  1. 24
      src/router/views/index.js
  2. 7
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 25
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  4. 189
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  5. 13
      src/views/aftersales/aftersalesWorkOrderend.vue
  6. 261
      src/views/aftersales/aftersalesWorkOrdermodify.vue
  7. 229
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  8. 113
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  9. 145
      src/views/distribution/inventory/distrilbutionBillLading.vue
  10. 37
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  11. 20
      src/views/distribution/reservation/reservation.vue
  12. 71
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  13. 63
      src/views/distribution/stockup/distributionStockupMarket.vue
  14. 10
      src/views/distribution/stockup/distributionStockupSelf.vue
  15. 29
      src/views/distribution/turndelivery/deliveryDiscuss.vue

24
src/router/views/index.js

@ -1273,19 +1273,31 @@ export default [
},
],
},
{
path: '/aftersales/aftersalesWorkOrderSS',
path: '/aftersales/aftersalesWorkOrdermodify',
component: Layout,
redirect: '/aftersales/aftersalesWorkOrderSS',
redirect: '/aftersales/aftersalesWorkOrdermodify',
children: [
{
path: '/aftersales/aftersalesWorkOrderSS',
name: '工单A',
component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'),
path: '/aftersales/aftersalesWorkOrdermodify',
name: '信息编辑',
component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'),
},
],
},
// {
// path: '/aftersales/aftersalesWorkOrderSS',
// component: Layout,
// redirect: '/aftersales/aftersalesWorkOrderSS',
// children: [
// {
// path: '/aftersales/aftersalesWorkOrderSS',
// name: '工单A',
// component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'),
// },
// ],
// },
// {

7
src/views/aftersales/aftersalesWorkOrder.vue

@ -154,11 +154,11 @@
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<template v-if="slotProps.scope.column.label === '操作'" >
<div class="ElBtnClass">
<div v-if="!TimeoutStatus">
<div >
<!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
<el-button @click="view(slotProps.scope)"
<el-button v-if="TabPermissions !='4'" @click="view(slotProps.scope)"
>查看</el-button
>
<!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
@ -2306,6 +2306,7 @@ const appealFn = val => {
//
const AppealTab = val => {
if (val == 0) {
AppealStatusT.value = false; //
Tableheaderswitching(columnList); //

25
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -815,19 +815,28 @@ const ConfirmForm = () => {
DataSubmit.decreaseImageEntityList = JSON.parse(
JSON.stringify(Indexform.value['decreaseImageEntityList'])
);
console.log(Indexform.value.workOrderNumber,'Indexform.workOrderNumber12312312');
//
// packageEntityList
PackageInfo.value.forEach(item=>{
DataSubmit['packageEntityList'].push({
workOrderId: Indexform.workOrderNumber, //ID
number: PackageInfo.value.length, //
packageCode: PackageInfo.value.map(item => item.packageCode).join(','), //
warehouseId: '', //ID
packageImage: Indexform.value['packList'].map(item => item.url).join(','), //
waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //
orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //
packageCode: item.packageCode, //
// warehouseId: '', //ID
waybillNumber:item.waybillNumber, //
orderCode:item.orderCode, //
});
})
// DataSubmit['packageEntityList'].push({
// workOrderId: Indexform.workOrderNumber, //ID
// number: PackageInfo.value.length, //
// packageCode: PackageInfo.value.map(item => item.packageCode).join(','), //
// warehouseId: '', //ID
// packageImage: Indexform.value['packList'].map(item => item.url).join(','), //
// waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //
// orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //
// });
DataSubmit.orderCode = PackageInfo.value.map(item => item.orderCode).join(','); //
//
Indexform.value.number = PackageInfo.value.length;

189
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -713,18 +713,7 @@ const onLoad = () => {
});
//
PackageInfo.value = res.data.data.abnormalPackageVOList
.map(item => {
let orderCodes = item.orderCode.split(',');
let packageCodes = item.packageCode.split(',');
let waybillNumbers = item.waybillNumber.split(',');
return orderCodes.map((code, index) => ({
packageCode: packageCodes[index],
orderCode: code,
waybillNumber: waybillNumbers[index],
}));
})
.flat();
//
FangAddList.value = res.data.data.processorVOList
.filter(item => item.typesOf == '1')
@ -763,8 +752,10 @@ const onLoad = () => {
ProcessingResults.value = res.data.data;
});
//
res.data.data.processingResultsVO.processingMoneyEntityList.forEach(item => {
ProcessingList.value.push({
if(res.data.data.processingResultsVO.processingMoneyEntityList){
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(item => {
Indexform.value.result.push(item.resultType);
return {
input: item.money,
min: 0,
max: 9999999999999999999999999999,
@ -772,9 +763,9 @@ const onLoad = () => {
payment: item.compensationMethod,
name: item.resultTypeName,
text: item.compensationMethodName,
});
Indexform.value.result.push(item.resultType);
};
});
}
//
TotalClaimAmount.value = res.data.data.processingResultsVO.money;
//
@ -855,172 +846,6 @@ const TopChange = val => {
}
};
//
const ConfirmForm = () => {
// :10,20
// decreaseImageEntityList:[
// {imageType:10,imageName:'',imagePath:''},
// {imageType:10,imageName:'',imagePath:''},
// ]
console.log(Indexform.value['packList'], '图片列表');
// (西)
if (SelectType.value == 1 || SelectType.value == 3) {
if (Indexform.value['packList']) {
Indexform.value['packList'].forEach(item => {
Indexform.value['decreaseImageEntityList'].push({
imageType: SelectType.value == 1 ? 10 : SelectType.value == 3 ? 20 : '',
imageName: item.name,
imagePath: item.url,
});
});
}
}
console.log(Indexform.value['decreaseImageEntityList'], '处理好的图片');
//
if (Indexform.value.deliveryDriver) {
Indexform.value.deliveryDriver = DeliveryDriver.value.find(
item => item.value == Indexform.value.deliveryDriver
).label;
}
console.log(Indexform.value.deliveryDriver); //
let processorEntityList = [];
//
if (Indexform.value.processor.length) {
Indexform.value.processor.forEach(item => {
let found = warehouseData.value.find(element => element.value == item.toString());
processorEntityList.push({
businessName: found ? found.label : '',
businessId: item,
conditions: 1,
typesOf: 2,
});
});
}
//
// if (Indexform.value.businessMame) {
// const found = responsible.value.find(item => item.value === Indexform.value.businessMame);
// if (found) {
// processorEntityList.push({
// businessName: found.label,
// businessId: found.id,
// conditions: 1,
// typesOf: 1,
// });
// }
// }
//
console.log(Indexform.value.businessMame, '提货责任方');
let DataSubmit = {
personResponsibleDTO: [],
packageEntityList: [], ////
...Indexform.value,
}; //
DataSubmit.processorEntityList = processorEntityList;
DataSubmit.decreaseImageEntityList = JSON.parse(
JSON.stringify(Indexform.value['decreaseImageEntityList'])
);
//
// packageEntityList
DataSubmit['packageEntityList'].push({
workOrderId: Indexform.workOrderNumber, //ID
number: PackageInfo.value.length, //
packageCode: PackageInfo.value.map(item => item.packageCode).join(','), //
warehouseId: '', //ID
packageImage: Indexform.value['packList'].map(item => item.url).join(','), //
waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //
orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //
});
DataSubmit.orderCode = PackageInfo.value.map(item => item.orderCode).join(','); //
//
Indexform.value.number = PackageInfo.value.length;
console.log(DataSubmit['packageEntityList'], '包件信息');
//
DataSubmit.surveyRecordDTO = {
content: Indexform.value.investigationPocess,
workOrderId: Indexform.value.workOrderNumber,
};
console.log(DataSubmit.surveyRecordDTO, '调查经过');
//
// FangAddList.value
//
FangAddList.value.forEach(item => {
DataSubmit['personResponsibleDTO'].push({
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,
personResponsibleId:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //ID personResponsibleList
personResponsibleName:
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //
responsibilityRatio: item.responsibilityRatio, //
});
});
let proportion = 0; //
DataSubmit['personResponsibleDTO'].forEach(item => {
proportion += Number(item.responsibilityRatio);
});
console.log(proportion, '责任比例之和');
companyProportion.value = 100 - proportion;
DataSubmit.companyProportion = companyProportion.value; //
console.log(DataSubmit.companyProportion, '公司占比');
console.log(DataSubmit['personResponsibleDTO'], '新责任方处理的数据');
//console.log(Indexform.value.duty.length);
//
if (FangAddList.value.length) {
console.log(warehouseData.value, 'warehouseData.value');
FangAddList.value.forEach(item => {
console.log(item, 'item');
processorEntityList.push({
businessName:
warehouseData.value.find(obj => obj.value == item.businessName)?.label || null,
businessId: item.businessName,
conditions: 1,
typesOf: 1,
});
});
}
DataSubmit.identifying = identifying.value; //123
console.log(processorEntityList, '老责任方处理好的数据');
// //
// if (Indexform.value.duty.length) {
// Indexform.value.forEach(item => {
// let found = warehouseData.value.find(element => element.value == item.toString());
// processorEntityList.push({
// businessName: found ? found.label : '',
// businessId: item,
// conditions: 1,
// typesOf: 1,
// });
// });
// }
delete DataSubmit.duty, //
delete DataSubmit.packList; //
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'); //
}
});
};
//
const BatchReturn = () => {
@ -1266,7 +1091,7 @@ const EditInformation = () => {
path: '/aftersales/aftersalesWorkOrdermodify',
query: {
id: $route.query.id,
name: $route.query.workOrderNumber + '-信息编辑',
name: $route.query.workOrderNumber + '-编辑',
businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber,

13
src/views/aftersales/aftersalesWorkOrderend.vue

@ -994,18 +994,7 @@ const onLoad = () => {
});
//
PackageInfo.value = res.data.data.abnormalPackageVOList
.map(item => {
let orderCodes = item.orderCode.split(',');
let packageCodes = item.packageCode.split(',');
let waybillNumbers = item.waybillNumber.split(',');
return orderCodes.map((code, index) => ({
packageCode: packageCodes[index],
orderCode: code,
waybillNumber: waybillNumbers[index],
}));
})
.flat();
//
FangAddList.value = res.data.data.processorVOList
.filter(item => item.typesOf == '1')

261
src/views/aftersales/aftersalesWorkOrdermodify.vue

@ -40,7 +40,7 @@
<el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
查看历史包件
</el-button>
<el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button>
<el-button type="primary" @click="PackagRemoval(index, item)"> 移除 </el-button>
</div>
</div>
<div class="NumTotal">
@ -49,7 +49,13 @@
</div>
</el-tab-pane>
</el-tabs>
<el-form :disabled="RouterState=='false'" :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
<el-form
:disabled="RouterState == 'false'"
:model="Indexform"
label-width="100px"
class="IndexFrom"
ref="IndexForm"
>
<el-form-item label="异常类型">
<el-select
v-model="Indexform.workOrderType"
@ -120,9 +126,7 @@
/>
</el-form-item>
<el-form-item
label="发现时间"
>
<el-form-item label="发现时间">
<el-date-picker
v-model="Indexform.discoveryTime"
type="datetime"
@ -132,8 +136,7 @@
/>
</el-form-item>
<el-form-item
label="配送时间">
<el-form-item label="配送时间">
<el-date-picker
v-model="Indexform.deliveryTime"
type="datetime"
@ -143,8 +146,7 @@
/>
</el-form-item>
<el-form-item
label="入库时间">
<el-form-item label="入库时间">
<el-date-picker
v-model="Indexform.warehousingTime"
type="datetime"
@ -302,7 +304,9 @@
</div>
</div>
<div class="el-btn">
<el-button type="primary" @click="ResponsibilityRemoval(index)"> 移除 </el-button>
<el-button type="primary" @click="ResponsibilityRemoval(index, item)">
移除
</el-button>
</div>
</div>
<div class="Proportion">
@ -446,7 +450,6 @@
</el-tabs>
</div>
<div class="Transport_damage_photos">
<el-upload
v-model:file-list="Indexform.packageImage"
list-type="picture-card"
@ -591,13 +594,14 @@ const TotalamountCompensation = ref(0); //赔款金额合计
const TotalamountReceived = ref(0); //
const Indexform = ref({
packList: [],
packageImage: [], //
decreaseImageEntityList: [], //
}); //
const IndexException = ref([]); //
const ProcessingList = ref([]); //
const DiscoveringNodes = ref([]); //
const warehouseData = ref([]); //
const SelectType = ref(null); //
const SelectType = ref(); //
const StateType = ref(true); //
const HistoricalPackageinput = ref(''); //
const dialogImageUrl = ref(null); //
@ -624,13 +628,20 @@ const ProcessingResults = ref([]); //处理结果列表选项
const TotalClaimAmount = ref(0); //
const TransportlossList = ref([]);
const RouterState = ref(null); //
const oldData = ref(); //
const unPackageInfo = ref(); //
const unProcessorEntityList = ref([]); //
const deletePackageInfo = ref([]); //
const unDecreaseImageEntityList = ref([]); //
const NewImageAddress = ref([]); //
const InitialresponsibleParty = ref(); //
const CompensationParty = ref([
{ name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //
{ name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //
]); ///
const PackageInfo = ref([
//
{ packageCode: '', orderCode: '', waybillNumber: '' },
{ packageCode: '', orderCode: '', waybillNumber: '', state: 0 },
]);
//
const FangAddList = ref([
@ -692,14 +703,7 @@ const doubledCount = computed(() => {
//
const ImgSuccess = (response, uploadFile) => {
if (response.success === true) {
console.log(response);
Indexform.value['packList'].push({
name: response.data.originalName,
url: response.data.link,
});
console.log(Indexform.value['packList'], '图片列表');
}
console.log(Indexform.value['packageImage'], '图片列表');
};
//
@ -719,6 +723,7 @@ const pictureList = val => {
};
//
const ImgListRemove = val => {
unDecreaseImageEntityList.value.push(val); //
console.log(val, '移除图片');
};
//
@ -766,6 +771,8 @@ const onLoad = () => {
handle(); //
$_getInfo({ id: $route.query.id }).then(res => {
oldData.value = JSON.parse(JSON.stringify(res.data.data));
console.log(oldData.value, '旧数据');
console.log(res, '回显返回值参数');
Indexform.value = res.data.data;
Indexform.value.result = [];
@ -778,20 +785,13 @@ const onLoad = () => {
url: res.imagePath,
});
});
NewImageAddress.value = JSON.parse(JSON.stringify(Indexform.value['packageImage'])); //
//
PackageInfo.value = res.data.data.abnormalPackageVOList
.map(item => {
let orderCodes = item.orderCode.split(',');
let packageCodes = item.packageCode.split(',');
let waybillNumbers = item.waybillNumber.split(',');
return orderCodes.map((code, index) => ({
packageCode: packageCodes[index],
orderCode: code,
waybillNumber: waybillNumbers[index],
}));
})
.flat();
PackageInfo.value = res.data.data.abnormalPackageVOList;
unPackageInfo.value = JSON.parse(JSON.stringify(PackageInfo.value)); //
console.log(unPackageInfo.value, '包件信息');
//
FangAddList.value = res.data.data.processorVOList
.filter(item => item.typesOf == '1')
@ -810,6 +810,7 @@ const onLoad = () => {
};
});
InitialresponsibleParty.value = JSON.parse(JSON.stringify(FangAddList.value)); //
res.data.data.processorVOList.forEach(item => {
if (item.typesOf == 2) {
//
@ -841,19 +842,23 @@ const onLoad = () => {
sum = Number(item.responsibilityRatio) + sum;
});
companyProportion.value = 100 - sum;
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(item => {
Indexform.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,
};
});
//
if (res.data.data.processingResultsVO.processingMoneyEntityList) {
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
item => {
Indexform.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;
@ -861,8 +866,9 @@ const onLoad = () => {
Indexform.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
//
Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
//
CompensationParty.value = [];
//
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);
@ -876,6 +882,8 @@ const onLoad = () => {
});
});
}
}
if (res.data.data.completionRecordEntities) {
//
if (res.data.data.completionRecordEntities.length > 0) {
res.data.data.completionRecordEntities.forEach((item, index) => {
@ -890,6 +898,13 @@ const onLoad = () => {
});
});
}
}
//
SelectType.value = IndexException.value.find(
item => item.value == Indexform.value.workOrderType
).value;
console.log(SelectType.value, '异常类型');
});
};
onLoad(); //
@ -944,10 +959,12 @@ const handlePictureCardPreview = uploadFile => {
//
const AddPackage = () => {
PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '' });
PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '', state: 1 });
};
//
const PackagRemoval = val => {
const PackagRemoval = (val, item) => {
deletePackageInfo.value.push(item);
console.log(deletePackageInfo.value, '移除包件');
PackageInfo.value.splice(val, 1); //
};
//
@ -960,7 +977,9 @@ const responsibleParty = () => {
});
};
//
const ResponsibilityRemoval = val => {
const ResponsibilityRemoval = (val, item) => {
unProcessorEntityList.value.push(item);
console.log(unProcessorEntityList.value, '移除责任方');
FangAddList.value.splice(val, 1); //
};
//
@ -1122,30 +1141,122 @@ const payremove = (state, val) => {
};
//
const ConfirmForm = () => {
let DataSubmit={
packageEntityList:[],//
unPpackageEntityList:[],//ID
processorEntityList:[],//
unProcessorEntityList:[],//
decreaseImageEntityList:[],//
unDecreaseImageEntityList:[],//
completionRecipientEntities:[],//
completionRecordEntities:[],//
aftersalesProcessingResultsDTO:{
},//
personResponsibleDTO:[],//
unPersonResponsibleDTO:[],//
surveyRecordDTO:{
},//
...Indexform.value
// console.log(oldData.value,'');
// ...Indexform.value
let DataSubmit = {
packageEntityList: [], // ()
unPpackageEntityList: [], //ID
processorEntityList: [], //
unProcessorEntityList: [], //
decreaseImageEntityList: [], //
unDecreaseImageEntityList: [], //
completionRecipientEntities: [], //
completionRecordEntities: [], //
aftersalesProcessingResultsDTO: {}, //
personResponsibleDTO: [], //
unPersonResponsibleDTO: [], //
surveyRecordDTO: {}, //
};
DataSubmit.id = $route.query.id; //
let Modified = PackageInfo.value.filter(
objB => !unPackageInfo.value.some(objA => JSON.stringify(objA) === JSON.stringify(objB))
); //
if (Modified.length) {
//
Modified.forEach(item => {
deletePackageInfo.value.push(item); //
console.log(item);
DataSubmit['packageEntityList'].push({
id: $route.query.id,
number: Modified.length, //
packageCode: item.packageCode, //
warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, //ID
waybillNumber: item.waybillNumber, //
orderCode: item.orderCode, //
});
});
}
let addedImages = Indexform.value['packageImage'].filter(
image => !NewImageAddress.value.some(existingImage => existingImage.url === image.url)
);
// :10,20
if (SelectType.value == '1' || SelectType.value == '3') {
if (addedImages.length) {
addedImages.forEach(item => {
DataSubmit['decreaseImageEntityList'].push({
imageType: SelectType.value == '1' ? 10 : SelectType.value == '3' ? 20 : '',
imageName: item.name,
imagePath: item.response.data.link,
});
});
}
}
console.log(DataSubmit, '处理好的数据');
$_modifyData(DataSubmit).then(res=>{
console.log(res,'编辑成功返回值');
//
if (SelectType.value == '1' || SelectType.value == '3') {
if (unDecreaseImageEntityList.value.length) {
unDecreaseImageEntityList.value.forEach(item => {
DataSubmit['unDecreaseImageEntityList'].push({
imageType: SelectType.value == '1' ? 10 : SelectType.value == '3' ? 20 : '',
imageName: item.name,
imagePath: item.url,
});
});
}
}
// ID
DataSubmit['unPpackageEntityList'] = deletePackageInfo.value.map(item => item.id);
// InitialresponsibleParty
// FangAddList
//
let modifyresponsibility = FangAddList.value.filter(
objB =>
!InitialresponsibleParty.value.some(objA => JSON.stringify(objA) === JSON.stringify(objB))
);
console.log(modifyresponsibility, '发送改变的责任方');
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, //
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, //
});
})
}
//
console.log(DataSubmit, '处理好的数据');
// $_modifyData(DataSubmit).then(res => {
// console.log(res, '');
// });
};
//
@ -1154,7 +1265,7 @@ const Arbitrationcompleted = () => {
id: $route.query.id,
completionRecipientEntities: [], //
completionRecordEntities: [], //
reasonArbitration:Indexform.value.arbitrate, //
reasonArbitration: Indexform.value.arbitrate, //
aftersalesProcessingResultsDTO: {
workOrderId: '', //ID
},
@ -1167,7 +1278,7 @@ const Arbitrationcompleted = () => {
indemnitor: item.name, //
reason: item.reason, //
money: Number(item.num), //
reasonArbitration:item.reason,//
reasonArbitration: item.reason, //
workOrderId: $route.query.id, //
warehouseId: $route.query.warehouseId, //ID
});

229
src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@ -84,6 +84,12 @@
<!-- </el-col> -->
<!-- </el-row> -->
<!-- 商配总车次 -->
<div style="
height: 95%;
">
<div class="order-info">
<ul>
<li>
@ -100,7 +106,7 @@
</div>
<el-row >
<el-row class="el_tabBK">
<el-tabs v-model="activeName" @tab-click="handleClick">
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -123,119 +129,119 @@
</div>
</div>
<el-tab-pane label="全部列表" name="first">
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
> </el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
<!-- <tablecmt-->
<!-- :columnList="columnList"-->
<!-- :tableData="data"-->
<!-- :loading="loading"-->
<!-- @inputTxt="inputsc"-->
<!-- @timeCheck="timesc"-->
<!-- @btnCheck="btnsc"-->
<!-- @selectCheck="selectsc"-->
<!-- @selection="selectionsc"-->
<!-- >-->
<!-- <template #default="slotProps">-->
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>-->
<!-- <el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>-->
<!-- <el-text size="small" @click="editmap(slotProps.scope)"> </el-text>-->
<!-- <el-text-->
<!-- size="small"-->
<!-- v-if="-->
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
<!-- slotProps.scope.row.deliveryStatus !== '3'-->
<!-- "-->
<!-- @click="handleEdit(slotProps.scope)"-->
<!-- > </el-text-->
<!-- >-->
<!-- &lt;!&ndash; <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </tablecmt>-->
</el-tab-pane>
<el-tab-pane label="待配送" name="second">
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
> </el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
<!-- <tablecmt-->
<!-- :columnList="columnList"-->
<!-- :tableData="data"-->
<!-- :loading="loading"-->
<!-- @inputTxt="inputsc"-->
<!-- @timeCheck="timesc"-->
<!-- @btnCheck="btnsc"-->
<!-- @selectCheck="selectsc"-->
<!-- @selection="selectionsc"-->
<!-- >-->
<!-- <template #default="slotProps">-->
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>-->
<!-- <el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>-->
<!-- <el-text size="small" @click="editmap(slotProps.scope)"> </el-text>-->
<!-- <el-text-->
<!-- size="small"-->
<!-- v-if="-->
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
<!-- slotProps.scope.row.deliveryStatus !== '3'-->
<!-- "-->
<!-- @click="handleEdit(slotProps.scope)"-->
<!-- > </el-text-->
<!-- >-->
<!-- &lt;!&ndash; <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </tablecmt>-->
</el-tab-pane>
<el-tab-pane label="配送中" name="third">
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
> </el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
<!-- <tablecmt-->
<!-- :columnList="columnList"-->
<!-- :tableData="data"-->
<!-- :loading="loading"-->
<!-- @inputTxt="inputsc"-->
<!-- @timeCheck="timesc"-->
<!-- @btnCheck="btnsc"-->
<!-- @selectCheck="selectsc"-->
<!-- @selection="selectionsc"-->
<!-- >-->
<!-- <template #default="slotProps">-->
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>-->
<!-- <el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>-->
<!-- <el-text size="small" @click="editmap(slotProps.scope)"> </el-text>-->
<!-- <el-text-->
<!-- size="small"-->
<!-- v-if="-->
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
<!-- slotProps.scope.row.deliveryStatus !== '3'-->
<!-- "-->
<!-- @click="handleEdit(slotProps.scope)"-->
<!-- > </el-text-->
<!-- >-->
<!-- &lt;!&ndash; <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </tablecmt>-->
</el-tab-pane>
<el-tab-pane label="已完成" name="fourth">
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="
</el-tab-pane>
</el-tabs>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
> </el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
</el-tab-pane>
</el-tabs>
@click="handleEdit(slotProps.scope)"
> </el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
<!-- 列表模块 -->
@ -269,6 +275,7 @@
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-row>
</div>
<el-row class='el-fy'>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
@ -1335,6 +1342,7 @@ export default {
}
this.page.total = data.total;
this.data = data.records;
// data.records
this.loading = false;
this.selectionClear();
});
@ -1361,6 +1369,7 @@ export default {
.avue-crud {
:deep(.el-dialog) {
width: fit-content;
justify-content: space-between;
}
:deep(.el-row){
flex-direction: column;
@ -1455,9 +1464,15 @@ export default {
flex-direction: column;
}
.el-fy {
flex: 1;
height: 30px;
display: flex;
align-items: flex-end;
justify-content: flex-end;
}
:deep(.maboxhi){
height:100%!important;
}
.el_tabBK{
height:70%;
}
</style>

113
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -288,7 +288,9 @@
<!-- </el-text>-->
<!-- </template>-->
<template #default="slotProps">
<el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)">查看二维码</el-text>
<el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)"
>查看二维码</el-text
>
</template>
</tablecmt>
</el-tab-pane>
@ -418,16 +420,12 @@
:width="item.width"
:key="index"
>
<!-- :align="center"-->
</el-table-column>
<!-- <span>操作</span>-->
<!-- <span>操作</span>-->
</template>
<el-table-column
fixed="right"
label="操作"
width="100">
<el-table-column fixed="right" label="操作" width="100">
<template #default="scope">
<el-button size="small" @click="handleQRCode(scope.row)">查看二维码</el-button>
</template>
@ -457,7 +455,14 @@
<!-- </template>-->
</el-dialog>
<el-dialog class="el_foot" :title="signtitle" v-model="signBox" width="45%" append-to-body :style="{height:windowHeight+'px',overflow:'scroll'}">
<el-dialog
class="el_foot"
:title="signtitle"
v-model="signBox"
width="45%"
append-to-body
:style="{ height: windowHeight + 'px', overflow: 'scroll' }"
>
<!-- <avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform">
</avue-form> -->
<!-- <div style="bottom: 7%; margin-left: 500px; width: 50%">
@ -633,7 +638,7 @@ import { getToken } from '@/utils/auth';
export default {
data() {
return {
html:'',
html: '',
dialogImageUrl: '', //
dialogVisible: false, //
dialogImageUrlA: '',
@ -662,7 +667,7 @@ export default {
//
SignForPhotos: [],
reservationId: null, //ID
windowHeight:null,
windowHeight: null,
columnList: [
{
prop: 'reservationCode',
@ -820,26 +825,26 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'isUrgentName',
label: '是否加急',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'assignStatusName',
label: '备货指派状态',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'isUrgentName',
// label: '',
// type: 1,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'assignStatusName',
// label: '',
// type: 1,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockupStatusName',
label: '备货状态',
@ -1616,7 +1621,8 @@ export default {
fixed: false,
sortable: true,
head: false,
}, {
},
{
prop: 'orderCode',
label: '订单自编码',
type: 2,
@ -2732,8 +2738,9 @@ export default {
mounted() {
this.init();
this.onLoad();
this.windowHeight = window.innerHeight * 0.8;
console.log(`浏览器窗口的高度为:${this.windowHeight}px`);
this.windowHeight = window.innerHeight * 0.8;
console.log(`浏览器窗口的高度为:${this.windowHeight}px`);
},
created() {
// //
@ -2875,20 +2882,19 @@ export default {
btnsc() {},
selectsc() {},
handleInventoryQRCode(row){
handleInventoryQRCode(row) {
this.materialQRCode = row;
console.log('row------------>',row);
console.log('row------------>', row);
// let qr = {
// ids: row.id,
// };
this.html = '';
showInventoryPackgeCode(row.reservationId,row.id).then(res => {
showInventoryPackgeCode(row.reservationId, row.id).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisibleF = true;
},
/**
* 查看二维码
@ -3220,28 +3226,25 @@ export default {
console.log('签收>>>>>>>>>>', row);
this.loading = true;
this.$confirm('确认一键装车?')
.then(_ => {
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
console.log('------------->data', data);
getOneclick(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
.then(_ => {
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
console.log('------------->data', data);
getOneclick(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
});
})
.catch(_ => {})
.finally(() => {
this.loading = false;
});
})
.catch(_ => {})
.finally(()=>{
this.loading = false;
});
},
//
handleSignone(row) {
console.log('一键签收222>>>>>>>>>>', row);
if (row.loadingStatus != '已装车'){
if (row.loadingStatus != '已装车') {
ElMessage({
message: '请先进行装车',
type: 'warning',
@ -3465,7 +3468,7 @@ export default {
width: 100%;
}
}
.el_foot{
.el_foot {
overflow: scroll;
}
</style>

145
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -90,10 +90,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="物品明细" prop="certificateType">
<el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
<el-row :gutter="20" class="toscontent">
<el-col :span="24" >
<el-form-item label="物品明细" prop="certificateType" >
<el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%;">
<el-tab-pane label="定制品">
<el-button
type="primary"
@ -114,15 +114,15 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
<el-button
v-if="slotProps.scope.row.isZero === '1'"
type="primary"
text
icon="el-icon-delete"
@click.stop="handleZeroOrder(slotProps.scope.row)"
>录入预约数量</el-text
>录入预约数量</el-button
>
<el-text
<el-button
v-if="
slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
"
@ -130,23 +130,23 @@
text
icon="el-icon-delete"
@click.stop="handleStockZeroOrder(slotProps.scope.row)"
>维护在库数量</el-text
>维护在库数量</el-button
>
<el-text
<el-button
type="primary"
text
icon="el-icon-delete"
@click="rowOrder(slotProps.scope.row)"
>移除</el-text
>移除</el-button
>
<!-- 零担订单时不能选择包件 -->
<el-text
<el-button
v-if="Number(slotProps.scope.row.isZero) !== 1"
type="primary"
@click="handleChooseOrder(slotProps.scope.row)"
text
icon="el-icon-delete"
>选择包件</el-text
>选择包件</el-button
>
</template>
</tablecmt>
@ -179,6 +179,82 @@
</el-tabs>
</el-form-item>
</el-col>
<el-col v-if = !view :span="8">
<el-form-item label="提货证件" label-width="120px">
<el-upload
v-model:file-list="fileListSell"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListSell);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col >
<el-col v-if = !view :span="8">
<el-form-item label="文员确定图片" label-width="120px">
<el-upload
v-model:file-list="fileListClerk"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListClerk);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col>
<el-col v-if = !view :span="8">
<el-form-item label="库管签收图片" label-width="120px">
<el-upload
v-model:file-list="fileListLibrary"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListLibrary);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if = view>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="提货证件" label-width="120px">
<el-upload
@ -230,6 +306,7 @@
<el-col :span="8">
<el-form-item label="库管签收图片" label-width="120px">
<el-upload
v-model:file-list="fileListLibrary"
class="upload-demo"
:action="action"
@ -244,7 +321,7 @@
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<el-button type="primary" :disabled = "!view">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</template>
@ -252,9 +329,10 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 表单按钮 -->
<div class="foot" v-if="!view">
</div>
<!-- &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
<div class="foot" :disabled="view" >
<div class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
> </el-button
@ -492,6 +570,12 @@
</template>
</el-dialog>
</template>
<div class="LoadIMG">
<el-dialog v-model="dialogImg">
<img w-full :src="Imgurl" alt="Preview Image" />
</el-dialog>
</div>
</basic-container>
</template>
@ -518,6 +602,8 @@ import { nextTick, ref } from 'vue';
export default {
data() {
return {
dialogImg:false,
Imgurl:undefined,
OrdercolumnList: [
{
prop: 'serviceNumber',
@ -549,6 +635,8 @@ export default {
loading: false,
//
view: false,
//
viewSC: false,
//
query: {},
queryOrder: {},
@ -1736,6 +1824,10 @@ export default {
this.onLoad(this.page);
} else if (this.$route.query.type == '3') {
this.onLoadCj();
}else if (this.$route.query.type == '4') {
//
this.view = true;
this.getDetailOen();
}
/**
* 初始化获取本地缓存的编辑隐藏的列表
@ -2254,6 +2346,8 @@ export default {
},
handlePreview(file) {
console.log(file);
this.Imgurl =file.url;
this.dialogImg =true;
},
textbox(e, index) {
let nu = index + 1;
@ -3023,4 +3117,23 @@ export default {
.el-input-number {
width: 100%;
}
:deep(.maboxhi){
height: 100% !important;
}
.toscontent{
:deep(.el-form-item__content){
height: 400px;
overflow-y: scroll;
align-items: flex-start;
}
:deep(.el-tabs){
height: 100% !important;
}
}
.LoadIMG{
img{
width: 100%;
height: 100%;
}
}
</style>

37
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -31,12 +31,12 @@
<el-row>
<el-col :span="4">
<span style="margin-bottom: 2%; font-size: 16px">
待提货{{ treatNum }}/{{ numBill }}
待提货{{ treatNum }}/{{ this.sumTotal - this.signedFor }}
</span>
</el-col>
<el-col :span="10">
<span style="margin-bottom: 2%; font-size: 16px">
已提货{{ stopNum }}/{{ numBill }}</span
已提货{{ stopNum }}/{{ signedFor }}</span
>
</el-col>
</el-row>
@ -116,12 +116,22 @@
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope)"
@click="handleEdits(slotProps.scope,'1')"
v-if="
permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20
"
>编辑提货信息</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope,'2')"
v-if="
permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions > 20
"
>上传签收图片</el-text
>
<!-- <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
<el-text size="small" text
@ -704,6 +714,8 @@ export default {
stopNum: 0,
treatNum: 0,
numBill: 0,
signedFor: 0,
sumTotal: 0,
//
page: {
currentPage: 1,
@ -1103,13 +1115,22 @@ export default {
},
handleEdits(row) {
handleEdits(row,index) {
let name ;
let type ;
if(index === '1' ){
name = '编辑提货单'
type = "2";
}else{
name = "上传签收图片";
type = "4";
}
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query: {
id: row.row.id,
name: '编辑提货单',
type: '2',
name: name,
type: type,
},
});
},
@ -1213,7 +1234,9 @@ export default {
if (!!res.data.data) {
this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum);
this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum;
this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum);
this.signedFor = parseInt(res.data.data.signedFor); //
this.sumTotal = parseInt(res.data.data.sumTotal); //
console.log(",.,.已签收",this.signedFor,"全部",this.sumTotal);
}
});
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {

20
src/views/distribution/reservation/reservation.vue

@ -769,16 +769,16 @@ export default {
// sortable: true,
// },
// {
// prop: 'notes',
// label: '',
// type: 1,
// values: '',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: false,
// },
{
prop: 'operator',
label: '操作人',
type: 1,
values: '',
width: '140',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: '',
label: '操作',

71
src/views/distribution/stockup/distributionStockupDiscuss.vue

@ -55,13 +55,15 @@
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd"> </el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain> </el-button>-->
<el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
<el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
>导出
</el-button>
</el-button>
<el-button type="danger" icon="el-icon-bottom" @click="handleExportDetails" plain
>清单导出
</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift"
>指派备货信息</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -104,7 +106,7 @@
</template>
</tablecmt>
</el-row>
<el-row class='el-fy'>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
@ -381,16 +383,16 @@ export default {
sortable: true,
head: false,
},
// {
// prop: 'stockupUser',
// label: '',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'consignee',
label: '客户名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'stockupStatusName',
label: '备货状态',
@ -1043,7 +1045,7 @@ export default {
});
},
//
handleExportInfo() {
handleExportInfo() {
let row = {};
//
// query: {},
@ -1057,10 +1059,35 @@ export default {
} else {
row.ids = '';
}
row.typeService='1',//
$_CommercialMarket(row).then(res => {
(row.typeService = '1'), //
$_CommercialMarket(row).then(res => {
console.log(res.data);
downloadXls(res.data, '商配备货列表.xlsx');
});
},
/** 导出清单 */
handleExportDetails() {
let row = {};
//
// query: {},
if (this.query) {
for (let prop in this.query) {
row[prop] = this.query[prop];
}
}
if (!!this.ids) {
row.ids = this.ids;
} else {
row.ids = '';
}
if (row.ids === '') {
this.$message.warning('请选择备货任务!');
return;
}
console.log('row-------->', row);
$_CommercialDetail(row.ids).then(res => {
console.log(res.data);
downloadXls(res.data, '商配备货列表.xlsx');
downloadXls(res.data, '配备货列表.xlsx');
});
},
handleDelete() {
@ -1187,9 +1214,9 @@ export default {
height: 30px !important;
}
}
:deep(.el-form-item__label){
width:auto !important;
padding:0;
:deep(.el-form-item__label) {
width: auto !important;
padding: 0;
}
:deep(.avue-crud) {
display: flex;
@ -1207,6 +1234,6 @@ export default {
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
align-items: flex-end;
}
</style>

63
src/views/distribution/stockup/distributionStockupMarket.vue

@ -13,21 +13,21 @@
<el-form-item label="指派状态;1-未指派、2-已指派:">
<el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
</el-form-item>-->
<div class='el-input-so'>
<el-form-item label="备货时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
/>
</el-form-item>
<el-form-item style="margin-left: 24px;" label="客户名称">
<el-input v-model="query.consignee" placeholder="请输入客户名称" />
</el-form-item>
<div class="el-input-so">
<el-form-item label="备货时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
/>
</el-form-item>
<el-form-item style="margin-left: 24px" label="客户名称">
<el-input v-model="query.consignee" placeholder="请输入客户名称" />
</el-form-item>
</div>
<!-- 查询按钮 -->
<el-form-item>
@ -45,6 +45,9 @@
<el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
>导出
</el-button>
<el-button type="danger" icon="el-icon-bottom" @click="handleExportDetails" plain
>清单导出
</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift"
>指派备货信息</el-button
>
@ -934,6 +937,31 @@ export default {
downloadXls(res.data, '市配备货列表.xlsx');
});
},
/** 导出清单 */
handleExportDetails() {
let row = {};
//
// query: {},
if (this.query) {
for (let prop in this.query) {
row[prop] = this.query[prop];
}
}
if (!!this.ids) {
row.ids = this.ids;
} else {
row.ids = '';
}
if (row.ids === '') {
this.$message.warning('请选择备货任务!');
return;
}
console.log('row-------->', row);
$_CommercialDetail(row.ids).then(res => {
console.log(res.data);
downloadXls(res.data, '市配备货列表.xlsx');
});
},
searchReset() {
this.query = {};
this.stockupDate = [];
@ -1157,9 +1185,8 @@ export default {
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
align-items: flex-end;
}
.el-input-so{
.el-input-so {
}
</style>

10
src/views/distribution/stockup/distributionStockupSelf.vue

@ -370,6 +370,16 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'consignee',
label: '客户名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'stockupStatusName',
label: '备货状态',

29
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -1715,10 +1715,10 @@ const CheckBox = (scope, type: number) => {
const selectAll = val => {
console.log(val);
};
//
//
const TCselectAll = val => {
console.log(val, '弹窗全选框');
dataTmp.value=val
dataTmp.value = val;
};
//
const selectChange = (selection, row) => {
@ -1744,11 +1744,20 @@ const selectChange = (selection, row) => {
});
}
} else {
//
//
if(wrapLoading.value){
wrapTemp.value = selection
//
}else{
selection.forEach(item => {
item.checked = true; //
dataTmp.value.push(item);
});
}
}
};
@ -1776,9 +1785,17 @@ const submit = () => {
} else {
//
//
dataTmp.value.forEach(item => {
dataInfo.value.push(item);
});
if (wrapLoading.value) {
dataInfo.value[dataId.value].packageListInfo = wrapTemp.value; //
console.log(wrapTemp.value, '包件订单被缓存');
//
} else {
dataTmp.value.forEach(item => {
dataInfo.value.push(item);
console.log(dataTmp.value, '订单');
});
}
console.log('提交后的参数', dataInfo.value);
console.log('提交后的临时存储', dataTmp.value);

Loading…
Cancel
Save