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

修复自提提交后不刷新的问题

dev-xx
qb 11 months ago
parent
8429054553
commit
da8c41de1d
3 changed files with 353 additions and 385 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. 595
      src/views/distribution/inventory/distrilbutionBillLading.vue
  2. 135
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  3. 8
      src/views/distribution/inventory/distrilbutionBillLadingView.vue

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

@ -93,34 +93,29 @@
<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=" <div style="display: flex; justify-content: space-between; margin-bottom: 6px">
display: flex; <el-button
justify-content: space-between; type="primary"
margin-bottom: 6px; text
"> icon="el-icon-view"
<el-button @click="handleAddOrder"
type="primary" v-if="orderAdd"
text >新 增</el-button
icon="el-icon-view" >
@click="handleAddOrder"
v-if="orderAdd"
>新 增</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"
@ -132,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
@ -653,7 +647,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';
@ -666,12 +660,12 @@ export default {
data() { data() {
return { return {
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',
@ -1916,7 +1910,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') {
@ -2057,7 +2051,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;
@ -2073,7 +2067,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) {
@ -2084,56 +2078,59 @@ export default {
orderSelectChange(list) { orderSelectChange(list) {
this.order.selectList = list; this.order.selectList = list;
}, },
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());
// 逐行检查是否含有所有partialIds
for (let row of tableRows) {
let allIdsFound = partialIds.every(partialId => {
return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
});
if (allIdsFound) {
// 行包含所有partialIds, 则高亮显示并滚动到该行
const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) {
cell.style.backgroundColor = '#ff0000';
cell.style.color = '#fff';
}); });
// 滚动到视图中央 // 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格
row.scrollIntoView({ behavior: 'smooth', block: 'center' }); const partialIds = partialIdString
break; .replace(/，/g, ',')
} .split(',')
} .map(id => id.trim());
},
// 逐行检查是否含有所有partialIds
for (let row of tableRows) {
let allIdsFound = partialIds.every(partialId => {
return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
});
if (allIdsFound) {
// 行包含所有partialIds, 则高亮显示并滚动到该行
const cells = row.querySelectorAll('[id]');
cells.forEach(function (cell) {
cell.style.backgroundColor = '#ff0000';
cell.style.color = '#fff';
});
// 滚动到视图中央
row.scrollIntoView({ behavior: 'smooth', block: 'center' });
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) {
@ -2146,7 +2143,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();
}, },
@ -2155,21 +2152,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;
@ -2237,15 +2234,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;
@ -2290,10 +2286,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);
} }
@ -2309,16 +2305,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;
} }
@ -2351,12 +2347,12 @@ export default {
// 选择包件 // 选择包件
async handleChooseOrder(row) { async handleChooseOrder(row) {
console.log(this.order.columnOrderList,'order.columnOrderList'); console.log(this.order.columnOrderList, 'order.columnOrderList');
this.order.columnOrderList.forEach(res=>res.values='') this.order.columnOrderList.forEach(res => (res.values = ''));
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;
@ -2365,7 +2361,6 @@ export default {
await this.onLoadEditChoose({}, row); await this.onLoadEditChoose({}, row);
} else await this.onLoadOrderChoose(); } else await this.onLoadOrderChoose();
this.dialogChooseOrderVisible = true; this.dialogChooseOrderVisible = true;
}, },
// 每页数量改变 // 每页数量改变
sizeChangeOrderChoose(size) { sizeChangeOrderChoose(size) {
@ -2374,7 +2369,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();
}, },
// 页码改变 // 页码改变
@ -2384,7 +2379,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();
}, },
// 请求包件数据 -- 新增 // 请求包件数据 -- 新增
@ -2422,37 +2417,39 @@ export default {
await getEditList(this.order.currentPage, this.order.pageSize, { await getEditList(this.order.currentPage, this.order.pageSize, {
...params, ...params,
...this.order.query, ...this.order.query,
}).then(res => { })
if(res.data.code !=200){ .then(res => {
return if (res.data.code != 200) {
} return;
console.log('res :>> ', res); }
const data = res.data.data; console.log('res :>> ', res);
this.order.total = data.total || 0; const data = res.data.data;
this.order.orderDetails = data.records || []; this.order.total = data.total || 0;
this.order.orderDetails = data.records || [];
// 被选中的包件的id list
console.log(row,'row====='); // 被选中的包件的id list
if(row){ console.log(row, 'row=====');
row.originalIdList = []; if (row) {
console.log(this.order,'this.order.orderDetails'); row.originalIdList = [];
// 回显 console.log(this.order, 'this.order.orderDetails');
this.order.selectList = this.order.orderDetails.filter(val => { // 回显
console.log('val :>> ', val); this.order.selectList = this.order.orderDetails.filter(val => {
if (val.choice){ console.log('val :>> ', val);
row.originalIdList.push(val.id); if (val.choice) {
} row.originalIdList.push(val.id);
return val.choice; }
}); return val.choice;
// 深拷贝数据 });
console.log('this.order.selectList :>> ', this.order.selectList); // 深拷贝数据
row.originalList = JSON.parse(JSON.stringify(this.order.selectList)); console.log('this.order.selectList :>> ', this.order.selectList);
this.order.orderChooseLoading = false; row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
} this.order.orderChooseLoading = false;
}).catch((error)=>{ }
console.log(error,'error'); })
.catch(error => {
console.log(error, 'error');
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
}); });
return null; return null;
}, },
/** /**
@ -2463,9 +2460,9 @@ export default {
if (this.order.selectList.length === 0) { if (this.order.selectList.length === 0) {
return this.$message({ type: 'warning', message: '最少选择一项数据' }); return this.$message({ type: 'warning', message: '最少选择一项数据' });
} }
if(this.order.selectList){ if (this.order.selectList) {
this.packageRow.reservationNum=this.order.selectList.length this.packageRow.reservationNum = this.order.selectList.length;
} }
// billPackageEntityList // billPackageEntityList
console.log('this.order.dataList :>> ', this.dataList); console.log('this.order.dataList :>> ', this.dataList);
@ -2480,14 +2477,13 @@ export default {
}); });
this.dialogChooseOrderVisible = false; this.dialogChooseOrderVisible = false;
}, },
ProhibitSelection(val, index) { ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) { if (val.orderPackageStatus == 70) {
return false; return false;
} else { } else {
return true; return true;
} }
},
},
// 数量校验 // 数量校验
handleNumberRange(e, row) { handleNumberRange(e, row) {
console.log(e, 'ee====='); console.log(e, 'ee=====');
@ -2643,12 +2639,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') {
@ -2677,58 +2672,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;
@ -2795,24 +2781,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 {
@ -2828,9 +2817,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; //开启加载效果
@ -2844,6 +2833,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 => {
@ -2873,7 +2866,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 = {
@ -2912,7 +2905,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;
// 当有零担数据时 // 当有零担数据时
@ -2971,6 +2964,10 @@ if (val.orderPackageStatus == 70) {
}); });
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 => {
@ -3035,16 +3032,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;
@ -3079,27 +3075,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();
@ -3178,23 +3173,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;
@ -3205,9 +3199,6 @@ if (val.orderPackageStatus == 70) {
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
}); });
}, },
/** /**
* 创建自提 * 创建自提
@ -3220,69 +3211,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 = {}) {
@ -3329,7 +3277,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;
@ -3338,7 +3286,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=>>>>');
@ -3351,22 +3299,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;
}, },
/** /**
* 显示维护在库零担数量 * 显示维护在库零担数量

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

@ -87,68 +87,68 @@
</div> </div>
</div> </div>
</el-row> </el-row>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-text
size="small"
text
v-if="permission.distrilbutionBillLadingList_view"
@click="handleLike(slotProps.scope)"
>查看</el-text
>
<el-text
size="small"
type="danger"
icon="el-icon-edit"
text
@click="handleLike(slotProps.scope, 'sigin')"
v-if="
permission.distrilbutionBillLadingList_qs &&
Number(slotProps.scope.row.conditions) < 30 &&
slotProps.scope.row.printState
"
>确认提货</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope, '1')"
v-if="
permission.distrilbutionBillLadingList_edit &&
Number(slotProps.scope.row.conditions) < 30
"
>编辑提货信息</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope, '2')"
v-if="
permission.distrilbutionBillLadingList_edit &&
Number(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 @click="handlePreview(slotProps.scope.row)">打印</el-text> <!-- 列表模块 -->
</template> <tablecmt
</tablecmt> :columnList="columnList"
</el-row> :tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-text
size="small"
text
v-if="permission.distrilbutionBillLadingList_view"
@click="handleLike(slotProps.scope)"
>查看</el-text
>
<el-text
size="small"
type="danger"
icon="el-icon-edit"
text
@click="handleLike(slotProps.scope, 'sigin')"
v-if="
permission.distrilbutionBillLadingList_qs &&
Number(slotProps.scope.row.conditions) < 30 &&
slotProps.scope.row.printState
"
>确认提货</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope, '1')"
v-if="
permission.distrilbutionBillLadingList_edit &&
Number(slotProps.scope.row.conditions) < 30
"
>编辑提货信息</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope, '2')"
v-if="
permission.distrilbutionBillLadingList_edit &&
Number(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 @click="handlePreview(slotProps.scope.row)">打印</el-text>
</template>
</tablecmt>
<el-row class="el-fy"> <el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%"> <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div> <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
@ -252,6 +252,7 @@ import { downloadXls, handleClearTableQuery } from '@/utils/util';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import MyPrint from '@/components/MyPrint/MyPrint.vue'; import MyPrint from '@/components/MyPrint/MyPrint.vue';
export default { export default {
name: '/distribution/inventory/distrilbutionBillLadingList',
data() { data() {
return { return {
columnList: [ columnList: [
@ -1204,6 +1205,18 @@ export default {
}); });
}, },
}, },
activated() {
console.log('页面激活');
if (this.$store.state.isRefresh.refreshObj.distrilbutionBillLadingList) {
// 重新请求数据
this.onLoad(this.page);
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: false,
});
}
},
}; };
</script> </script>
<style> <style>

8
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -1758,6 +1758,10 @@ export default {
if (code !== 200) return; if (code !== 200) return;
this.$message.success('签收成功'); this.$message.success('签收成功');
this.$store.commit('DEL_TAG_CURRENT'); this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.back('-1'); this.$router.back('-1');
}) })
.catch(() => {}) .catch(() => {})
@ -1774,6 +1778,10 @@ export default {
if (code !== 200) return; if (code !== 200) return;
this.$message.success('签收成功'); this.$message.success('签收成功');
this.$store.commit('DEL_TAG_CURRENT'); this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.back('-1'); this.$router.back('-1');
} catch (error) { } catch (error) {
console.log('error :>> ', error); console.log('error :>> ', error);

Write Preview
Loading…
Cancel
Save