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

签收、商配页面调整

dev-warehouse
kilo 2 years ago
parent
ef66a11449
commit
c381e17a1a
8 changed files with 1420 additions and 1234 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. 15
      src/api/distribution/distributionDeliveryList.js
  2. 9
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  3. 541
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  4. 84
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  5. 6
      src/views/distribution/reservation/atlas1.vue
  6. 113
      src/views/distribution/reservation/reservation.vue
  7. 88
      src/views/distribution/signfor/distributionSignfortreat.vue
  8. 8
      src/views/distribution/turndelivery/deliveryDiscuss.vue

15
src/api/distribution/distributionDeliveryList.js
Unescape View File

@ -163,5 +163,20 @@ export const updateDeliveryList = (data) => {
}) })
} }
/**
* 查询配送任务订单地图信息
* @param data
* @returns {AxiosPromise}
*/
export const selectStockArticleAtlasInfo = (id) => {
return request({
url: '/api/logpm-distribution/deliveryList/selectStockArticleAtlasInfo',
method: 'get',
params: {
id,
}
})
}

9
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -2,11 +2,12 @@
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud">
<el-row :gutter="24" class="rows"> <el-row :gutter="24" class="rows">
<el-col :xl="14" :lg="7" :md="8" :sm="24" > <!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span> <!-- <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
</el-col> <!-- </el-col>-->
<el-col :xl="10" :lg="7" :md="8" :sm="24"> <el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} </span> <!-- /总库存品数：{{statistics.cinventoryTotal}}-->
<span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}} </span>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-top: 30px"> <el-row style="margin-top: 30px">

541
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -29,7 +29,8 @@
</el-col> </el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> --> <!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>装卸类型： 装 </span> <span>装卸班组：{{deliverydata.teamResponsibility}} </span>
<!-- <span>装卸类型： 装 </span>-->
</el-col> </el-col>
</el-row> </el-row>
<el-divider>作业时间</el-divider> <el-divider>作业时间</el-divider>
@ -37,8 +38,11 @@
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>创建时间：{{deliverydata.createTime}} </span> <span>创建时间：{{deliverydata.createTime}} </span>
</el-col> </el-col>
<!-- <el-col :xl="7" :lg="7" :md="8" :sm="24">-->
<!-- <span>备货时间：{{deliverydata.leadTime}} </span>-->
<!-- </el-col> -->
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>备货时间：{{deliverydata.leadTime}} </span> <span>出库时间：{{deliverydata.outboundDate}} </span>
</el-col> </el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>装车时间：{{deliverydata.loadingTime}} </span> <span>装车时间：{{deliverydata.loadingTime}} </span>
@ -99,11 +103,21 @@
<!-- 操作栏模块 --> <!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center"> <el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}"> <template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看</el-button> <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编 辑
</el-button>
<!-- <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>--> <!-- <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
<el-button type="primary" text icon="el-icon-view" @click="handleOne(row)" v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">一 键 装 车</el-button> <el-button type="primary" text icon="el-icon-view" @click="handleOne(row)"
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='已签收' ">复 核 签 收</el-button> v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">
<el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='未签收' ">一 键 签 收</el-button> 一 键 装 车
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)"
v-if="row.signingStatus=='未签收' && row.driverSigning=='已签收' ">复 核 签 收
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)"
v-if="row.signingStatus=='未签收' && row.driverSigning=='未签收' ">一 键 签 收
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -204,7 +218,6 @@
</el-tabs> </el-tabs>
<el-row> <el-row>
<div class="avue-crud__pagination" style="width:100%"> <div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 --> <!-- 分页模块 -->
@ -301,7 +314,7 @@ import {
getpackdetail, getpackdetail,
getinventorydetail getinventorydetail
} from '@/api/distribution/distributionDeliveryList'; } from '@/api/distribution/distributionDeliveryList';
import { update as updatesign,getOneclickq } from "@/api/distribution/distributionSignfor"; import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor';
import option from '@/option/basic/basicPdarecords'; import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
@ -326,7 +339,7 @@ export default {
//是否显示新增 //是否显示新增
isadd: false, isadd: false,
deliverydata: { deliverydata: {
reservationList:[], reservationList: []
}, },
// 加载中 // 加载中
loading: true, loading: true,
@ -371,78 +384,78 @@ export default {
selection: true, selection: true,
column: [ column: [
{ {
label: "配送车次号", label: '配送车次号',
prop: "trainNumber", prop: 'trainNumber',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "收货人", label: '收货人',
prop: "consignee", prop: 'consignee',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "收货电话", label: '收货电话',
prop: "deliveryPhone", prop: 'deliveryPhone',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "收货地址", label: '收货地址',
prop: "deliveryAddress", prop: 'deliveryAddress',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "订单自编号", label: '订单自编号',
prop: "orderIds", prop: 'orderIds',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "配送件数", label: '配送件数',
prop: "packageNub", prop: 'packageNub',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "配送库存品数", label: '配送库存品数',
prop: "reservationStockListNum", prop: 'reservationStockListNum',
search: true, search: true,
width:"110px" width: '110px'
}, },
{ {
label: "计划件数", label: '计划件数',
prop: "reservationNum", prop: 'reservationNum',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "扫描件数", label: '扫描件数',
prop: "loadedNub", prop: 'loadedNub',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "是否加急", label: '是否加急',
prop: "isUrgent", prop: 'isUrgent',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "签收件数", label: '签收件数',
prop: "receivedQuantity", prop: 'receivedQuantity',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "签收状态", label: '签收状态',
prop: "signingStatus", prop: 'signingStatus',
search: true, search: true,
width:"100px" width: '100px'
}, }
] ]
}, },
@ -462,14 +475,14 @@ export default {
submitBtn: false, //隐藏提交按钮 submitBtn: false, //隐藏提交按钮
column: [ column: [
{ {
label: "收货人姓名", label: '收货人姓名',
labelWidth: '150', labelWidth: '150',
span: 11, span: 11,
prop: "consignee", prop: 'consignee',
type: "input", type: 'input',
width:"150px", width: '150px',
align: 'center', align: 'center',
disabled:true, disabled: true
// rules: [{ // rules: [{
// required: true, // required: true,
// message: "输入承运商编号", // message: "输入承运商编号",
@ -477,52 +490,52 @@ export default {
// }], // }],
}, },
{ {
label: "收货人电话", label: '收货人电话',
prop: "deliveryPhone", prop: 'deliveryPhone',
labelWidth: '150', labelWidth: '150',
span: 11, span: 11,
type: "input", type: 'input',
width:"150px", width: '150px',
align: 'center', align: 'center',
disabled:true, disabled: true
}, },
{ {
label: "收货地址", label: '收货地址',
prop: "deliveryAddress", prop: 'deliveryAddress',
labelWidth: '150', labelWidth: '150',
span: 11, span: 11,
type: "input", type: 'input',
width:"150px", width: '150px',
align: 'center', align: 'center',
disabled:true, disabled: true
}, },
{ {
label: "签收类型", label: '签收类型',
prop: "signingType", prop: 'signingType',
labelWidth: '150', labelWidth: '150',
span: 11, span: 11,
type: "radio", type: 'radio',
width:"150px", width: '150px',
align: 'center', align: 'center',
disabled: false, disabled: false,
dicData: [ dicData: [
{ {
label: '签收', label: '签收',
value: '1', value: '1'
}, },
{ {
label: '代签收', label: '代签收',
value: '2', value: '2'
} }
], ]
}, },
{ {
label: "签收图片", label: '签收图片',
prop: "deliverySignPictures", prop: 'deliverySignPictures',
labelWidth: '150', labelWidth: '150',
type: 'upload', type: 'upload',
listType: 'picture-card', listType: 'picture-card',
width:"150px", width: '150px',
span: 15, span: 15,
multiple: true, multiple: true,
align: 'left', align: 'left',
@ -530,9 +543,9 @@ export default {
limit: 5, limit: 5,
propsHttp: { propsHttp: {
res: 'data', res: 'data',
url: 'link', url: 'link'
}, },
disabled:false, disabled: false
}, },
// { // {
// label: "复核图片", // label: "复核图片",
@ -559,14 +572,14 @@ export default {
// }, // },
{ {
label: "备注", label: '备注',
prop: "clerkSignRemarks", prop: 'clerkSignRemarks',
labelWidth: '150', labelWidth: '150',
span: 15, span: 15,
type: "input", type: 'input',
width:"150px", width: '150px',
align:'center', align: 'center'
}, }
] ]
}, },
@ -580,58 +593,58 @@ export default {
selection: true, selection: true,
column: [ column: [
{ {
label: "包条码", label: '包条码',
prop: "orderPackageCode", prop: 'orderPackageCode',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "仓库", label: '仓库',
prop: "warehouse", prop: 'warehouse',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "一级品类", label: '一级品类',
prop: "firsts", prop: 'firsts',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "二级品类", label: '二级品类',
prop: "second", prop: 'second',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "三级品类", label: '三级品类',
prop: "thirdProduct", prop: 'thirdProduct',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "物料编号", label: '物料编号',
prop: "materialCode", prop: 'materialCode',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "物料名称", label: '物料名称',
prop: "materialName", prop: 'materialName',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "托盘码", label: '托盘码',
prop: "pallet", prop: 'pallet',
width:"100px" width: '100px'
}, },
{ {
label: "库位号", label: '库位号',
prop: "goodsAllocation", prop: 'goodsAllocation',
width:"100px" width: '100px'
}, }
] ]
}, },
@ -643,10 +656,10 @@ export default {
selection: true, selection: true,
column: [ column: [
{ {
label: "sku", label: 'sku',
prop: "sku", prop: 'sku',
search: true, search: true,
width:"100px" width: '100px'
}, },
// { // {
// label: "订单自编号", // label: "订单自编号",
@ -655,10 +668,10 @@ export default {
// width:"100px" // width:"100px"
// }, // },
{ {
label: "物料名称", label: '物料名称',
prop: "descriptionGoods", prop: 'descriptionGoods',
search: true, search: true,
width:"100px" width: '100px'
}, },
// { // {
// label: "单位", // label: "单位",
@ -667,39 +680,39 @@ export default {
// width:"100px" // width:"100px"
// }, // },
{ {
label: "备货数", label: '备货数',
prop: "deliveryNumber", prop: 'deliveryNumber',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "已备数量", label: '已备数量',
prop: "readyStock", prop: 'readyStock',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "物料编号", label: '物料编号',
prop: "cargoNumber", prop: 'cargoNumber',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "单位", label: '单位',
prop: "cargoUnit", prop: 'cargoUnit',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "托盘码", label: '托盘码',
prop: "pallet", prop: 'pallet',
width:"100px" width: '100px'
}, },
{ {
label: "库位信息", label: '库位信息',
prop: "goodsAllocation", prop: 'goodsAllocation',
width:"100px" width: '100px'
}, }
] ]
@ -712,53 +725,78 @@ export default {
selection: true, selection: true,
column: [ column: [
{ {
label: "订单自编号", label: '订单自编号',
prop: "orderCode", prop: 'orderCode',
search: true,
width: '100px'
},
{
label: '货物名称',
prop: 'descriptionGoods',
search: true,
width: '100px'
},
{
label: '物料名称',
prop: 'materialName',
search: true,
width: '100px'
},
{
label: '备货件数',
prop: 'deliveryNumber',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "货物名称", label: '已备数量',
prop: "descriptionGoods", prop: 'readyStock',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "物料名称", label: '备货状态',
prop: "materialName", prop: 'stockArticleState',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "备货件数", label: '托盘码',
prop: "deliveryNumber", prop: 'pallet',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "已备数量", label: '货位信息',
prop: "readyStock", prop: 'goodsAllocation',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "备货状态", label: '收货单位',
prop: "stockArticleState", prop: 'consigneeUnit',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "托盘码", label: '运单收货人',
prop: "pallet", prop: 'consigneePerson',
search: true, search: true,
width:"100px" width: '100px'
}, },
{ {
label: "货位信息", label: '运单收货地址',
prop: "goodsAllocation", prop: 'consigneeAddress',
search: true, search: true,
width:"100px" width: '100px'
}, },
{
label: '运单收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px'
}
] ]
}, },
//包肩分页信息 //包肩分页信息
@ -796,7 +834,7 @@ export default {
//订单列表 //订单列表
orddata: [], orddata: [],
//库存品列表 //库存品列表
inventorydata:[], inventorydata: []
}; };
}, },
watch: { watch: {
@ -836,7 +874,7 @@ export default {
}, },
methods: { methods: {
beforeOpen(done, type) { beforeOpen(done, type) {
if (["edit", "view"].includes(type)) { if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => { getDetail(this.form.id).then(res => {
this.form = res.data.data; this.form = res.data.data;
}); });
@ -845,7 +883,7 @@ export default {
}, },
//修改 //修改
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
console.log("row>>>>>>>>",row); console.log('row>>>>>>>>', row);
}, },
queryDictionary() { queryDictionary() {
getDictionaryBiz('yes_no').then(res => { getDictionaryBiz('yes_no').then(res => {
@ -868,20 +906,20 @@ export default {
this.height = this.setPx(document.body.clientHeight - 340); this.height = this.setPx(document.body.clientHeight - 340);
}, },
handleTabClick(tab, event) { handleTabClick(tab, event) {
console.log("tab>>>>>>>>", tab.paneName); console.log('tab>>>>>>>>', tab.paneName);
let tabName = tab.paneName let tabName = tab.paneName;
switch (tabName) { switch (tabName) {
case 'tab1': case 'tab1':
console.log("ssss") console.log('ssss');
break; break;
case 'tab2': case 'tab2':
console.log("ssss") console.log('ssss');
break; break;
case 'tab3': case 'tab3':
console.log("ssss") console.log('ssss');
break; break;
case 'tab4': case 'tab4':
console.log("ssss") console.log('ssss');
break; break;
} }
}, },
@ -911,8 +949,8 @@ export default {
}); });
let str = { let str = {
val: false val: false
} };
this.$emit("returnproperty", str); this.$emit('returnproperty', str);
}); });
} else { } else {
update(this.form).then(() => { update(this.form).then(() => {
@ -924,8 +962,8 @@ export default {
}); });
let str = { let str = {
val: false val: false
} };
this.$emit("returnproperty", str); this.$emit('returnproperty', str);
}); });
} }
} else { } else {
@ -937,37 +975,39 @@ export default {
submitForm() { submitForm() {
this.$refs.signform.validate(valid => { this.$refs.signform.validate(valid => {
if (valid) { if (valid) {
if (this.signtitle='复核签收'){ console.log("this.signtitle -------------->",this.signtitle );
let row = {} if (this.signtitle == '复核签收') {
row.id = this.signform.deliveryId let row = {};
row.deliverySignPictures = this.signform.deliverySignPictures row.id = this.signform.deliveryId;
row.clerkSignRemarks = this.signform.clerkSignRemarks row.deliverySignPictures = this.signform.deliverySignPictures;
row.signingTime =dayjs().format("YYYY-MM-DD HH:mm:ss") row.clerkSignRemarks = this.signform.clerkSignRemarks;
row.signingStatus = '2' row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
console.log("更新参数>>>>>>>>",row); row.signingStatus = '2';
console.log('更新参数>>>>>>>>', row);
// if (!!row.id){ // if (!!row.id){
updatesign(row).then(() => { updatesign(row).then(() => {
this.$message({ this.$message({
type: "success", type: 'success',
message: "操作成功!" message: '操作成功!'
}); });
this.signBox = false; this.signBox = false;
this.onLoad() this.onLoad();
}, error => { }, error => {
console.log(error); console.log(error);
this.signBox = false; this.signBox = false;
}); });
} else { } else {
let data ={} let data = {};
data.reservationId =row.id console.log("this.signform------------>",this.signform);
data.deliveryId =this.deliverydata.id data.reservationId = this.signform.reservationId;
data.deliverySignPictures = this.signform.deliverySignPictures data.deliveryId = this.deliverydata.id;
data.clerkSignRemarks = this.signform.clerkSignRemarks data.deliverySignPictures = this.signform.deliverySignPictures.join(",");
console.log("一键签收data>>>>>>>>>>",data); data.clerkSignRemarks = this.signform.clerkSignRemarks;
console.log('一键签收data>>>>>>>>>>', data);
getOneclickq(data).then(res => { getOneclickq(data).then(res => {
this.$message.success(res.data.msg) this.$message.success(res.data.msg);
this.signBox = false; this.signBox = false;
this.onLoad() this.onLoad();
}); });
} }
} }
@ -975,43 +1015,43 @@ export default {
}, },
//客户列表 //客户列表
handleCustom() { handleCustom() {
this.cus =true this.cus = true;
this.pake =false this.pake = false;
this.ord =false this.ord = false;
this.inventory =false this.inventory = false;
}, },
//订单列表 //订单列表
handleOrder(page) { handleOrder(page) {
let params={} let params = {};
params.deliveryId = this.deliverydata.id params.deliveryId = this.deliverydata.id;
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>订单>>",res.data.data); console.log('查看>>>>>订单>>', res.data.data);
const data =res.data.data const data = res.data.data;
this.orddata = data.records this.orddata = data.records;
this.ordpage.total = data.total this.ordpage.total = data.total;
}); });
}, },
//包件列表 //包件列表
handlePackage(page) { handlePackage(page) {
let params={} let params = {};
params.deliveryId = this.deliverydata.id params.deliveryId = this.deliverydata.id;
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>包间>>",res.data.data); console.log('查看>>>>>包间>>', res.data.data);
const data =res.data.data const data = res.data.data;
this.packdata = data.records this.packdata = data.records;
this.packpage.total = data.total this.packpage.total = data.total;
}); });
}, },
//库存列表 //库存列表
handleInventory(page) { handleInventory(page) {
let params={} let params = {};
params.deliveryId = this.deliverydata.id params.deliveryId = this.deliverydata.id;
getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>库存>>",res.data.data); console.log('查看>>>>>库存>>', res.data.data);
const data =res.data.data const data = res.data.data;
this.inventorydata = data.records this.inventorydata = data.records;
this.inventorypage.total = data.total this.inventorypage.total = data.total;
}); });
}, },
handleAdd() { handleAdd() {
@ -1027,52 +1067,52 @@ export default {
}); });
}, },
handleView(row) { handleView(row) {
console.log("查看>>>>>>>>>>",row); console.log('查看>>>>>>>>>>', row);
this.title = '查看'; this.title = '查看';
this.view = true; this.view = true;
this.box = true; this.box = true;
this.wid= row.id this.wid = row.id;
this.getWrapdetails(this.wpage) this.getWrapdetails(this.wpage);
}, },
handleSign(row) { handleSign(row) {
console.log("签收>>>>>>>>>>",row); console.log('签收>>>>>>>>>>', row);
this.signtitle = '复核签收'; this.signtitle = '复核签收';
// this.view = true; // this.view = true;
this.signform = row this.signform = row;
this.signBox = true; this.signBox = true;
// this.wid= row.id // this.wid= row.id
// this.getWrapdetails(this.wpage) // this.getWrapdetails(this.wpage)
}, },
//一键签收 //一键签收
handleSignone(row) { handleSignone(row) {
console.log("一键签收>>>>>>>>>>",row); console.log('一键签收>>>>>>>>>>', row);
this.signtitle = '一键签收'; this.signtitle = '一键签收';
this.signform = row this.signform = row;
this.signBox = true this.signBox = true;
}, },
handleOne(row) { handleOne(row) {
console.log("签收>>>>>>>>>>",row); console.log('签收>>>>>>>>>>', row);
this.$confirm('确认一键装车？') this.$confirm('确认一键装车？')
.then(_ => { .then(_ => {
let data ={} let data = {};
data.reservationId =row.id data.reservationId = row.id;
data.deliveryId =this.deliverydata.id data.deliveryId = this.deliverydata.id;
getOneclick(data).then(res => { getOneclick(data).then(res => {
this.$message.success(res.data.msg) this.$message.success(res.data.msg);
this.onLoad() this.onLoad();
}); });
}) })
.catch(_ => { .catch(_ => {
}); });
}, },
getWrapdetails(page) { getWrapdetails(page) {
let params={} let params = {};
params.reservationId = this.wid params.reservationId = this.wid;
getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>>>",res.data.data); console.log('查看>>>>>>>', res.data.data);
const data =res.data.data const data = res.data.data;
this.wrapdata = data.records this.wrapdata = data.records;
this.wpage.total = data.total this.wpage.total = data.total;
}); });
}, },
@ -1121,7 +1161,7 @@ export default {
this.view = false; this.view = false;
}, },
selectionChange(list) { selectionChange(list) {
console.log("sllsls"); console.log('sllsls');
this.selectionList = list; this.selectionList = list;
}, },
selectionClear() { selectionClear() {
@ -1138,48 +1178,63 @@ export default {
}, },
wcurrentChange(currentPage) { wcurrentChange(currentPage) {
this.wpage.currentPage = currentPage; this.wpage.currentPage = currentPage;
this.getWrapdetails(this.wpage) this.getWrapdetails(this.wpage);
}, },
wsizeChange(pageSize) { wsizeChange(pageSize) {
this.wpage.pageSize = pageSize; this.wpage.pageSize = pageSize;
this.getWrapdetails(this.wpage) this.getWrapdetails(this.wpage);
}, },
pcurrentChange(currentPage) { pcurrentChange(currentPage) {
this.packpage.currentPage = currentPage; this.packpage.currentPage = currentPage;
this.handlePackage(this.packpage) this.handlePackage(this.packpage);
}, },
psizeChange(pageSize) { psizeChange(pageSize) {
this.packpage.pageSize = pageSize; this.packpage.pageSize = pageSize;
this.handlePackage(this.packpage) this.handlePackage(this.packpage);
}, },
ocurrentChange(currentPage) { ocurrentChange(currentPage) {
this.ordpage.currentPage = currentPage; this.ordpage.currentPage = currentPage;
this.handleordpage(this.ordpage) this.handleordpage(this.ordpage);
}, },
osizeChange(pageSize) { osizeChange(pageSize) {
this.inventorypage.pageSize = pageSize; this.inventorypage.pageSize = pageSize;
this.handleordpage(this.inventorypage) this.handleordpage(this.inventorypage);
}, },
icurrentChange(currentPage) { icurrentChange(currentPage) {
this.inventorypage.currentPage = currentPage; this.inventorypage.currentPage = currentPage;
this.handleordpage(this.inventorypage) this.handleordpage(this.inventorypage);
}, },
isizeChange(pageSize) { isizeChange(pageSize) {
this.inventorypage.pageSize = pageSize; this.inventorypage.pageSize = pageSize;
this.handleordpage(this.inventorypage) this.handleordpage(this.inventorypage);
}, },
onLoad() { onLoad() {
//查询详情 //查询详情
const data = decodeURIComponent(this.$route.query.data); const data = decodeURIComponent(this.$route.query.data);
this.deliverydata = JSON.parse(data); this.deliverydata = JSON.parse(data);
console.log("data>>>>>>>>", this.deliverydata); console.log('data>>>>>>>>', this.deliverydata);
this.loading = true; this.loading = true;
let id = this.deliverydata.id; let id = this.deliverydata.id;
getDetail(id).then(res => { getDetail(id).then(res => {
console.log("res.data>>>>>>>>>>>>",res.data.data); console.log('res.data>>>>>>>>>>>>', res.data.data);
const data = res.data.data const data = res.data.data;
this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
console.log('data.stockupInfo.teamResponsibility------------------->', data.stockupInfo.teamResponsibility);
let a = data.stockupInfo.teamResponsibility.split(',');
let b = [];
a.forEach(item => {
switch (item) {
case '1':
b.push('装');
return;
case '2':
b.push('卸');
}
});
this.deliverydata.teamResponsibility = b.join(",");
//this.deliverydata = data //this.deliverydata = data
this.data = data.reservationList this.data = data.reservationList;
}); });
this.handleOrder(this.packpage); this.handleOrder(this.packpage);
this.handlePackage(this.packpage); this.handlePackage(this.packpage);

84
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -3,9 +3,9 @@
<div class="avue-crud"> <div class="avue-crud">
<el-row :gutter="24" class="rows"> <el-row :gutter="24" class="rows">
<el-col :xl="14" :lg="7" :md="8" :sm="24" > <!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span> <!-- <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
</el-col> <!-- </el-col>-->
<el-col :xl="10" :lg="7" :md="8" :sm="24"> <el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}}</span> <span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}}</span>
</el-col> </el-col>
@ -234,16 +234,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'kind', // prop: 'kind',
label: '配送种类', // label: '配送种类',
type: 3, // type: 3,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'kindName', prop: 'kindName',
label: '配送种类', label: '配送种类',
@ -293,34 +293,34 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'deliveryStatus', // prop: 'deliveryStatus',
label: '配送状态', // label: '配送状态',
type: 3, // type: 3,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [ // checkarr: [
{ // {
label: '待配送', // label: '待配送',
value: '1', // value: '1',
}, // },
{ // {
label: '装车', // label: '装车',
value: '2' // value: '2'
}, // },
{ // {
label: '配送中', // label: '配送中',
value: '3' // value: '3'
}, // },
{ // {
label: '已完成', // label: '已完成',
value: '4' // value: '4'
}, // },
], // ],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
hide:true, // hide:true,
}, // },
{ {
prop: 'deliveryStatusName', prop: 'deliveryStatusName',
label: '配送状态', label: '配送状态',
@ -391,7 +391,7 @@ export default {
}, },
{ {
prop: 'deliveryNumber', prop: 'deliveryNumber',
label: '配送件数', label: '配送包件件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',

6
src/views/distribution/reservation/atlas1.vue
Unescape View File

@ -29,6 +29,7 @@
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { getReservationAddr } from '@/api/distribution/distributionReservation'; import { getReservationAddr } from '@/api/distribution/distributionReservation';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { selectStockArticleAtlasInfo} from '@/api/distribution/distributionDeliveryList'
import { onMounted, reactive, toRefs, watchEffect } from 'vue'; import { onMounted, reactive, toRefs, watchEffect } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
let router = useRouter(); let router = useRouter();
@ -43,6 +44,11 @@ let details = reactive({
}); });
onMounted(() => { onMounted(() => {
details.item = JSON.parse(router.currentRoute.value.query.item); details.item = JSON.parse(router.currentRoute.value.query.item);
console.log("details.item.id------------->",details.item.id);
selectStockArticleAtlasInfo(details.item.id).then(res=>{
console.log("-------------->",res);
})
console.log("------------->",details.item);
setTimeout(() => { setTimeout(() => {
init(); init();
}, 1500); }, 1500);

113
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -289,6 +289,36 @@
fixed: false, fixed: false,
sortable: true sortable: true
}, },
{
prop: 'warehouseName',
label: '仓库',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: 'mallName',
label: '商城',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: 'storeName',
label: '门店',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
},
{ {
prop: 'consignee', prop: 'consignee',
label: '收货人', label: '收货人',
@ -328,30 +358,30 @@
fixed: false, fixed: false,
sortable: true sortable: true
}, },
{ // {
prop: 'periodOfTime', // prop: 'periodOfTime',
label: '时段1', // label: '时段1',
type: 3, // type: 3,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [ // checkarr: [
{ // {
label: '上午', // label: '上午',
value: '1' // value: '1'
}, // },
{ // {
label: '下午', // label: '下午',
value: '2' // value: '2'
}, // },
{ // {
label: '全天', // label: '全天',
value: '3' // value: '3'
}, // },
], // ],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head:true, // head:true,
}, // },
{ {
prop: 'periodOfTimeName', prop: 'periodOfTimeName',
label: '时段', label: '时段',
@ -486,25 +516,34 @@
// fixed: false, // fixed: false,
// sortable: true // sortable: true
// }, // },
{ // {
prop: 'reservationStatus', // prop: 'reservationStatus',
label: '预约信息状态1', // label: '预约信息状态1',
type: 4, // type: 4,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
hide: true, // hide: true,
//
}, // },
{ {
prop: 'reservationStatusName', prop: 'reservationStatusName',
label: '预约信息状态', label: '预约信息状态',
type: 1, type: 1,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [
// {
// label: '待确认',
// value: '1'
// },
// {
// label: '已确认',
// value: '2'
// },
],
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },

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

@ -1,6 +1,59 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud">
<el-row :hidden="!search" style="padding: 6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="订单编号:">
<el-input v-model="query.stockArticleId" placeholder="请输入订单自编号"></el-input>
</el-form-item>
<el-form-item label="商城名称:">
<el-input v-model="query.mallName" placeholder="请输入商城名称"></el-input>
</el-form-item>
<el-form-item label="门店名称:">
<el-input v-model="query.storeName" placeholder="请输入门店名称"></el-input>
</el-form-item>
<el-form-item label="客户名称:">
<el-input v-model="query.consignee" placeholder="请输入客户名称"></el-input>
</el-form-item>
<el-form-item label="客户电话:">
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input>
</el-form-item>
<el-form-item label="业务类型:">
<el-select v-model="query.deliveryType" placeholder="请选择业务类型">
<el-option
:value="1">商配
</el-option>
<el-option
:value="2">市配
</el-option>
</el-select>
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>-->
</el-form-item>
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
</el-form-item>
<el-form-item label="司机签收状态:">
<el-select v-model="query.driverSigning" placeholder="请选择业务类型">
<el-option
:value="1">未签收
</el-option>
<el-option
:value="2">已签收
</el-option>
</el-select>
<el-input v-model="query.querySigningStatus" placeholder="请选择签收状态"></el-input>
</el-form-item>
<!-- <el-form-item label="顾客姓名:">-->
<!-- <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
</el-row>
<!-- <tablecmt <!-- <tablecmt
:columnList="columnList" :columnList="columnList"
:tableData="tableData" :tableData="tableData"
@ -39,7 +92,7 @@
<span >司机待签收数：{{statistics.driverNub}}</span> <span >司机待签收数：{{statistics.driverNub}}</span>
</el-col> </el-col>
<el-col :xl="10" :lg="7" :md="8" :sm="24"> <el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>文员待签收数：{{statistics.clerkNub}}</span> <span>文员待审核数：{{statistics.clerkNub}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -277,12 +330,25 @@ export default {
head: false, head: false,
}, },
{ {
prop: 'deliveryType', prop: 'deliveryTypeName',
label: '业务类型', label: '业务类型',
type: 3, type: 3,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [
{
label: '市配',
value: '1'
},
{
label: '商配',
value: '2'
},
{
label: '自提',
value: '3'
},
],
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
@ -823,6 +889,10 @@ export default {
this.search = !this.search; this.search = !this.search;
}, },
searchChange() { searchChange() {
if (this.query.querySigningStatus){
this.query.signingStatus= this.query.querySigningStatus;
}
this.onLoad(this.page); this.onLoad(this.page);
}, },
searchReset() { searchReset() {
@ -939,12 +1009,12 @@ export default {
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
for (let i = 0; i < data.records.length; i++) { for (let i = 0; i < data.records.length; i++) {
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
for (let j = 0; j < this.deliveryTypeData.length; j++) { // for (let j = 0; j < this.deliveryTypeData.length; j++) {
// eslint-disable-next-line no-empty // // eslint-disable-next-line no-empty
if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) { // if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) {
data.records[i].deliveryType = this.deliveryTypeData[j].dictValue; // data.records[i].deliveryType = this.deliveryTypeData[j].dictValue;
} // }
} // }
for (let j = 0; j < this.orderSourceData.length; j++) { for (let j = 0; j < this.orderSourceData.length; j++) {
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
if (data.records[i].orderSource == this.orderSourceData[j].dictKey) { if (data.records[i].orderSource == this.orderSourceData[j].dictKey) {

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

@ -152,7 +152,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="配送类型:" prop="goodsAreaId"> <el-form-item label="配送类型:" prop="goodsAreaId">
<el-radio-group v-model="stockUpForm.deliveryType"> <el-radio-group v-model="stockUpForm.deliveryType">
<el-radio :label="'10'" :value="'10'">商配&emsp; </el-radio> <el-radio :label="'1'" :value="'1'">商配&emsp; </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -1376,7 +1376,7 @@
} }
this.aaa = true; this.aaa = true;
this.bbb = false; this.bbb = false;
this.stockUpForm.deliveryType="10"; this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10"; this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"]; this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0; this.stockUpForm.otherFee = 0;
@ -1397,7 +1397,7 @@
} }
this.aaa = false; this.aaa = false;
this.bbb = true; this.bbb = true;
this.stockUpForm.deliveryType="10"; this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10"; this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"]; this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0; this.stockUpForm.otherFee = 0;
@ -1557,7 +1557,7 @@
}) })
this.isDisable=true; this.isDisable=true;
}else { }else {
this.stockUpForm.deliveryType="10"; this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10"; this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"]; this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0; this.stockUpForm.otherFee = 0;

Write Preview
Loading…
Cancel
Save