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

1.配送详情页面

dev-warehouse
0.0 2 years ago
parent
9479e38f0a
commit
4033fba064
8 changed files with 327 additions and 210 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. 4
      src/router/views/index.js
  2. 15
      src/views/basic/property/basicPropertyform.vue
  3. 34
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  4. 45
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  5. 356
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  6. 60
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  7. 20
      src/views/distribution/reservation/atlas.vue
  8. 3
      src/views/distribution/reservation/reservation.vue

4
src/router/views/index.js
Unescape View File

@ -532,7 +532,7 @@ export default [
{
path: '/distribution/deliverylist/distributionDeliveryListedt',
component: Layout,
redirect: '/distribution/deliverylist',
redirect: '/deliverylist/distributionDeliveryListedt',
children: [
{
path: '/distribution/deliverylist/distributionDeliveryListedt',
@ -555,7 +555,7 @@ export default [
children: [
{
path: '/distribution/turndelivery/deliveryDiscuss',
name: '配送查看',
name: '配送编辑',
meta: {
i18n: 'dict',
},

15
src/views/basic/property/basicPropertyform.vue
Unescape View File

@ -1,12 +1,15 @@
<template>
<el-form>
<div style="background-color: #ffffff;height: 845px;padding: 2% 4%;">
<div class="form-container">
<div class="scrollable-form">
<avue-form :option="option" ref="myForm" v-model="form">
<template #input="{row}">
<el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>
</template>
</avue-form>
</div>
</div>
<div style="position: fixed;bottom: 7%;left: 40%;width: 100%">
<div style="width: 100%">
<el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
@ -187,6 +190,8 @@ name: "basicPropertyform",
},
rules: [{ required: true, message: '请选择填写类型!',trigger: 'blur'}],
change: (val) => {
console.log("this.option.column[5].children.column[3]>>",val);
console.log("this.option.column[5].children.column[3]>>xx",this.option.column[5].children);
this.option.column[5].children.column[3].disabled = true
if (!!val.value && val.value=='2'){
console.log("option>>>>>>",this.option);
@ -354,5 +359,13 @@ name: "basicPropertyform",
</script>
<style scoped>
.form-container {
height: 680px; /* 设置表单容器的高度 */
overflow-y: auto; /* 显示垂直滚动条 */
}
.scrollable-form {
padding-right: 5px; /* 预留滚动条的宽度 */
}
</style>

34
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -13,13 +13,13 @@
<!-- </el-row>-->
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24" >
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span>
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>商配总车次：{{statistics.commercialNub}}/总件数：{{statistics.commercialTotal}} </span>
<span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>市配总车次：{{statistics.marketNub}}/总件数：{{statistics.marketTotal}} </span>
<span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}} </span>
</el-col>
</el-row>
<el-row style="margin-top: 30px">
@ -51,6 +51,7 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
<el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
<el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
</template>
@ -337,7 +338,17 @@ export default {
},
{
prop: 'deliveryNumber',
label: '配送件数',
label: '配送包件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'inventoryNub',
label: '配送库存品件数',
type: 1,
values: '',
width: '150',
@ -580,6 +591,17 @@ export default {
selectionsc(value) {
console.log("进来了>>>>>>>>>>>>>",value);
},
editmap(scope){
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
query: {
id: row.reservationId,
type:'2'
}
});
},
delectsolt(scope) {
const { row } = scope;
console.log(row);
@ -598,7 +620,7 @@ export default {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
data: encodeURIComponent(JSON.stringify(row)),
name: row.trainNumber +'-查看配送'
}
});
@ -732,7 +754,7 @@ export default {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
data: encodeURIComponent(JSON.stringify(row)),
name: row.trainNumber +'-查看配送'
}
});

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

@ -3,10 +3,10 @@
<div class="avue-crud">
<el-row :gutter="24" class="rows">
<el-col :xl="14" :lg="7" :md="8" :sm="24" >
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span>
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
</el-col>
<el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>商配总车次：{{statistics.commercialNub}}/总件数：{{statistics.commercialTotal}} </span>
<span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} </span>
</el-col>
</el-row>
<el-row style="margin-top: 30px">
@ -40,6 +40,8 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
<el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
<el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
</template>
</tablecmt>
@ -334,6 +336,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'inventoryNub',
label: '配送库存品件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'scannedNumber',
label: '扫描件数',
@ -514,6 +526,17 @@ export default {
});
},
editmap(scope){
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
query: {
id: row.reservationId,
type:'2'
}
});
},
textbox(e, index, a) {
if (a === 6) {
this.feeList[index + 1] = e;
@ -587,7 +610,7 @@ export default {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
data: encodeURIComponent(JSON.stringify(row)),
name: row.trainNumber +'-查看配送'
}
});
@ -699,11 +722,14 @@ export default {
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
handleEdit (scope) {
const { row} = scope;
this.$router.push({
path: '/distribution/turndelivery/deliveryDiscuss',
query: {
id: row.id,
name: row.trainNumber +'-编辑配送'
}
});
},
handleView (row) {
@ -715,10 +741,11 @@ export default {
});
},
handleViewBlank (row) {
console.log("row>>>>>>>>>>>>>>>>",row);
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
data: encodeURIComponent(JSON.stringify(row)),
name: row.trainNumber +'-查看配送'
}
});

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

@ -38,7 +38,7 @@
<span>创建时间：{{deliverydata.createTime}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>备货时间：{{deliverydata.loadTime}} </span>
<span>备货时间：{{deliverydata.leadTime}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>装车时间：{{deliverydata.loadingTime}} </span>
@ -47,162 +47,160 @@
<el-divider>配载情况</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>配送客户：{{deliverydata.reservationList.length}} </span>
<span>配送客户：{{deliverydata.customersNumber}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>计划件数：{{deliverydata.deliveryNumber}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>装车件数：{{deliverydata.loadNub}} </span>
<span>装车件数：{{deliverydata.scannedNumber}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>剩余件数：{{deliverydata.deliveryNumber - deliverydata.loadNub}}</span>
<span>剩余件数：{{deliverydata.deliveryNumber - deliverydata.scannedNumber}}</span>
</el-col>
</el-row>
<el-divider>订单列表</el-divider>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleCustom" plain>预 约 列 表</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleOrder(this.packpage)" plain>订 单 列 表</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handlePackage(this.packpage)" plain>包 件 列 表</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleInventory(this.packpage)" plain>库 存 品 列 表</el-button>
</div>
</div>
</el-row>
<el-row v-if="cus" >
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border"
v-if="cus"
>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看</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.deliveryNumber">一 键 装 车</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' ">签 收</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row v-if="ord" >
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="orddata"
:height="height"
style="width: 100%"
:border="option.border"
v-if="ord"
>
<el-table-column type="expand" v-if="ordoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in ordoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <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="handleSign(row)" v-if="row.signingStatus=='未签收' ">签 收</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-row>
<!-- <el-row>-->
<!-- <div class="avue-crud__header">-->
<!-- &lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;-->
<!-- <div class="avue-crud__left">-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleCustom" plain>预 约 列 表</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleOrder(this.packpage)" plain>订 单 列 表</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handlePackage(this.packpage)" plain>包 件 列 表</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleInventory(this.packpage)" plain>库 存 品 列 表</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-row>-->
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick" >
<el-tab-pane label="预 约 列 表" name="tab1">
<el-row v-if="inventory" >
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="inventorydata"
:height="height"
style="width: 100%"
:border="option.border"
v-if="inventory"
>
<el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in inventoryoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <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="handleSign(row)" v-if="row.signingStatus=='未签收' ">签 收</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border"
>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看</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">一 键 装 车</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' ">签 收</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="订 单 列 表" name="tab2">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="orddata"
:height="height"
style="width: 100%"
:border="option.border"
>
<el-table-column type="expand" v-if="ordoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in ordoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<el-tab-pane label="包 件 列 表" name="tab3">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="packdata"
:height="height"
style="width: 100%"
:border="option.border"
>
<el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in wrapoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="psizeChange"
@current-change="pcurrentChange"
:current-page="packpage.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="packpage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="packpage.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="库 存 品 列 表" name="tab4">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="inventorydata"
:height="height"
style="width: 100%"
:border="option.border"
>
<el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in inventoryoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <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="handleSign(row)" v-if="row.signingStatus=='未签收' ">签 收</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-tab-pane>
</el-tabs>
<el-row v-if="pake" >
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="packdata"
:height="height"
style="width: 100%"
:border="option.border"
v-if="pake"
>
<el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in wrapoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="psizeChange"
@current-change="pcurrentChange"
:current-page="packpage.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="packpage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="packpage.total">
</el-pagination>
</div>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
@ -320,12 +318,15 @@ export default {
search: true,
//是否显示新增
isadd: false,
deliverydata:{},
deliverydata:{
reservationList:[],
},
// 加载中
loading: true,
//查看按钮
edt:false,
activeTab:'tab1',
previousTab: null,
//隐藏
pake:false,
cus:true,
@ -779,15 +780,15 @@ export default {
// this.isadd =false;
// this.query.masterId = null;
// this.masterId = null;
if (!!this.$route.query.data) {
// //做一些路由变化的响应
// // this.isadd =true;
// this.query.masterId = this.$route.query.data;
// this.masterId = this.$route.query.data;
//重新获取数据
this.onLoad(this.page);
} else {
}
// if (!!this.$route.query.data) {
// // //做一些路由变化的响应
// // // this.isadd =true;
// // this.query.masterId = this.$route.query.data;
// // this.masterId = this.$route.query.data;
// //重新获取数据
// this.onLoad(this.page);
// } else {
// }
}
},
mounted() {
@ -841,6 +842,24 @@ export default {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
handleTabClick(tab, event){
console.log("tab>>>>>>>>", tab.paneName);
let tabName = tab.paneName
switch (tabName){
case 'tab1':
console.log("ssss")
break;
case 'tab2':
console.log("ssss")
break;
case 'tab3':
console.log("ssss")
break;
case 'tab4':
console.log("ssss")
break;
}
},
searchHide() {
this.search = !this.search;
},
@ -927,14 +946,10 @@ export default {
let params={}
params.deliveryId = this.$route.query.id
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>sss>>",res.data.data);
console.log("查看>>>>>订单>>",res.data.data);
const data =res.data.data
this.orddata = data.records
this.ordpage.total = data.total
this.cus =false
this.pake =false
this.ord =true
this.inventory =false
});
},
//包件列表
@ -942,14 +957,10 @@ export default {
let params={}
params.deliveryId = this.$route.query.id
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>sss>>",res.data.data);
console.log("查看>>>>>包间>>",res.data.data);
const data =res.data.data
this.packdata = data.records
this.packpage.total = data.total
this.cus =false
this.inventory =false
this.pake =true
this.ord =false
});
},
@ -958,14 +969,10 @@ export default {
let params={}
params.deliveryId = this.$route.query.id
getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>sss>>",res.data.data);
console.log("查看>>>>>库存>>",res.data.data);
const data =res.data.data
this.inventorydata = data.records
this.inventorypage.total = data.total
this.cus =false
this.pake =false
this.ord =false
this.inventory =true
});
},
handleAdd() {
@ -1068,6 +1075,7 @@ export default {
this.view = false;
},
selectionChange(list) {
console.log("sllsls");
this.selectionList = list;
},
selectionClear() {
@ -1116,14 +1124,20 @@ export default {
},
onLoad() {
//查询详情
const data = decodeURIComponent(this.$route.query.data);
this.deliverydata = JSON.parse(data);
console.log("data>>>>>>>>", this.deliverydata);
this.loading = true;
let id = this.$route.query.id;
let id = this.deliverydata.id;
getDetail(id).then(res => {
console.log("res.data>>>>>>>>>>>>",res.data.data);
const data = res.data.data
this.deliverydata = data
//this.deliverydata = data
this.data = data.reservationList
});
this.handleOrder(this.packpage);
this.handlePackage(this.packpage);
this.handleInventory(this.packpage);
this.loading = false;
}
}

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

@ -4,10 +4,10 @@
<el-row :gutter="24" class="rows">
<el-col :xl="14" :lg="7" :md="8" :sm="24" >
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span>
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
</el-col>
<el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>市配总车次：{{statistics.marketNub}}/总件数：{{statistics.marketTotal}} </span>
<span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}}</span>
</el-col>
</el-row>
<el-row style="margin-top: 30px">
@ -39,6 +39,8 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
<el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
<el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
</template>
</tablecmt>
@ -333,6 +335,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'inventoryNub',
label: '配送库存品件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'scannedNumber',
label: '扫描件数',
@ -513,6 +525,17 @@ export default {
});
},
editmap(scope){
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
query: {
id: row.reservationId,
type:'2'
}
});
},
textbox(e, index, a) {
if (a === 6) {
this.feeList[index + 1] = e;
@ -586,7 +609,7 @@ export default {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
data: encodeURIComponent(JSON.stringify(row)),
name: row.trainNumber +'-查看配送'
}
});
@ -698,11 +721,14 @@ export default {
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
handleEdit (scope) {
const { row} = scope;
this.$router.push({
path: '/distribution/turndelivery/deliveryInfo',
query: {
id: row.id,
name: row.trainNumber +'-编辑配送'
}
});
},
handleView (row) {
@ -713,15 +739,15 @@ export default {
this.form = res.data.data;
});
},
handleViewBlank (row) {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListedt',
query: {
id: row.id,
name: row.trainNumber +'-查看配送'
}
});
},
// handleViewBlank (row) {
// this.$router.push({
// path: '/distribution/deliverylist/distributionDeliveryListedt',
// query: {
// id: row.id,
// name: row.trainNumber +'-查看配送'
// }
// });
// },
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");

20
src/views/distribution/reservation/atlas.vue
Unescape View File

@ -21,7 +21,7 @@
</div>
<div style="margin-left: 40%; margin-top: 5%; float: bottom">
<el-button type="primary" icon="el-icon-circle-close" @click="checkgoto"
<el-button type="primary" icon="el-icon-circle-close" @click="checkgoto" v-if="type"
>确认(转配送页面)</el-button
>
<el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
@ -36,6 +36,20 @@ import { onMounted, reactive, toRefs, watchEffect } from 'vue';
import { useRouter } from 'vue-router';
// import { ref } from 'vue'
export default {
data(){
return {
type:true,
}
},
mounted() {
let router = useRouter();
let type =router.currentRoute.value.query.type
console.log("router>>>>>>>>",router.currentRoute.value.query.type);
this.type =true
if (type == '2'){
this.type =false
}
},
setup() {
let router = useRouter();
let details = reactive({
@ -49,7 +63,7 @@ export default {
mapLoc: null,
});
onMounted(() => {
console.log(router);
details.ids = router.currentRoute.value.query.id;
initMap(router.currentRoute.value.query.id);
setTimeout(() => {
@ -114,7 +128,7 @@ export default {
console.log('您选择的地址没有解析到结果！');
}
});
}
// init()
function initMap(ids) {

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

@ -942,7 +942,8 @@
this.$router.push({
path: '/distribution/reservation/atlas',
query: {
id: ids
id: ids,
type:'1'
}
});
// console.log(">>>>>>>>>>",ids);

Write Preview
Loading…
Cancel
Save