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

市配预约订单分页

fix_bug_pro20231227
kilo 2 years ago
parent
17328bdcc7
commit
61dda2f413
7 changed files with 227 additions and 96 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. 7
      src/api/distribution/distributionStockArticle.js
  2. 64
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  3. 188
      src/views/distribution/reservation/reservationAddFrom.vue
  4. 22
      src/views/distribution/reservation/reservationSubmitFrom.vue
  5. 13
      src/views/distribution/signfor/distributionSignfor.vue
  6. 2
      src/views/distribution/signfor/distributionSignfortreat.vue
  7. 7
      src/views/distribution/turndelivery/deliveryDiscuss.vue

7
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -212,12 +212,15 @@ export const selectDiscussStockArticleInfoList = (current, size, params) => {
}) })
} }
export const selectUpdateAvailableStockArticle = (id) => { export const selectUpdateAvailableStockArticle = (current, size, id,params) => {
return request({ return request({
url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle', url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
method: 'get', method: 'get',
params: { params: {
id ...params,
current,
size,
id,
} }
}) })
} }

64
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

@ -133,6 +133,7 @@
</el-pagination> </el-pagination>
</div> </div>
</el-row> </el-row>
<!-- 表单模块 --> <!-- 表单模块 -->
<el-dialog :title="title" <el-dialog :title="title"
v-model="box" v-model="box"
@ -185,16 +186,16 @@
</el-col> </el-col>
<el-col :span="12" v-if="!allocation"> <el-col :span="12" v-if="!allocation">
<el-form-item label="货 区:" prop="goodsAreaId" label-width="100px"> <el-form-item label="货 区:" prop="goodsAreaId" label-width="100px">
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择货区" style="width: 88%;"> <el-cascader :options="optioner" style="width: 80%" v-model="form.goodsAreaId" placeholder="请选择货区" :show-all-levels="false" clearable />
<el-option
v-for="item in optioner" <!-- <el-select v-model="form.goodsAreaId" clearable placeholder="请选择货区" style="width: 88%;">-->
:key="item.id" <!-- <el-option-->
:label="item.headline" <!-- v-for="item in optioner"-->
:value="item.id"> <!-- :key="item.id"-->
</el-option> <!-- :label="item.headline"-->
</el-select> <!-- :value="item.id">-->
<!-- <el-cascader :options="optioner" clearable style="width: 88%" v-model="form.goodsAreaInfo" :show-all-levels="false">--> <!-- </el-option>-->
<!-- </el-cascader>--> <!-- </el-select>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
@ -618,11 +619,11 @@ export default {
this.goodsShelfStatusData = res.data.data; this.goodsShelfStatusData = res.data.data;
}); });
getGoodsAreaNodeList().then(res=>{ getGoodsAreaNodeList().then(res=>{
console.log("res>>>>>>>>>>>>>>",res);
const data = this.formatCascaderData(res.data.data); const data = this.formatCascaderData(res.data.data);
console.log("data>>>>>>>>>>>>>>",data); console.log("data>>>>>>>>>>>>>>",data);
this.optioner = data this.optioner = data
console.log(">>>>>>>>>>>>>>>>optioner",this.optioner); console.log(">>>>>>>>>>>>>>>>optioner",this.optioner);
}) })
getTemplateData("9").then(res=>{ getTemplateData("9").then(res=>{
@ -632,18 +633,34 @@ export default {
}) })
}, },
// 格式化数据，递归将空的children置为undefined // 格式化数据，递归将空的children置为undefined
formatCascaderData(data) formatCascaderData(data){
{ console.log("------------>",data);
const a =[];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
if (null==data[i].children ||data[i].children.length < 1) { let b =
// children若为空数组，则将children设为undefined {
delete data[i].leaf; value:data[i].id,
} else { label:data[i].name,
// children若不为空数组，则继续 递归调用 本方法 children:[]
this.formatCascaderData(data[i].children)
} }
if (!!data[i].children && data[i].children.length > 1) {
let k = data[i].children;
let j=[];
k.forEach(item=>{
let c={
value:item.id,
label:item.headline,
} }
return data j.push(c);
})
//处理货区
b.children=j;
}
a.push(b);
}
console.log("--------------->a".a);
return a
}, },
searchHide () { searchHide () {
this.search = !this.search; this.search = !this.search;
@ -704,6 +721,11 @@ export default {
if (!this.form.id) { if (!this.form.id) {
console.log("this.form>>>>>>>", this.form); console.log("this.form>>>>>>>", this.form);
console.log("this.optioner>>>>>>>", this.optioner); console.log("this.optioner>>>>>>>", this.optioner);
if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
//这里需要截取最后一个ID
let a = this.form.goodsAreaId;
this.form.goodsAreaId = a[a.length - 1];
}
this.optioner.map(item => { this.optioner.map(item => {
if (item.id == this.form.goodsAreaId) { if (item.id == this.form.goodsAreaId) {
this.form.goodsAreaName = item.headline this.form.goodsAreaName = item.headline

188
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -185,6 +185,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="库存品"> <el-tab-pane label="库存品">
@ -285,6 +286,23 @@
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeOrderChange"
@current-change="currentOrderChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<el-form-item style="margin-left: 45%;margin-top: 5px"> <el-form-item style="margin-left: 45%;margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(订单)</el-button> <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(订单)</el-button>
<el-button icon="el-icon-circle-close" @click="orderShow=false">返 回</el-button> <el-button icon="el-icon-circle-close" @click="orderShow=false">返 回</el-button>
@ -679,35 +697,13 @@
console.log("------------>",'预约编辑'); console.log("------------>",'预约编辑');
//编辑和新增不一样的处理方式 //编辑和新增不一样的处理方式
//这里需要查询出未被预约的订单和该预约自己本身的订单 //这里需要查询出未被预约的订单和该预约自己本身的订单
selectUpdateAvailableStockArticle(this.reservationId).then(res=>{ // selectUpdateAvailableStockArticle(this.reservationId).then(res=>{
console.log('res------------>', res); // console.log('res------------>', res);
const data = res.data.data; // const data = res.data.data;
this.stockArticleInfo = data // this.stockArticleInfo = data
this.stockArticleInfo.forEach((item, index) => { // this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结 // //检查订单是否冻结
this.checkOrder(item, index); // this.checkOrder(item, index);
if (this.orderData) {
this.orderData.forEach(o => {
if (o.id === item.id) {
this.$nextTick(() => {
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
});
}
});
}else {
this.orderList = [];
}
});
})
}else {
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
console.log('res------------>', res);
const data = res.data.data;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
this.checkOrder(item, index);
// if (this.orderData) { // if (this.orderData) {
// this.orderData.forEach(o => { // this.orderData.forEach(o => {
// if (o.id === item.id) { // if (o.id === item.id) {
@ -719,10 +715,33 @@
// }else { // }else {
// this.orderList = []; // this.orderList = [];
// } // }
}); // });
this.orderList = []; // })
this.onLoadEditOrder(this.page);
}); }else {
this.onLoadOrder(this.page);
// selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
// console.log('res------------>', res);
// const data = res.data.data;
// this.stockArticleInfo = data.records;
// this.stockArticleInfo.forEach((item, index) => {
// //检查订单是否冻结
// this.checkOrder(item, index);
// // if (this.orderData) {
// // this.orderData.forEach(o => {
// // if (o.id === item.id) {
// // this.$nextTick(() => {
// // this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
// // });
// // }
// // });
// // }else {
// // this.orderList = [];
// // }
// });
// this.orderList = [];
//
// });
} }
this.loading = false; this.loading = false;
console.log("this.stockArticleInfo------------->",this.stockArticleInfo); console.log("this.stockArticleInfo------------->",this.stockArticleInfo);
@ -976,16 +995,22 @@
let page = this.page; let page = this.page;
this.query.typeService = 2; this.query.typeService = 2;
this.query.genre = 1; this.query.genre = 1;
selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { if (this.reservationId){
const data = res.data.data; this.onLoadEditOrder(this.page)
data.records.forEach(item => { }else {
item.reservationNum = item.handQuantity; this.onLoadOrder(this.page)
});
this.page.total = data.total; }
this.stockArticleInfo = data.records; // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.loading = false; // const data = res.data.data;
// this.selectionClear(); // data.records.forEach(item => {
}); // item.reservationNum = item.handQuantity;
// });
// this.page.total = data.total;
// this.stockArticleInfo = data.records;
// this.loading = false;
// // this.selectionClear();
// });
}, },
searchStockList() { searchStockList() {
let params = {}; let params = {};
@ -1266,15 +1291,82 @@
this.query = {}; this.query = {};
// this.$refs.table.clearSelection(); // this.$refs.table.clearSelection();
}, },
currentChange(currentPage) { currentOrderChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
this.onLoad(this.page); if (this.reservationId){
this.onLoadEditOrder(this.page,this.reservationId);
}else {
this.onLoadOrder(this.page);
}
}, },
sizeChange(pageSize) { sizeOrderChange(pageSize) {
this.page.pageSize = pageSize; this.page.pageSize = pageSize;
this.onLoad(this.page); if (this.reservationId){
this.onLoadEditOrder(this.page,this.reservationId);
}else {
this.onLoadOrder(this.page);
}
},
onLoadEditOrder(arg,params = {}){
const page = arg;
selectUpdateAvailableStockArticle(page.currentPage, page.pageSize,this.reservationId,Object.assign(params, this.query)).then(res=>{
console.log('res------------>', res);
const data = res.data.data;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
this.checkOrder(item, index);
if (this.orderData) {
this.orderData.forEach(o => {
if (o.id === item.id) {
//回显选择的包件信息
this.$nextTick(() => {
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
});
}
});
}else {
this.orderList = [];
}
});
this.page.total = data.total;
})
// this.query = {};
}, },
onLoad(page, params = {}) {
onLoadOrder(arg,params={}){
console.log("------------->arg",arg);
const page = arg;
console.log("------------->page",page);
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
console.log('res------------>', res);
const data = res.data.data;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
this.checkOrder(item, index);
// if (this.orderData) {
// this.orderData.forEach(o => {
// if (o.id === item.id) {
// this.$nextTick(() => {
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
// });
// }
// });
// }else {
// this.orderList = [];
// }
this.page.total = data.total;
});
this.orderList = [];
});
},
onLoad() {
// this.loading = true; // this.loading = true;
this.form.deliveryType = '2'; this.form.deliveryType = '2';
this.form.deliveryWay = '10'; this.form.deliveryWay = '10';

22
src/views/distribution/reservation/reservationSubmitFrom.vue
Unescape View File

@ -1082,16 +1082,16 @@
}); });
// this.form.stockArticleList = this.packageList; // this.form.stockArticleList = this.packageList;
console.log('>>>>>>>>', this.form); console.log('>>>>>>>>', this.form);
if (this.reservationId) { // if (this.reservationId) {
this.form.id = this.reservationId; // this.form.id = this.reservationId;
update(this.form).then(() => { // update(this.form).then(() => {
this.$router.go(-1); // this.$router.go(-1);
this.$message({ // this.$message({
type: 'success', // type: 'success',
message: '操作成功!' // message: '操作成功!'
}); // });
}); // });
} else { // } else {
add(this.form).then(() => { add(this.form).then(() => {
this.$router.go(-1); this.$router.go(-1);
this.$message({ this.$message({
@ -1099,7 +1099,7 @@
message: '操作成功!' message: '操作成功!'
}); });
}); });
} // }
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭？') this.$confirm('确认关闭？')

13
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -436,7 +436,18 @@ export default {
}, },
{ {
prop: 'signingStatusAll', prop: 'signingStatusAll',
label: '签收状态', label: '司机签收状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingStatusAll',
label: '文员复核状态',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '150',

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

@ -128,7 +128,7 @@
> >
<template #default="slotProps"> <template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button> <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<el-button size="small" @click="handleSign(slotProps.scope.row)">签 收</el-button> <el-button size="small" @click="handleSign(slotProps.scope.row)">复 核</el-button>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"--> <!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>--> <!-- >Delete</el-button>-->
</template> </template>

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

@ -975,6 +975,7 @@
}); });
console.log('^^^^^^^^', row); console.log('^^^^^^^^', row);
} }
this.loading = false; this.loading = false;
this.isShowPackage = true; this.isShowPackage = true;
}, },
@ -1489,7 +1490,7 @@
console.log("----------------------------->",res.data.data); console.log("----------------------------->",res.data.data);
const data = res.data.data; const data = res.data.data;
// this.page.total = data.total; // this.page.total = data.total;
this.stockArticleInfo = data; this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => { this.stockArticleInfo.forEach((item, index) => {
if (this.orderData) { if (this.orderData) {
this.orderData.forEach(a => { this.orderData.forEach(a => {
@ -1503,6 +1504,8 @@
}); });
} }
}); });
this.page.total = data.total;
}); });
this.query = {}; this.query = {};
} else { } else {
@ -1514,9 +1517,9 @@
this.stockArticleInfo.forEach((item, index) => { this.stockArticleInfo.forEach((item, index) => {
this.checkOrder(item,index) this.checkOrder(item,index)
}); });
this.page.total = data.total;
}); });
} }
this.loading = false; this.loading = false;
this.query = {}; this.query = {};
// this.selectionClear(); // this.selectionClear();

Write Preview
Loading…
Cancel
Save