|
|
@@ -15,7 +15,7 @@
|
|
|
<!-- 车序号表格 -->
|
|
|
<div class="switch" v-if="selectionList.length > 0">
|
|
|
<el-tooltip placement="top">
|
|
|
- <div slot="content">下面表格已有数据，不能进行更改！！！</div>
|
|
|
+ <div slot="content">下面表格已有数据，不能进行更改!!!</div>
|
|
|
<el-switch
|
|
|
v-model="value"
|
|
|
active-text="件数"
|
|
|
@@ -58,7 +58,7 @@
|
|
|
<template slot="scope" v-if="item.label !== '车序号'">
|
|
|
<span>{{ item.label }}</span>
|
|
|
</template>
|
|
|
- <template slot="scope" v-if="item.label !== '收货地址'">
|
|
|
+ <template slot="scope" v-if="item.label !== '运输单价'">
|
|
|
<span>{{ item.label }}</span>
|
|
|
</template>
|
|
|
<template slot="scope" v-if="item.label !== '截止日期'">
|
|
|
@@ -90,11 +90,11 @@
|
|
|
@change="updateArragneCxh(scope.row.cxh)"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
- <!-- 收货地址id -->
|
|
|
- <template v-if="item.prop == 'saleShipperAddressName'" >
|
|
|
+ <!-- 运输单价id -->
|
|
|
+ <template v-if="item.prop == 'priceValue'" >
|
|
|
<el-input
|
|
|
style="width: 200px"
|
|
|
- v-model="scope.row.saleShipperAddressName"
|
|
|
+ v-model="scope.row.priceValue"
|
|
|
disabled
|
|
|
>
|
|
|
</el-input>
|
|
|
@@ -129,7 +129,7 @@
|
|
|
v-model.number="scope.row.saleOrderConsigneeTel"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
- <!-- 排车数（不可见) -->
|
|
|
+ <!-- 排车数 -->
|
|
|
<template v-if="item.prop == 'arragneCount'">
|
|
|
<el-input
|
|
|
class="textinput6"
|
|
|
@@ -170,12 +170,12 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
- <!-- 收货地址的模态框 -->
|
|
|
+ <!-- 运输单价的模态框 -->
|
|
|
<el-drawer
|
|
|
:visible.sync="addressDrawer"
|
|
|
:destroy-on-close="false"
|
|
|
direction="rtl"
|
|
|
- size="40%"
|
|
|
+ size="70%"
|
|
|
:wrapperClosable="false"
|
|
|
modal
|
|
|
close-on-press-escape
|
|
|
@@ -205,9 +205,9 @@
|
|
|
<i class="el-icon-check"></i>确定
|
|
|
</el-button>
|
|
|
<div class="tablecls">
|
|
|
- <!-- 查询所有的收货地址 -->
|
|
|
+ <!-- 查询所有的运输单价 -->
|
|
|
<dilTable
|
|
|
- v-bind.sync="Address"
|
|
|
+ v-bind.sync="Price"
|
|
|
@radio-change="currentRadioChange2"
|
|
|
></dilTable>
|
|
|
</div>
|
|
|
@@ -247,6 +247,11 @@ export default {
|
|
|
requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
|
|
|
selectionType: "radio",
|
|
|
},
|
|
|
+ //运输单价的表格
|
|
|
+ Price: {
|
|
|
+ requestUrl: "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0",
|
|
|
+ selectionType: "radio",
|
|
|
+ },
|
|
|
table: false,
|
|
|
selectionList: [],
|
|
|
selectionList1: [],
|
|
|
@@ -300,11 +305,17 @@ export default {
|
|
|
slot: true,
|
|
|
},
|
|
|
{
|
|
|
- prop: "saleShipperAddressName",
|
|
|
- label: "收货地址",
|
|
|
+ prop: "priceValue",
|
|
|
+ label: "运输单价",
|
|
|
width: "300",
|
|
|
slot: true,
|
|
|
},
|
|
|
+ // {
|
|
|
+ // prop: "saleShipperAddressName",
|
|
|
+ // label: "收货地址",
|
|
|
+ // width: "300",
|
|
|
+ // slot: true,
|
|
|
+ // },
|
|
|
{
|
|
|
prop: "saleOrderConsignee",
|
|
|
label: "收货客户",
|
|
|
@@ -325,6 +336,8 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
row: {},
|
|
|
+ //缓存当前选中的运输单价
|
|
|
+ priceMap:{},
|
|
|
};
|
|
|
},
|
|
|
// mounted() {
|
|
|
@@ -379,6 +392,8 @@ export default {
|
|
|
saleMaterialId:row.saleMaterialId,
|
|
|
saleOrderConsignee:row.saleOrderConsignee,
|
|
|
saleOrderConsigneeTel:row.saleOrderConsigneeTel,
|
|
|
+ priceValue:row.priceValue,
|
|
|
+ priceId:row.priceId,
|
|
|
saleShipperAddressId:row.saleShipperAddressId,
|
|
|
saleShipperAddressName:row.saleShipperAddressName,
|
|
|
})
|
|
|
@@ -430,8 +445,9 @@ export default {
|
|
|
},
|
|
|
//收货地址模态窗口的点击事件
|
|
|
addAddressClick(){
|
|
|
- this.selectionList[this.addressIndex].saleShipperAddressName = this.addressMap.address
|
|
|
- this.selectionList[this.addressIndex].saleShippingAddressId = this.addressMap.addressId
|
|
|
+ //priceMap
|
|
|
+ this.selectionList[this.addressIndex].priceValue = this.priceMap.priceValue
|
|
|
+ this.selectionList[this.addressIndex].priceId = this.priceMap.priceId
|
|
|
this.addressDrawer = false;
|
|
|
let arr = this.selectionList;
|
|
|
this.selectionList = [];
|
|
|
@@ -447,6 +463,8 @@ export default {
|
|
|
saleMaterialId:e.saleMaterialId,
|
|
|
saleOrderConsignee:e.saleOrderConsignee,
|
|
|
saleOrderConsigneeTel:e.saleOrderConsigneeTel,
|
|
|
+ priceValue:e.priceValue,
|
|
|
+ priceId:e.priceId,
|
|
|
saleShipperAddressId:e.saleShipperAddressId,
|
|
|
saleShipperAddressName:e.saleShipperAddressName,
|
|
|
})
|
|
|
@@ -459,8 +477,8 @@ export default {
|
|
|
},
|
|
|
//收货地址模态框单选选中的事件
|
|
|
currentRadioChange2(val){
|
|
|
- this.addressMap = {};
|
|
|
- this.addressMap = val;
|
|
|
+ this.priceMap = {};
|
|
|
+ this.priceMap = val;
|
|
|
},
|
|
|
// 框计算
|
|
|
onclick() {
|
|
|
@@ -499,6 +517,8 @@ export default {
|
|
|
saleOrderConsignee: null,
|
|
|
saleOrderConsigneeTel: null,
|
|
|
saleMaterialId: e.saleMaterialId,
|
|
|
+ priceValue:e.priceValue,
|
|
|
+ priceId:e.priceId,
|
|
|
// materialTheoreticalWeight: e.materialTheoreticalWeight,
|
|
|
arragneCount : this.arragneCount,
|
|
|
};
|
|
|
@@ -537,6 +557,8 @@ export default {
|
|
|
saleMaterialId : 0,
|
|
|
//物资数量
|
|
|
materialNumber : 0,
|
|
|
+ //运输单价ID
|
|
|
+ priceId: 0,
|
|
|
};
|
|
|
mapItem.saleOrderId=this.$route.params.saleOrderId;
|
|
|
mapItem.truckNo=item.cxh;
|
|
|
@@ -546,8 +568,10 @@ export default {
|
|
|
mapItem.orderConsigneeTel=item.saleOrderConsigneeTel;
|
|
|
mapItem.saleMaterialId=item.saleMaterialId;
|
|
|
mapItem.materialNumber=item.orderPlanWeight;
|
|
|
+ mapItem.priceId=item.priceId;
|
|
|
mapList.push(mapItem);
|
|
|
});
|
|
|
+ console.log("mapList",mapList)
|
|
|
this.axios.post("/api/v1/ams/addTruckNo", mapList).then((res) => {
|
|
|
if (res.data.code == "200") {
|
|
|
this.$router.go(-1);
|
zouzhd