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

市配配送增加预约单新增功能

master
汤建军 1 year ago
parent
ad7b2fe105
commit
76272ba309
1 changed files with 300 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 303
      src/views/distribution/turndelivery/deliveryMarket.vue

303
src/views/distribution/turndelivery/deliveryMarket.vue
Unescape View File

@ -256,6 +256,7 @@
</el-form>
</div>
<h3>预约列表</h3>
<el-button type="primary" @click="addReservation">新 增</el-button>
<div>
<el-row>
<tablecmt
@ -358,6 +359,57 @@
</el-dialog>
<el-dialog
title="预约池"
v-model="reservationDialogVisible"
width="70%"
height="50%"
>
<el-row>
<tablecmt
:columnList="reservationListColumnList"
:tableData="reservationListData"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text v-if="isoperation" type="primary" link icon="el-icon-edit" @click="removeStockArticle(slotProps.scope.row)">移除</el-text>
</template>
</tablecmt>
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="reservationDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="saveAddReservation">确 定</el-button>
</span>
</el-dialog>
<el-dialog
title="提示"
v-model="dialogVisible"
@ -396,7 +448,7 @@
import { getDictionaryBiz } from '@/api/system/dict';
import option from '@/option/distribution/distributionReservation';
import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
import { deliveryTask, getList, getReservationAddr } from '@/api/distribution/distributionReservation';
import { getMarketDeliveryList, updateMarketDelivery,cancelDeliveryListTask } from '@/api/distribution/distributionDeliveryList';
import { getListUser } from '@/api/distribution/distributionStockup';
import { getPostList } from '@/api/system/post';
@ -410,6 +462,16 @@
export default {
data() {
return {
//新增预约窗口
reservationDialogVisible:false,
//预约单查询对象
reservationQuery:{},
reservationListData:[],
page: {
currentPage: 1,
pageSize: 30,
total: 40,
},
columnList: [
{
prop: '',
@ -600,6 +662,197 @@
fixed: 'right',
hide: true,
},
],
reservationListColumnList: [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'stockArticleId',
label: '订单自编号',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consignee',
label: '收货人',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryAddress',
label: '收件地址',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryPhone',
label: '收件人电话',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'reservationDate',
label: '预约时间',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'periodOfTimeName',
label: '时段',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryWayName',
label: '配送方式',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'loadingStatusName',
label: '装车状态',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingStatusName',
label: '签收状态',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryTypeName',
label: '配送类型',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'collectFee',
label: '到付运费',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'otherFee',
label: '其他费用',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'replaceFee',
label: '代付运费',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'fee',
label: '总费用',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'reservationStatusName',
label: '预约信息状态',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'stockupStatusName',
label: '备货状态',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'reservationNum',
label: '包件数量',
type: 2,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '150',
// checkarr: [],
// fixed: 'right',
// hide: true,
// },
],
height: 0,
loading: false,
@ -757,6 +1010,50 @@
this.onLoad(this.page);
},
methods: {
//预约单新增
addReservation(){
console.log("aaaaa-------->",'执行预约新增');
//开启弹窗
this.reservationDialogVisible = true;
console.log("aaaaa-------->",'aaa');
//查询可进行预约的预约单
let excludeId=[];
if (this.reservationData.length>0){
//列表存在的预约单进行过滤
excludeId = this.reservationData.map(item=> item.id).join(",")
}
this.getAddReservationList(this.page,excludeId);
},
saveAddReservation(){
if (this.selectionList.length === 0 ){
this.$message.warning("请选择需要增加的预约单");
}
this.reservationData.push(...this.selectionList);
console.log('aaa->>>>>>',this.selectionList);
console.log('this.reservationData->>>>>>',this.reservationData);
this.reservationDialogVisible = false;
},
//查询可用预约单
getAddReservationList(page,excludeId,params={}){
this.reservationQuery.reservationStatus = '20';
this.reservationQuery.excludeId = excludeId;
getList(page.currentPage,page.pageSize , Object.assign(params, this.reservationQuery)).then(res=>{
console.log('res=========>',res);
const data = res.data.data;
this.reservationListData = data.records;
this.page.total = data.total;
})
},
//查询叉车人员
async getFork() {
let ides = '';
@ -957,7 +1254,7 @@
type: 'warning',
})
return
}
}
}
console.log(">>>>>>>>>>>> 配送类型:",this.aaa +" "+ this.bbb)
@ -1343,7 +1640,7 @@
this.query = {};
},
onLoad(page, params = {}) {

Write Preview
Loading…
Cancel
Save