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
Unified View
  1. 15
      src/api/distribution/distributionDeliveryList.js
  2. 9
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  3. 2331
      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">

2331
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
View File

File diff suppressed because it is too large Load Diff

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