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

修复自提bug，新增导出

pre-production
马远东 11 months ago
parent
4172c34771
commit
74bb2b1cb7
8 changed files with 1092 additions and 1019 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. 9
      src/api/distribution/distributionSignfor.js
  2. 1
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 5
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 1128
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 632
      src/views/distribution/inventory/distrilbutionBillLading.vue
  6. 326
      src/views/distribution/signfor/distributionSignforedt.vue
  7. 1
      src/views/distribution/signfor/distributionSignfortreat.vue
  8. 9
      src/views/distribution/turndelivery/deliveryDiscuss.vue

9
src/api/distribution/distributionSignfor.js
Unescape View File

@ -351,7 +351,16 @@ export const $_distributionSignforPackageList = data => {
responseType: 'blob', responseType: 'blob',
}); });
}; };
// 库存品导出(3-1)
export const $_distributionSignforDetailExcel = params => {
return request({
url: '/api/logpm-distribution/signfor/export-distributionSignforDetailExcel',
method: 'get',
params,
responseType: 'blob',
});
};
// 订单导出 // 订单导出
export const $_distributionSignforOrderList = data => { export const $_distributionSignforOrderList = data => {
return request({ return request({

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

@ -558,6 +558,7 @@
:max="9999999" :max="9999999"
:controls="false" :controls="false"
:value-on-clear="0" :value-on-clear="0"
:precision="2"
@change="Totalamount" @change="Totalamount"
/> />
</el-form-item> </el-form-item>

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

@ -214,7 +214,7 @@
label="调查经过" label="调查经过"
v-if="displaySettings.investigationPocess" v-if="displaySettings.investigationPocess"
> >
<el-input v-model="Indexform.investigationProcess" disabled /> <el-input :rows="2" type="textarea" v-model="Indexform.investigationProcess" disabled />
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -1728,7 +1728,8 @@ const ResultDetermination = () => {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
:deep(.el-form-item) { :deep(.el-form-item) {
width: 16%; width: 17%;
margin-right: 4px;
align-items: flex-start; align-items: flex-start;
.el-form-item__label { .el-form-item__label {
margin-left: 0; margin-left: 0;

1128
src/views/aftersales/aftersalesWorkOrderend.vue
View File

File diff suppressed because it is too large Load Diff

632
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -93,7 +93,6 @@
<el-form-item label-width="0" prop="certificateType"> <el-form-item label-width="0" prop="certificateType">
<el-tabs @tab-click="handleChlickTab" style="width: 100%"> <el-tabs @tab-click="handleChlickTab" style="width: 100%">
<el-tab-pane label="定制品"> <el-tab-pane label="定制品">
<div style="display: flex;justify-content: space-between;margin-bottom: 6px;"> <div style="display: flex;justify-content: space-between;margin-bottom: 6px;">
<el-button <el-button
@ -105,18 +104,18 @@
>新 增</el-button >新 增</el-button
> >
<div class="el_multifunctional"> <div class="el_multifunctional">
<el-input <el-input
v-model="multifunctional" v-model="multifunctional"
placeholder="请输入要搜索的值,多条件用英文逗号拼接" placeholder="请输入要搜索的值,多条件用英文逗号拼接"
clearable clearable
@clear="soclear" @clear="soclear"
/> />
<el-button type="primary" @click="SearchFu" <el-button type="primary" @click="SearchFu"
><el-icon><Plus /></el-icon>搜索</el-button ><el-icon><Plus /></el-icon>搜索</el-button
> >
</div> </div>
</div> </div>
<tablecmt <tablecmt
class="tablesc" class="tablesc"
:columnList="columnListedit" :columnList="columnListedit"
@ -128,7 +127,6 @@
@selectCheck="selectsc" @selectCheck="selectsc"
@selection="selectionChange" @selection="selectionChange"
:searchInput="multifunctional" :searchInput="multifunctional"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-button <el-button
@ -650,7 +648,7 @@ import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { getListStockList } from '@/api/distribution/distributionStockList'; import { getListStockList } from '@/api/distribution/distributionStockList';
import { getListOne ,$_getListOne} from '@/api/distribution/distributionStockArticle'; import { getListOne, $_getListOne } from '@/api/distribution/distributionStockArticle';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { detail } from '@/api/flow/flow'; import { detail } from '@/api/flow/flow';
import { nextTick, ref } from 'vue'; import { nextTick, ref } from 'vue';
@ -663,12 +661,12 @@ export default {
return { return {
PackageCheckList:[],//包件勾选的数据 PackageCheckList:[],//包件勾选的数据
tabletit: '', //记录当前点击的标题栏 tabletit: '', //记录当前点击的标题栏
multifunctional:'', //编辑订单搜索 multifunctional: '', //编辑订单搜索
dialogImg: false, dialogImg: false,
Imgurl: undefined, Imgurl: undefined,
Selfpickuploading: false, //页面加载 Selfpickuploading: false, //页面加载
mydata:{},//仓库信息 mydata: {}, //仓库信息
packageRow:{},//当前选择的包件 packageRow: {}, //当前选择的包件
OrdercolumnList: [ OrdercolumnList: [
{ {
prop: 'serviceNumber', prop: 'serviceNumber',
@ -688,6 +686,7 @@ export default {
dialogFormZeroOrderVisible: false, // 零担订单弹出层 dialogFormZeroOrderVisible: false, // 零担订单弹出层
// 选择包件弹出层 // 选择包件弹出层
dialogChooseOrderVisible: false, dialogChooseOrderVisible: false,
CheckId:[],//需要勾选ID
height: 0, height: 0,
// 弹框标题 // 弹框标题
title: '', title: '',
@ -1903,7 +1902,7 @@ export default {
mounted() { mounted() {
console.log('123 :>> ', 123); console.log('123 :>> ', 123);
this.setTableHeight(); this.setTableHeight();
this.mydata= JSON.parse(localStorage.getItem('my_data')) this.mydata = JSON.parse(localStorage.getItem('my_data'));
this.init(); this.init();
if (this.$route.query.type == '2') { if (this.$route.query.type == '2') {
@ -2044,7 +2043,7 @@ export default {
} }
this.pageOrder.currentPage = 1; this.pageOrder.currentPage = 1;
this.onLoadOrder(this.pageOrder, this.pageOrder); this.onLoadOrder(this.pageOrder, this.pageOrder);
}, },
inputsc(index, row) { inputsc(index, row) {
this.query[row.prop] = index; this.query[row.prop] = index;
this.pageOrder.currentPage = 1; this.pageOrder.currentPage = 1;
@ -2060,7 +2059,7 @@ export default {
const _type = this.$route.query.type; const _type = this.$route.query.type;
// 编辑状态 // 编辑状态
if (Number(_type) === 2) { if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow); this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose(); } else this.onLoadOrderChoose();
}, },
orderSelectSc(index, row) { orderSelectSc(index, row) {
@ -2073,56 +2072,59 @@ export default {
console.log(this.order.selectList,'当前勾选'); console.log(this.order.selectList,'当前勾选');
}, },
scrollToElementWithinTableRow(partialIdString) { scrollToElementWithinTableRow(partialIdString) {
// 清空之前的样式 // 清空之前的样式
const tableRows = document.querySelectorAll('tr'); const tableRows = document.querySelectorAll('tr');
tableRows.forEach(function(row) { tableRows.forEach(function (row) {
const cells = row.querySelectorAll('[id]'); const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) { cells.forEach(function (cell) {
cell.style.backgroundColor = ''; // 移除背景颜色 cell.style.backgroundColor = ''; // 移除背景颜色
cell.style.color = ''; // 移除文字颜色 cell.style.color = ''; // 移除文字颜色
}); });
}); });
// 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格 // 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格
const partialIds = partialIdString.replace(/，/g, ',').split(',').map(id => id.trim()); const partialIds = partialIdString
.replace(/，/g, ',')
.split(',')
.map(id => id.trim());
// 逐行检查是否含有所有partialIds // 逐行检查是否含有所有partialIds
for (let row of tableRows) { for (let row of tableRows) {
let allIdsFound = partialIds.every(partialId => { let allIdsFound = partialIds.every(partialId => {
return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId)); return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
}); });
if (allIdsFound) { if (allIdsFound) {
// 行包含所有partialIds, 则高亮显示并滚动到该行 // 行包含所有partialIds, 则高亮显示并滚动到该行
const cells = row.querySelectorAll('[id]'); const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) { cells.forEach(function (cell) {
cell.style.backgroundColor = '#ff0000'; cell.style.backgroundColor = '#ff0000';
cell.style.color = '#fff'; cell.style.color = '#fff';
}); });
// 滚动到视图中央 // 滚动到视图中央
row.scrollIntoView({ behavior: 'smooth', block: 'center' }); row.scrollIntoView({ behavior: 'smooth', block: 'center' });
break; break;
} }
} }
}, },
// 编辑多功能搜索 // 编辑多功能搜索
SearchFu(){ SearchFu() {
console.log(this.multifunctional, '搜索的参数值'); console.log(this.multifunctional, '搜索的参数值');
if (this.multifunctional) { if (this.multifunctional) {
this.scrollToElementWithinTableRow(this.multifunctional); this.scrollToElementWithinTableRow(this.multifunctional);
} else { } else {
document.querySelectorAll('[id]').forEach(function (el) { document.querySelectorAll('[id]').forEach(function (el) {
el.style.backgroundColor = ''; // 移除背景颜色 el.style.backgroundColor = ''; // 移除背景颜色
el.style.color = ''; // 移除文字颜色 el.style.color = ''; // 移除文字颜色
}); });
} }
return; return;
// console.log(dataInfo.value, '搜索结果'); // console.log(dataInfo.value, '搜索结果');
}, },
soclear (){ soclear() {
this.SearchFu(); this.SearchFu();
}, },
orderTimesc(index, row) { orderTimesc(index, row) {
if (!!index) { if (!!index) {
@ -2135,7 +2137,7 @@ export default {
const _type = this.$route.query.type; const _type = this.$route.query.type;
// 编辑状态 // 编辑状态
if (Number(_type) === 2) { if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow); this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose(); } else this.onLoadOrderChoose();
}, },
@ -2144,21 +2146,21 @@ export default {
this.orderAdd = true; this.orderAdd = true;
getDetail(this.$route.query.id).then(res => { getDetail(this.$route.query.id).then(res => {
let s = res.data.data; let s = res.data.data;
console.log(res,'res'); console.log(res, 'res');
this.form = s; this.form = s;
let f = []; let f = [];
if(s.chargeList){ if (s.chargeList) {
s.chargeList.forEach(c => { s.chargeList.forEach(c => {
let a = this.clientType.find(i => c.cost == i.dictKey); let a = this.clientType.find(i => c.cost == i.dictKey);
if (!!c.cost && c.cost != '-1') { if (!!c.cost && c.cost != '-1') {
f.push(c.cost); f.push(c.cost);
} }
if (!!a) { if (!!a) {
a.remark = c.money.substring(0, c.money.lastIndexOf('.')); a.remark = c.money.substring(0, c.money.lastIndexOf('.'));
this.costList[c.cost] = a.remark; this.costList[c.cost] = a.remark;
} }
}); });
} }
this.form.freightMark = f; this.form.freightMark = f;
@ -2226,15 +2228,14 @@ export default {
}, },
//订单选择确定 //订单选择确定
callFordeliveryOrder() { callFordeliveryOrder() {
console.log(this.selectionList, 'this.selectionList');
let scID = this.selectionList[0].mallId; //获取第一个商场DI用于匹配后面的是否选择的一样
let mallIdState = this.selectionList.find(res => res.mallId != scID);
if (mallIdState) {
this.$message.warning('请选择同一商场');
return;
}
console.log(this.selectionList,'this.selectionList');
let scID= this.selectionList[0].mallId;//获取第一个商场DI用于匹配后面的是否选择的一样
let mallIdState=this.selectionList.find(res=>res.mallId !=scID)
if(mallIdState){
this.$message.warning('请选择同一商场');
return
}
console.log('111 :>> ', 111); console.log('111 :>> ', 111);
let st = false; let st = false;
let sts = false; let sts = false;
@ -2279,10 +2280,10 @@ export default {
let isa = false; let isa = false;
this.selectionList.some(i => { this.selectionList.some(i => {
let a = this.dataList.filter(ele => ele.id == i.id).length >= 1; let a = this.dataList.filter(ele => ele.id == i.id).length >= 1;
if(!this.$route.query.id){ if (!this.$route.query.id) {
i.reservationNum=i.handQuantity i.reservationNum = i.handQuantity;
} }
if (!a) { if (!a) {
this.dataList.push(i); this.dataList.push(i);
} }
@ -2298,16 +2299,16 @@ export default {
this.$message.warning('至少选择一条数据！'); this.$message.warning('至少选择一条数据！');
return; return;
} }
console.log(this.selectionList,'22'); console.log(this.selectionList, '22');
if( this.dataList && this.dataList.length){ if (this.dataList && this.dataList.length) {
if( this.dataList[0].mallId !=this.selectionList[0].marketId){ if (this.dataList[0].mallId != this.selectionList[0].marketId) {
this.$message.warning('请选择和定制品一样的商场！'); this.$message.warning('请选择和定制品一样的商场！');
return; return;
} }
} }
let scID= this.selectionList[0].marketId let scID = this.selectionList[0].marketId;
if(this.selectionList.find(res=>res.marketId !=scID)){ if (this.selectionList.find(res => res.marketId != scID)) {
this.$message.warning('请选同一商场！'); this.$message.warning('请选同一商场！');
return; return;
} }
@ -2347,7 +2348,7 @@ export default {
this.order.query={} this.order.query={}
this.order.currentPage=1 this.order.currentPage=1
console.log('row :>> ', row); console.log('row :>> ', row);
this.packageRow=row this.packageRow = row;
// 页面类型 // 页面类型
const _type = this.$route.query.type; const _type = this.$route.query.type;
this.orderChooseId = row.id; this.orderChooseId = row.id;
@ -2355,7 +2356,7 @@ export default {
if (Number(_type) === 2) { if (Number(_type) === 2) {
await this.onLoadEditChoose({}, row); await this.onLoadEditChoose({}, row);
} else await this.onLoadOrderChoose(); } else await this.onLoadOrderChoose();
this.dialogChooseOrderVisible = true;
}, },
// 每页数量改变 // 每页数量改变
sizeChangeOrderChoose(size) { sizeChangeOrderChoose(size) {
@ -2364,7 +2365,7 @@ export default {
const _type = this.$route.query.type; const _type = this.$route.query.type;
// 编辑状态 // 编辑状态
if (Number(_type) === 2) { if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow); this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose(); } else this.onLoadOrderChoose();
}, },
// 页码改变 // 页码改变
@ -2387,7 +2388,7 @@ export default {
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id)); this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
// 编辑状态 // 编辑状态
if (Number(_type) === 2) { if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow); this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose(); } else this.onLoadOrderChoose();
}, },
// 请求包件数据 -- 新增 // 请求包件数据 -- 新增
@ -2449,6 +2450,7 @@ console.log(_check,'筛选出来的参数');
console.log(res,'必须参数ID'); console.log(res,'必须参数ID');
if(res.data.code==200){ if(res.data.code==200){
_dataList=res.data.data _dataList=res.data.data
this.CheckId=res.data.data;//需要勾选的ID
} }
}) })
@ -2493,7 +2495,7 @@ console.log(_check,'筛选出来的参数');
}).catch((error)=>{ }).catch((error)=>{
console.log(error,'error'); console.log(error,'error');
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
}); });
return null; return null;
} }
@ -2515,7 +2517,7 @@ console.log(_check,'筛选出来的参数');
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id)); this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
//全部勾选的数据 //全部勾选的数据
let uncheckedIds = this.Unchecked.map(item => item.id); let uncheckedIds = this.Unchecked.map(item => item.id);
// 过滤掉 _aa 中未勾选的项 // 过滤掉 中未勾选的项
this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id)); this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
console.log(this.PackageCheckList,'准备提交的参数'); console.log(this.PackageCheckList,'准备提交的参数');
console.log('111 :>> ', 111); console.log('111 :>> ', 111);
@ -2523,29 +2525,61 @@ console.log(_check,'筛选出来的参数');
return this.$message({ type: 'warning', message: '最少选择一项数据' }); return this.$message({ type: 'warning', message: '最少选择一项数据' });
} }
if(this.order.selectList){ if(this.order.selectList){
this.packageRow.reservationNum=this.PackageCheckList.length this.packageRow.reservationNum=this.order.selectList.length
} }
// billPackageEntityList // billPackageEntityList
console.log('this.order.dataList :>> ', this.dataList); console.log('最外层表格', this.dataList);
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = // this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = this.order.selectList.map(val => {
this.PackageCheckList.map(val => { // console.log('val :>> ', val);
console.log('val :>> ', val); // return {
// parceListId: val.id,
// stockArticleId: val.stockArticleId,
// packetBarCode: val.orderPackageCode,
// };
// });
console.log(this.CheckId,'原本数据');
console.log(this.order.selectList,'当前勾选的数据');
console.log(this.order.orderDetails,'全部数据');
// 找出新增数据对象
let addedData = this.order.selectList.filter(item => !this.CheckId.includes(item.id));
let addedObjects = this.order.orderDetails.filter(item => addedData.map(data => data.id).includes(item.id));
if(addedObjects && addedObjects.length){
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList=[]
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = addedObjects.map(item => {
return {
parceListId: item.id,
stockArticleId: item.stockArticleId,
packetBarCode: item.orderPackageCode,
};
});
}
// 找出删除数据对象
let deletedData = this.CheckId.filter(id => !this.order.selectList.find(item => item.id === id));
let deletedObjects = this.order.orderDetails.filter(item => deletedData.includes(item.id));
if(deletedObjects && deletedObjects.length){
this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList=[]
this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList = deletedObjects.map(item => {
return { return {
parceListId: val.id, parceListId: item.id,
stockArticleId: val.stockArticleId, stockArticleId: item.stockArticleId,
packetBarCode: val.orderPackageCode, packetBarCode: item.orderPackageCode,
}; };
}); });
}
console.log('新增的数据对象:', addedObjects);
console.log('删除的数据对象:', deletedObjects);
this.dialogChooseOrderVisible = false; this.dialogChooseOrderVisible = false;
console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的');
},
ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) {
return false;
} else {
return true;
}
}, },
ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) {
return false;
} else {
return true;
}
},
// 数量校验 // 数量校验
handleNumberRange(e, row) { handleNumberRange(e, row) {
console.log(e, 'ee====='); console.log(e, 'ee=====');
@ -2701,12 +2735,11 @@ if (val.orderPackageStatus == 70) {
} }
} }
}, },
lastpage(){ lastpage() {
this.$router.push('/distribution/inventory/distrilbutionBillLadingList') this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
}, },
// 最后提交 // 最后提交
async handleSubmit() { async handleSubmit() {
// console.log(this.dataList,'this.dataList'); // console.log(this.dataList,'this.dataList');
// if (this.$route.query.type !== '2') { // if (this.$route.query.type !== '2') {
@ -2735,58 +2768,49 @@ if (val.orderPackageStatus == 70) {
// // if () // // if ()
// } // }
this.$refs.form.validate(async valid => { this.$refs.form.validate(async valid => {
if (valid) { if (valid) {
// if(!this.dataList.length){
// if(!this.dataList.length){ // return ElMessage({
// return ElMessage({ // message: '请选择定制品',
// message: '请选择定制品', // type: 'warning',
// type: 'warning', // });
// }); // }
// } console.log(this.data, '11');
console.log(this.data,'11');
if( !this.data.every(res=>res.inventoryQuantity)){
return ElMessage({
message: '请移除库存品预约数量为0的订单',
type: 'warning',
});
}
let zeroOrderList=null
if(this.dataList.length){
let resState=this.dataList.find(res=>!res.reservationNum)
console.log(resState,'123');
if(resState){
return ElMessage({
message: `单自编号为${resState.orderCode}的计划数量为0请移除或者重新录入预约数量`,
type: 'warning',
plain: true,
})
}
zeroOrderList = this.dataList.filter(val => val.isZero === '1'); if (!this.data.every(res => res.inventoryQuantity)) {
if (this.data.length) {
const allQuantitiesAreFalsy = this.data.every(item => item.inventoryQuantity);
console.log(allQuantitiesAreFalsy, 'allQuantitiesAreFalsy');
if (!allQuantitiesAreFalsy) {
return ElMessage({ return ElMessage({
message: '请移除添加数量为0的订单', message: '请移除库存品预约数量为0的订单',
type: 'warning', type: 'warning',
}); });
} }
}
}
let zeroOrderList = null;
if (this.dataList.length) {
let resState = this.dataList.find(res => !res.reservationNum);
console.log(resState, '123');
if (resState) {
return ElMessage({
message: `单自编号为${resState.orderCode}的计划数量为0请移除或者重新录入预约数量`,
type: 'warning',
plain: true,
});
}
zeroOrderList = this.dataList.filter(val => val.isZero === '1');
if (this.data.length) {
const allQuantitiesAreFalsy = this.data.every(item => item.inventoryQuantity);
console.log(allQuantitiesAreFalsy, 'allQuantitiesAreFalsy');
if (!allQuantitiesAreFalsy) {
return ElMessage({
message: '请移除添加数量为0的订单',
type: 'warning',
});
}
}
}
if (!this.form.id) { if (!this.form.id) {
// if (this.fileListSell.length === 0) { // if (this.fileListSell.length === 0) {
// this.$message.warning('请上传提货证件！！！'); // this.$message.warning('请上传提货证件！！！');
// return; // return;
@ -2853,24 +2877,27 @@ if (val.orderPackageStatus == 70) {
this.form.stockArticleId != null this.form.stockArticleId != null
? this.form.stockArticleId + a.join(',') ? this.form.stockArticleId + a.join(',')
: a.join(','); : a.join(',');
} }
// ParcelLisList // ParcelLisList
const submitFormData = this.form; const submitFormData = this.form;
console.log(this.form,'this.form'); console.log(this.form, 'this.form');
console.log(submitFormData,'this.sub'); console.log(submitFormData, 'this.sub');
// 当有零担数据时 // 当有零担数据时
if (zeroOrderList && zeroOrderList.length !== 0) { if (zeroOrderList && zeroOrderList.length !== 0) {
console.log(zeroOrderList,'zeroOrderList222'); console.log(zeroOrderList, 'zeroOrderList222');
// console.log(1); // console.log(1);
submitFormData.parcelLisList = []; submitFormData.parcelLisList = [];
submitFormData.zeroType = '2'; submitFormData.zeroType = '2';
zeroOrderList.forEach(valE => { zeroOrderList.forEach(valE => {
console.log(valE,'valE==>'); console.log(valE, 'valE==>');
if(valE.ParcelLisList){ if (valE.ParcelLisList) {
if(valE.ParcelLisList.length){ if (valE.ParcelLisList.length) {
submitFormData.parcelLisList = [...submitFormData.parcelLisList, ...valE.ParcelLisList]; submitFormData.parcelLisList = [
...submitFormData.parcelLisList,
...valE.ParcelLisList,
];
}
} }
}
}); });
// submitFormData.parcelLisList.forEach(val => (val.quantity = val.tiQuantity)); // submitFormData.parcelLisList.forEach(val => (val.quantity = val.tiQuantity));
} else { } else {
@ -2886,9 +2913,9 @@ if (val.orderPackageStatus == 70) {
}); });
submitFormData.billPackageEntityList = _billPackageEntityList; submitFormData.billPackageEntityList = _billPackageEntityList;
// SM24010411 // SM24010411
console.log(submitFormData,'submitFormData'); console.log(submitFormData, 'submitFormData');
this.Selfpickuploading = true; //开启加载效果 this.Selfpickuploading = true; //开启加载效果
add(submitFormData) add(submitFormData)
.then(res => { .then(res => {
this.Selfpickuploading = false; //开启加载效果 this.Selfpickuploading = false; //开启加载效果
@ -2902,6 +2929,10 @@ if (val.orderPackageStatus == 70) {
this.Selfpickuploading = false; //关闭加载效果 this.Selfpickuploading = false; //关闭加载效果
console.log(this.Selfpickuploading, '当前状态'); console.log(this.Selfpickuploading, '当前状态');
this.$store.commit('DEL_TAG_CURRENT'); this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.push('/distribution/inventory/distrilbutionBillLadingList'); this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
}) })
.catch(res => { .catch(res => {
@ -2931,7 +2962,7 @@ if (val.orderPackageStatus == 70) {
if (_flag) return this.$message.warning('请填写正确的费用信息！！！'); if (_flag) return this.$message.warning('请填写正确的费用信息！！！');
} }
this.form.stockDTOList = this.data; this.form.stockDTOList = this.data;
let o = []; let o = [];
const fileListMapping = { const fileListMapping = {
@ -2970,7 +3001,7 @@ if (val.orderPackageStatus == 70) {
up.deliveryDocument = this.form.deliveryDocument; up.deliveryDocument = this.form.deliveryDocument;
up.certificateType = this.form.certificateType; up.certificateType = this.form.certificateType;
up.totalCost = this.form.totalCost; up.totalCost = this.form.totalCost;
up.remark=this.form.remark; up.remark = this.form.remark;
up.mark = mark; up.mark = mark;
up.stockArticleList = this.dataList; up.stockArticleList = this.dataList;
// 当有零担数据时 // 当有零担数据时
@ -2989,37 +3020,58 @@ if (val.orderPackageStatus == 70) {
} else { } else {
up.zeroType = '1'; up.zeroType = '1';
} }
// 新增列表 // 新增列表
let _billPackageEntityList = []; let _billPackageEntityList = [];
// 删除列表 // 删除列表
let _unBillPackageEntityList = []; let _unBillPackageEntityList = [];
// submitFormData.billPackageEntityList // submitFormData.billPackageEntityList
this.dataList.forEach(val => { this.dataList.forEach(val => {
if (val.originalIdList) { console.log(val,'value');
val.billPackageEntityList.forEach(item => { if(val.billPackageEntityList && val.billPackageEntityList.length){
// 新增 val.billPackageEntityList.forEach(item => {
if (!val.originalIdList.includes(item.parceListId)) { // 新增
_billPackageEntityList.push(item); if (!val.originalIdList.includes(item.parceListId)) {
} _billPackageEntityList.push(item);
}); }
// 删除 });
val.originalList.forEach(item => { }
const _flag = val.billPackageEntityList.findIndex(
value => value.parceListId === item.id
); // 删除
if (_flag === -1) { if(val.unBillPackageEntityList && val.unBillPackageEntityList.length){
_unBillPackageEntityList.push({ val.unBillPackageEntityList.forEach(item=>{
parceListId: item.id, console.log(item,'item===>');
stockArticleId: item.stockArticleId, _unBillPackageEntityList.push({
packetBarCode: item.orderPackageCode, parceListId: item.parceListId,
}); stockArticleId: item.stockArticleId,
} packetBarCode: item.packetBarCode,
}); });
} })
}); }
up.billPackageEntityList = _billPackageEntityList;
up.unBillPackageEntityList = _unBillPackageEntityList; // if(val.originalList && val.originalList.length){
this.Selfpickuploading = true; //开启加载效果 // val.originalList.forEach(item => {
// const _flag = val.billPackageEntityList.findIndex(
// value => value.parceListId === item.id
// );
// if (_flag === -1) {
// _unBillPackageEntityList.push({
// parceListId: item.id,
// stockArticleId: item.stockArticleId,
// packetBarCode: item.orderPackageCode,
// });
// }
// });
// }
});
console.log(_unBillPackageEntityList,'删除的');
up.billPackageEntityList = _billPackageEntityList;
up.unBillPackageEntityList = _unBillPackageEntityList;
this.Selfpickuploading = true; //开启加载效果
console.log(up,'要提交的数据');
update(up) update(up)
.then(() => { .then(() => {
this.Selfpickuploading = false; //开启加载效果 this.Selfpickuploading = false; //开启加载效果
@ -3030,6 +3082,10 @@ if (val.orderPackageStatus == 70) {
this.PackageCheckList=[] this.PackageCheckList=[]
this.Selfpickuploading = false; //关闭加载效果 this.Selfpickuploading = false; //关闭加载效果
this.$store.commit('DEL_TAG_CURRENT'); this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.push('/distribution/inventory/distrilbutionBillLadingList'); this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
}) })
.catch(res => { .catch(res => {
@ -3094,16 +3150,15 @@ if (val.orderPackageStatus == 70) {
params.genre = 1; params.genre = 1;
params.typeService = 3; params.typeService = 3;
params.isAll = 0; params.isAll = 0;
if(this.data && this.data.length){ if (this.data && this.data.length) {
params.mallId =this.data[0].marketId params.mallId = this.data[0].marketId;
console.log(params,'params'); console.log(params, 'params');
} }
$_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder)).then( $_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder))
res => { .then(res => {
console.log(res,'res===>'); console.log(res, 'res===>');
if(res.data.code !=200 || !res.data.data){ if (res.data.code != 200 || !res.data.data) {
return;
return
} }
const data = res.data.data; const data = res.data.data;
this.pageOrder.total = data.total || 0; this.pageOrder.total = data.total || 0;
@ -3138,27 +3193,26 @@ if (val.orderPackageStatus == 70) {
}); });
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
} })
).catch(res=>{ .catch(res => {})
.finally(() => {
}).finally(()=>{ this.loading = false;
this.loading = false; });
});
}, },
//库存品 //库存品
handleAddView(row) { handleAddView(row) {
// if (this.dataList.length === 0) { // if (this.dataList.length === 0) {
// return this.$message.warning('请选择最少一条定制品'); // return this.$message.warning('请选择最少一条定制品');
// } // }
if(!JSON.parse(localStorage.getItem('my_data'))){ if (!JSON.parse(localStorage.getItem('my_data'))) {
ElMessage({ ElMessage({
message: '请选择仓库!', message: '请选择仓库!',
type: 'warning', type: 'warning',
}) });
return return;
} }
console.log(this.dataList,'dataList'); console.log(this.dataList, 'dataList');
this.selectionList = []; this.selectionList = [];
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.onLoadList(); this.onLoadList();
@ -3237,23 +3291,22 @@ if (val.orderPackageStatus == 70) {
// 定制品新增 -- 页码改变 // 定制品新增 -- 页码改变
currentChangeOrder(currentPage) { currentChangeOrder(currentPage) {
this.pageOrder.currentPage = currentPage; this.pageOrder.currentPage = currentPage;
this.onLoadOrder(this.pageOrder,this.query); this.onLoadOrder(this.pageOrder, this.query);
}, },
sizeChangeOrder(pageSize) { sizeChangeOrder(pageSize) {
this.pageOrder.pageSize = pageSize; this.pageOrder.pageSize = pageSize;
this.onLoadOrder(this.pageOrder,this.query); this.onLoadOrder(this.pageOrder, this.query);
}, },
currentChange(currentPage) { currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
this.onLoad(this.page,this.query); this.onLoad(this.page, this.query);
}, },
sizeChange(pageSize) { sizeChange(pageSize) {
this.page.pageSize = pageSize; this.page.pageSize = pageSize;
this.onLoad(this.page,this.query); this.onLoad(this.page, this.query);
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
params.ids = this.$route.query.id; params.ids = this.$route.query.id;
this.orderAdd = false; this.orderAdd = false;
@ -3264,9 +3317,6 @@ if (val.orderPackageStatus == 70) {
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
}); });
}, },
/** /**
* 创建自提 * 创建自提
@ -3279,69 +3329,26 @@ if (val.orderPackageStatus == 70) {
//库存品 //库存品
onLoadList(dataso) { onLoadList(dataso) {
let data = { let data = {
current: this.pageStock.currentPage, current: this.pageStock.currentPage,
size: this.pageStock.pageSize, size: this.pageStock.pageSize,
warehouseId:this.mydata.id, warehouseId: this.mydata.id,
...dataso, ...dataso,
}; };
if(this.dataList && this.dataList.length){ if (this.dataList && this.dataList.length) {
data.marketId= this.dataList[0].mallId data.marketId = this.dataList[0].mallId;
}
console.log(data, '处理好的值');
getListStockList(data).then(res => {
const dataOwn = res.data.data;
this.pageStock.total = dataOwn.total;
this.dataOwn = dataOwn.records;
this.dataOwn.forEach(i => {
i.available = i.quantityStock - i.quantityOccupied;
});
});
this.loading = false;
this.selectionClear();
return
console.log('111 :>> ', 111);
this.loading = true;
let a = {};
if (this.$route.query.type == '1') {
a = this.dataList[0];
} else if (this.$route.query.type === '2') {
a = this.dataList[0];
} else if (this.$route.query.type == '3') {
a = this.dataList[0];
} }
console.log('a :>> ', a); console.log(data, '处理好的值');
console.log(' this.dataOrder :>> ', this.dataOrder); getListStockList(data).then(res => {
// let a = this.dataList[0]; const dataOwn = res.data.data;
if (!!a.mallId) { this.pageStock.total = dataOwn.total;
// params.marketId = a.mallId; this.dataOwn = dataOwn.records;
// params.warehouseId = a.warehouseId; this.dataOwn.forEach(i => {
let data = { i.available = i.quantityStock - i.quantityOccupied;
current: this.pageStock.currentPage,
size: this.pageStock.pageSize,
//marketId: a.mallId,
// warehouseId: a.warehouseId,
...dataso,
};
console.log(data, '处理好的值');
// return
getListStockList(data).then(res => {
const dataOwn = res.data.data;
this.pageStock.total = dataOwn.total;
this.dataOwn = dataOwn.records;
this.dataOwn.forEach(i => {
i.available = i.quantityStock - i.quantityOccupied;
});
this.loading = false;
this.selectionClear();
});
} else {
this.$message({
type: 'warning',
message: '无法获取商场信息',
}); });
this.loading = false; });
this.pageStock.total = 0; this.loading = false;
} this.selectionClear();
return;
}, },
//包件信息 //包件信息
onLoadOwn(page, params = {}) { onLoadOwn(page, params = {}) {
@ -3388,7 +3395,7 @@ if (val.orderPackageStatus == 70) {
// firsts: val.firsts, // firsts: val.firsts,
// }; // };
const zeroOrder = val; const zeroOrder = val;
// 记录传入行的id // 记录传入行的id
zeroOrder.stockArticleId = val.stockArticleId; zeroOrder.stockArticleId = val.stockArticleId;
// 物料最大限数 // 物料最大限数
zeroOrder.maxNum = val.libraryQuantity - val.deliveryQuantity; zeroOrder.maxNum = val.libraryQuantity - val.deliveryQuantity;
@ -3397,7 +3404,7 @@ if (val.orderPackageStatus == 70) {
// zeroOrder.tiQuantity =zeroOrder.tiQuantity; // zeroOrder.tiQuantity =zeroOrder.tiQuantity;
// console.log('a=>>>>'); // console.log('a=>>>>');
// } // }
// else if (val.deliveryQuantity && Number(this.$route.query.type) === 2) { // else if (val.deliveryQuantity && Number(this.$route.query.type) === 2) {
// zeroOrder.tiQuantity = val.tiQuantity; // zeroOrder.tiQuantity = val.tiQuantity;
// console.log('b=>>>>'); // console.log('b=>>>>');
@ -3410,22 +3417,21 @@ if (val.orderPackageStatus == 70) {
}, },
// 修改零担零担信息 // 修改零担零担信息
handleRowZeroOrder() { handleRowZeroOrder() {
console.log(this.zeroOrderFormList,'12121212'); console.log(this.zeroOrderFormList, '12121212');
let sum =0 let sum = 0;
this.zeroOrderFormList.forEach(res=>{ this.zeroOrderFormList.forEach(res => {
sum+= res.tiQuantity sum += res.tiQuantity;
}) });
console.log(sum,'总和'); console.log(sum, '总和');
this.dataList.find(res=>res.id==this.zeroOrderFormList[0].stockArticleId).reservationNum=sum this.dataList.find(res => res.id == this.zeroOrderFormList[0].stockArticleId).reservationNum =
sum;
// 将修改的零担信息存入dataList中 // 将修改的零担信息存入dataList中
this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList = this.zeroOrderFormList; this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList =
this.zeroOrderFormList;
// 关闭零担蒙层弹框 // 关闭零担蒙层弹框
this.dialogFormZeroOrderVisible = false; this.dialogFormZeroOrderVisible = false;
}, },
/** /**
* 显示维护在库零担数量 * 显示维护在库零担数量

326
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -18,28 +18,21 @@
<el-icon><List /></el-icon> <el-icon><List /></el-icon>
<span class="title-name">预约单号:</span> <span class="title-name">预约单号:</span>
<el-tooltip <el-tooltip
:content="form.reservationCode ? form.reservationCode : '暂无商场名称'" :content="form.reservationCode ? form.reservationCode : '暂无预约单号'"
placement="top" placement="top"
> >
<el-input v-model="form.reservationCode" disabled placeholder="预约单号" /> <el-input v-model="form.reservationCode" disabled placeholder="暂无预约单号" />
</el-tooltip> </el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><School /></el-icon> <el-icon><School /></el-icon>
<span class="title-name">商场名称:</span> <span class="title-name">商场名称:</span>
<el-tooltip :content="form.mallName ? form.mallName : '暂无商场名称'" placement="top"> <el-input v-model="form.mallName" disabled placeholder="暂无商场名称" />
<el-input v-model="form.mallName" disabled placeholder="商场名称" />
</el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Calendar /></el-icon> <el-icon><Calendar /></el-icon>
<span class="title-name"> 预约时间:</span> <span class="title-name"> 预约时间:</span>
<el-tooltip <el-input v-model="form.reservationDate" disabled placeholder="暂无预约时间" />
:content="form.reservationDate ? form.reservationDate : '暂无预约时间'"
placement="top"
>
<el-input v-model="form.reservationDate" disabled placeholder="预约时间" />
</el-tooltip>
</div> </div>
</div> </div>
@ -49,50 +42,32 @@
<div class="el-txt"> <div class="el-txt">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name">配送车次:</span> <span class="title-name">配送车次:</span>
<el-tooltip :content="form.trainNumber ? form.trainNumber : '暂无司机姓名'" placement="top"> <el-input v-model="form.trainNumber" disabled placeholder="暂无配送车次" />
<el-input v-model="form.trainNumber" disabled placeholder="配送车次" />
</el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
<span class="title-name">司机姓名:</span> <span class="title-name">司机姓名:</span>
<el-tooltip :content="form.driverName ? form.driverName : '暂无司机姓名'" placement="top"> <el-input v-model="form.driverName" disabled placeholder="暂无司机姓名" />
<el-input v-model="form.driverName" disabled placeholder="司机姓名" />
</el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Postcard /></el-icon> <el-icon><Postcard /></el-icon>
<span class="title-name"> 车辆牌照:</span> <span class="title-name"> 车辆牌照:</span>
<el-tooltip :content="form.vehicleName ? form.vehicleName : '暂无车辆牌照'" placement="top"> <el-input v-model="form.vehicleName" disabled placeholder="暂无车辆牌照" />
<el-input v-model="form.vehicleName" disabled placeholder="车辆牌照" />
</el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 装车班组:</span> <span class="title-name"> 装车班组:</span>
<el-tooltip <el-input v-model="form.loadingTeamName" disabled placeholder="暂无装车班组" />
:content="form.loadingTeamName ? form.loadingTeamName : '暂无装车班组'"
placement="top"
>
<el-input v-model="form.loadingTeamName" disabled placeholder="装车班组" />
</el-tooltip>
</div> </div>
<div class="el-txt" style="margin-top: 20px"> <div class="el-txt" style="margin-top: 20px">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 卸车班组:</span> <span class="title-name"> 卸车班组:</span>
<el-tooltip <el-input v-model="form.unLoadingTeamName" disabled placeholder="暂无卸车班组" />
:content="form.unLoadingTeamName ? form.unLoadingTeamName : '暂无卸车班组'"
placement="top"
>
<el-input v-model="form.unLoadingTeamName" disabled placeholder="卸车班组" />
</el-tooltip>
</div> </div>
<div class="el-txt" style="margin-top: 20px"> <div class="el-txt" style="margin-top: 20px">
<el-icon><Stopwatch /></el-icon> <el-icon><Stopwatch /></el-icon>
<span class="title-name"> 实际配送时间:</span> <span class="title-name"> 实际配送时间:</span>
<el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" /> <el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" />
</div> </div>
</div> </div>
@ -102,9 +77,7 @@
<div class="el-txt"> <div class="el-txt">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
<span class="title-name">收货人姓名:</span> <span class="title-name">收货人姓名:</span>
<el-tooltip :content="form.consignee ? form.consignee : '暂无收货人姓名'" placement="top"> <el-input v-model="form.consignee" disabled placeholder="暂无收货人姓名" />
<el-input v-model="form.consignee" disabled placeholder="收货人姓名" />
</el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
@ -113,7 +86,7 @@
:content="form.deliveryPhone ? form.deliveryPhone : '暂无收货人号码'" :content="form.deliveryPhone ? form.deliveryPhone : '暂无收货人号码'"
placement="top" placement="top"
> >
<el-input v-model="form.deliveryPhone" disabled placeholder="收货人号码" /> <el-input v-model="form.deliveryPhone" disabled placeholder="暂无收货人号码" />
</el-tooltip> </el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
@ -123,22 +96,18 @@
:content="form.deliveryAddress ? form.deliveryAddress : '暂无收货人地址'" :content="form.deliveryAddress ? form.deliveryAddress : '暂无收货人地址'"
placement="top" placement="top"
> >
<el-input v-model="form.deliveryAddress" disabled placeholder="收货人地址" /> <el-input v-model="form.deliveryAddress" disabled placeholder="暂无收货人地址" />
</el-tooltip> </el-tooltip>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 是否加急:</span> <span class="title-name"> 是否加急:</span>
<el-tooltip :content="form.isUrgent ? form.isUrgent : '暂无加急信息'" placement="top">
<el-input v-model="form.isUrgent" disabled placeholder="是否加急" /> <el-input v-model="form.isUrgent" disabled placeholder="是否加急" />
</el-tooltip>
</div> </div>
<div class="el-txt notes"> <div class="el-txt notes">
<el-icon><Edit /></el-icon> <el-icon><Edit /></el-icon>
<span class="title-name title-notes"> 客户备注:</span> <span class="title-name title-notes"> 客户备注:</span>
<el-tooltip :content="form.remarks ? form.remarks : '暂无备注信息'" placement="top"> <el-input v-model="form.remarks" disabled placeholder="暂无客户备注" />
<el-input v-model="form.remarks" disabled placeholder="客户备注" />
</el-tooltip>
</div> </div>
</div> </div>
<!-- 签收信息 --> <!-- 签收信息 -->
@ -155,17 +124,12 @@
<div class="el-txt el-positioning"> <div class="el-txt el-positioning">
<el-icon><LocationInformation /></el-icon> <el-icon><LocationInformation /></el-icon>
<span class="title-name">定位打卡:</span> <span class="title-name">定位打卡:</span>
<el-tooltip
:content="form.positioningAdr ? form.positioningAdr : '暂无定位打卡'"
placement="top"
>
<el-input <el-input
class="positioning" class="positioning"
v-model="form.positioningAdr" v-model="form.positioningAdr"
disabled disabled
placeholder="定位打卡位置" placeholder="暂无定位打卡"
/> />
</el-tooltip>
</div> </div>
<div class="el-sw"> <div class="el-sw">
<div class="el-box"> <div class="el-box">
@ -173,17 +137,13 @@
<el-icon><LocationInformation /></el-icon> <el-icon><LocationInformation /></el-icon>
<span class="title-name">文员备注:</span> <span class="title-name">文员备注:</span>
</div> </div>
<el-tooltip
:content="form.clerkSignRemarks ? form.clerkSignRemarks : '暂无文员备注'"
placement="top"
>
<el-input <el-input
class="positioning" class="positioning"
v-model="form.clerkSignRemarks" v-model="form.clerkSignRemarks"
disabled disabled
placeholder="文员备注" placeholder="暂无文员备注"
/> />
</el-tooltip>
</div> </div>
<div class="el-box"> <div class="el-box">
@ -191,86 +151,59 @@
<el-icon><LocationInformation /></el-icon> <el-icon><LocationInformation /></el-icon>
<span class="title-name">司机备注:</span> <span class="title-name">司机备注:</span>
</div> </div>
<el-tooltip
:content="form.driverRemarks ? form.driverRemarks : '暂无司机备注'"
placement="top"
>
<el-input <el-input
class="positioning" class="positioning"
v-model="form.driverRemarks" v-model="form.driverRemarks"
disabled disabled
placeholder="司机备注" placeholder="暂无司机备注"
/> />
</el-tooltip>
</div> </div>
</div> </div>
</div> </div>
<div class="Basic-information"> <div class="Basic-information">
<div class="el-txt"> <div class="el-txt">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
<span class="title-name">计划件数:</span> <span class="title-name">计划件数:</span>
<el-input v-model="pageRow.reservationNum" disabled placeholder="收货人姓名" /> <el-input v-model="pageRow.reservationNum" disabled placeholder="暂无计划件数"/>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
<span class="title-name">装车件数:</span> <span class="title-name">装车件数:</span>
<el-input v-model="pageRow.loadedNumber" disabled placeholder="收货人号码" /> <el-input v-model="pageRow.loadedNumber" disabled placeholder="暂无装车件数"/>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Postcard /></el-icon> <el-icon><Postcard /></el-icon>
<span class="title-name"> 签收件数:</span> <span class="title-name"> 签收件数:</span>
<el-input v-model="pageRow.receivedQuantity" disabled placeholder="收货人地址" /> <el-input v-model="pageRow.receivedQuantity" disabled placeholder="暂无签收件数"/>
</div> </div>
<div class="el-txt"> <div class="el-txt">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 复核人:</span> <span class="title-name"> 复核人:</span>
<el-input v-model="pageRow.examineUserName" disabled placeholder="是否加急" /> <el-input v-model="pageRow.examineUserName" disabled placeholder="暂无复核人"/>
</div> </div>
<div class="el-txt" style=" margin-top: 24px;"> <div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 签收人:</span> <span class="title-name"> 签收人:</span>
<el-input v-model="pageRow.signeeName" disabled placeholder="是否加急" /> <el-input v-model="pageRow.signeeName" disabled placeholder="暂无签收人"/>
</div> </div>
<div class="el-txt" style=" margin-top: 24px;"> <div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 签收完成时间:</span> <span class="title-name"> 签收完成时间:</span>
<el-input v-model="pageRow.sjsigningTime" disabled placeholder="是否加急" /> <el-input v-model="pageRow.sjsigningTime" disabled placeholder="暂无签收完成时间" />
</div> </div>
<div class="el-txt" style=" margin-top: 24px;"> <div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon> <el-icon><Van /></el-icon>
<span class="title-name"> 文员复核时间:</span> <span class="title-name"> 文员复核时间:</span>
<el-input v-model="pageRow.signingTime" disabled placeholder="是否加急" /> <el-input v-model="pageRow.signingTime" disabled placeholder="暂无文员复核时间" />
</div> </div>
</div> </div>
<div class="FImg"> <div class="FImg">
<div class="imgName"> <div class="imgName">
<span <span
@ -767,6 +700,7 @@ import {
$_updateSignAddValuePackage, $_updateSignAddValuePackage,
$_distributionSignforPackageList, $_distributionSignforPackageList,
$_distributionSignforOrderList, $_distributionSignforOrderList,
$_distributionSignforDetailExcel,
} from '@/api/distribution/distributionSignfor'; } from '@/api/distribution/distributionSignfor';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
@ -1464,9 +1398,9 @@ const menuData2 = ref([
// 库存品列表 // 库存品列表
const menuData3 = ref([ const menuData3 = ref([
{ {
prop: 'sku', prop: 'cargoNorms',
label: 'sku', label: '物料规格',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1475,9 +1409,9 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'descriptionGoods', prop: 'cargoNumber',
label: '物料名称', label: '物料编号',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1486,9 +1420,9 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'cargoNumber', prop: 'cargoUnit',
label: '物料编号', label: '物料单位',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1499,7 +1433,7 @@ const menuData3 = ref([
{ {
prop: 'cargoNorms', prop: 'cargoNorms',
label: '物料规格', label: '物料规格',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1508,8 +1442,8 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'cargoUnit', prop: 'descriptionGoods',
label: '物料单位', label: '物料名称',
type: 1, type: 1,
values: '', values: '',
width: '200', width: '200',
@ -1519,9 +1453,9 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'category', prop: 'incomingBatch',
label: '品分类', label: '批次号',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1530,8 +1464,8 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'reservationNum', prop: 'loadingNum',
label: '计划出库数', label: '装车件数',
type: 1, type: 1,
values: '', values: '',
width: '200', width: '200',
@ -1542,8 +1476,8 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'loadedinNumber', prop: 'loadingStatus',
label: '实际出库数', label: '装车状态',
type: 1, type: 1,
values: '', values: '',
width: '200', width: '200',
@ -1554,9 +1488,9 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'loadingStatusName', prop: 'loadingTime',
label: '装车状态', label: '装车时间',
type: 2, type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1565,8 +1499,63 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'signingStatusName', prop: 'loadingUser',
label: '装车人',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'marketName',
label: '商场名称',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'planNum',
label: '计划数量',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingNum',
label: '签收数量',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingStatus',
label: '签收状态', label: '签收状态',
type:1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收时间',
type: 1, type: 1,
values: '', values: '',
width: '200', width: '200',
@ -1576,9 +1565,20 @@ const menuData3 = ref([
head: false, head: false,
}, },
{ {
prop: 'signUser', prop: 'signingUser',
label: '签收人', label: '签收人',
type: 2, type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'stockupNum',
label: '备货数量',
type: 1,
values: '', values: '',
width: '200', width: '200',
checkarr: [], checkarr: [],
@ -1825,6 +1825,7 @@ const pageRow=ref({});//页面参数
const onLoad = () => { const onLoad = () => {
menuData.value = menuData1.value; //页面初始化默认显示第一个表格 menuData.value = menuData1.value; //页面初始化默认显示第一个表格
data.value = InitializeTable.value; //默认显示第一个表格数据 data.value = InitializeTable.value; //默认显示第一个表格数据
pageRow.value=JSON.parse(route.query.row)
}; };
console.log(route.query,'route.query'); console.log(route.query,'route.query');
@ -2217,11 +2218,13 @@ function InventoryList() {
editLoading.value = true; //表格加载开启 editLoading.value = true; //表格加载开启
data.value = []; data.value = [];
signforInventoryList(RouterId.value).then(res => { signforInventoryList(RouterId.value).then(res => {
console.log(res,'库存品');
if (res.data.code !== 200) return; if (res.data.code !== 200) return;
console.log(res, '库存品列表'); console.log(res, '库存品列表');
// data.value = res.data.data || []; // data.value = res.data.data || [];
Tabs.value[2].data = data || []; Tabs.value[2].data = res.data.data || [];
Tabs.value[2].renderData = data || []; Tabs.value[2].renderData = res.data.data || [];
editLoading.value = false; //表格加载结束 editLoading.value = false; //表格加载结束
}); });
} }
@ -2252,13 +2255,6 @@ const tabClick = val => {
// 导出 // 导出
const Signforexport = () => { const Signforexport = () => {
if (SignforMenu.value.label == '库存品列表') {
ElMessage({
message: '库存品导出维护中',
type: 'warning',
});
return;
}
console.log(SignforMenu.value); console.log(SignforMenu.value);
ElMessageBox.confirm(`是否导出${SignforMenu.value.label}`, '提示', { ElMessageBox.confirm(`是否导出${SignforMenu.value.label}`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -2267,30 +2263,12 @@ const Signforexport = () => {
}) })
.then(() => { .then(() => {
let data = { let data = {
signforId: RouterId.value, id: RouterId.value,
}; };
editLoading.value = true; editLoading.value = true;
// 订单列表 return $_distributionSignforDetailExcel(data)
if (SignforMenu.value.label == '订单列表') {
return $_distributionSignforOrderList(data)
.then(res => {
downloadXls(res.data, `订单列表.xlsx`);
ElMessage({
type: 'success',
message: '导出成功',
});
})
.catch(() => {})
.finally(() => {
editLoading.value = false;
});
}
// 包件列表
if (SignforMenu.value.label == '包件列表') {
return $_distributionSignforPackageList(data)
.then(res => { .then(res => {
downloadXls(res.data, `包件列表.xlsx`); downloadXls(res.data, `${SignforMenu.value.label}.xlsx`);
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '导出成功', message: '导出成功',
@ -2300,10 +2278,52 @@ const Signforexport = () => {
.finally(() => { .finally(() => {
editLoading.value = false; editLoading.value = false;
}); });
} // 订单列表
// 库存品列表 // if (SignforMenu.value.label == '订单列表') {
if (SignforMenu.value.label == '库存品列表') { // return $_distributionSignforOrderList(data)
} // .then(res => {
// downloadXls(res.data, `订单列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
// // 包件列表
// if (SignforMenu.value.label == '包件列表') {
// return $_distributionSignforPackageList(data)
// .then(res => {
// downloadXls(res.data, `包件列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
// // 库存品列表
// if (SignforMenu.value.label == '库存品列表') {
// return $_distributionSignforDetailExcel(data)
// .then(res => {
// downloadXls(res.data, `库存品列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
}) })
.catch(() => {}); .catch(() => {});
}; };

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

@ -2088,6 +2088,7 @@ export default {
id: row.id, id: row.id,
reservationId: row.reservationId, reservationId: row.reservationId,
name: '待签收查看', name: '待签收查看',
row: JSON.stringify(row),
}, },
}); });
}, },

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

@ -1220,9 +1220,10 @@ const menuData = ref([
statistics: true, //开启统计 statistics: true, //开启统计
isshowSummary: true, isshowSummary: true,
}, },
{ {
prop: 'reservationNum', prop: 'handQuantity',
label: '计划数量', label: '在库件数',
type: 1, type: 1,
values: '', values: '',
width: '110', width: '110',
@ -1234,8 +1235,8 @@ const menuData = ref([
isshowSummary: true, isshowSummary: true,
}, },
{ {
prop: 'handQuantity', prop: 'reservationNum',
label: '在库件数', label: '计划数量',
type: 1, type: 1,
values: '', values: '',
width: '110', width: '110',

Write Preview
Loading…
Cancel
Save