|
@@ -44,8 +44,8 @@
|
|
|
</ws-form-item>
|
|
|
|
|
|
<ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
|
|
|
- {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
|
|
|
- }}{{ deptBudgetList.sendArea }}
|
|
|
+ {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
|
|
|
+ }}{{ deptBudgetList.sendArea }}
|
|
|
</ws-form-item>
|
|
|
|
|
|
<ws-form-item label="发货人" span="1" prop="sender" class="readonly">
|
|
@@ -59,10 +59,11 @@
|
|
|
class="readonly"
|
|
|
>
|
|
|
{{ deptBudgetList.senderPhone }}
|
|
|
+ <!-- {{deptBudgetList.receivePrivate}} -->
|
|
|
</ws-form-item>
|
|
|
|
|
|
- <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
|
|
|
- {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
|
|
|
+ <ws-form-item label="收货地址" span="1">
|
|
|
+ <!-- {{ deptBudgetList.receivePrivate }} -->{{ deptBudgetList.receiveCity
|
|
|
}}{{ deptBudgetList.receiveArea }}
|
|
|
</ws-form-item>
|
|
|
|
|
@@ -88,48 +89,48 @@
|
|
|
</ws-info-table>
|
|
|
|
|
|
<div class="small-title">联络员及车次</div>
|
|
|
- <div class="liaison" >
|
|
|
- <!-- v-for="(item1, index) in deptBudgetList.tranCarInfoList" -->
|
|
|
+ <div class="liaison" v-for="(item, index) in deptBudgetList.tranCarInfoList">
|
|
|
+
|
|
|
<ws-info-table >
|
|
|
<ws-form-item label="姓名" span="1" prop="driver" >
|
|
|
- {{this.deptBudgetList.tranCarInfoList[0].driver}}
|
|
|
+ {{item.driver}}
|
|
|
+ <!-- {{this.deptBudgetList.tranCarInfoList[0].driver}} -->
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="电话" span="1" prop="driverPhone" >
|
|
|
- {{this.deptBudgetList.tranCarInfoList[0].driverPhone}}
|
|
|
+ <!-- {{item.driverPhone}} -->
|
|
|
</ws-form-item>
|
|
|
<ws-form-item
|
|
|
label="发车日期"
|
|
|
span="1"
|
|
|
prop="sendDateStart"
|
|
|
>
|
|
|
- {{this.deptBudgetList.tranCarInfoList[0].sendDateStart}}
|
|
|
+ <!-- {{this.deptBudgetList.tranCarInfoList[0].sendDateStart}} -->
|
|
|
</ws-form-item>
|
|
|
<ws-form-item
|
|
|
label="到站日期"
|
|
|
span="1"
|
|
|
prop="receiveDateEnd"
|
|
|
>
|
|
|
- {{this.deptBudgetList.tranCarInfoList[0].receiveDateEnd}}
|
|
|
+ <!-- {{this.deptBudgetList.tranCarInfoList[0].receiveDateEnd}} -->
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="车型" span="1" prop="carModel">
|
|
|
|
|
|
- {{this.deptBudgetList.tranCarInfoList[0].carModel}}
|
|
|
+ <!-- {{this.deptBudgetList.tranCarInfoList[0].carModel}} -->
|
|
|
</ws-form-item>
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
style="width: 100%"
|
|
|
class="flex position liaison1"
|
|
|
v-for="(item, index) in freightspace"
|
|
|
- >
|
|
|
+ > -->
|
|
|
|
|
|
<ws-form-item label="车厢号" span="1" prop="trainNo" class="liaison">
|
|
|
|
|
|
- {{item.trainNo}}
|
|
|
+ <!-- {{item.trainNo}} -->
|
|
|
</ws-form-item>
|
|
|
- </div>
|
|
|
+ <!-- </div> -->
|
|
|
</ws-info-table>
|
|
|
</div>
|
|
|
</ws-form>
|
|
|
-
|
|
|
<!-- 提交 -->
|
|
|
<div style="text-align: right; padding: 10px" class="center">
|
|
|
<el-button
|
|
@@ -165,7 +166,9 @@ export default {
|
|
|
let self = this
|
|
|
return {
|
|
|
staffList: [],
|
|
|
- deptBudgetList: {},
|
|
|
+ deptBudgetList: {
|
|
|
+ tranCarInfoList:[]
|
|
|
+ },
|
|
|
options_: regionData,
|
|
|
heightData: '600px',
|
|
|
zoom: 7,
|
|
@@ -173,6 +176,7 @@ export default {
|
|
|
center: [116.244694, 39.517344],
|
|
|
window: '',
|
|
|
radio: 1,
|
|
|
+ receivePrivate:'',
|
|
|
personCharge: [],
|
|
|
district: null,
|
|
|
listDate: { country: '中国', level: 'country', city: '' },
|
|
@@ -197,15 +201,7 @@ export default {
|
|
|
size: 10,
|
|
|
value1: '',
|
|
|
unitList: [],
|
|
|
- freightspace: [
|
|
|
- {
|
|
|
- driver: '',
|
|
|
- driverPhone: '',
|
|
|
- sendDateStart: '',
|
|
|
- receiveDateEnd: '',
|
|
|
- trainNo: '',
|
|
|
- },
|
|
|
- ],
|
|
|
+ freightspace: [],
|
|
|
name: '',
|
|
|
list: [],
|
|
|
}
|
|
@@ -214,13 +210,13 @@ export default {
|
|
|
// this.getList()
|
|
|
// },
|
|
|
computed: {
|
|
|
- totalStorage: function () {
|
|
|
- var maxStorage = 0
|
|
|
- for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
- maxStorage += Number(this.freightspace[i].maxStorage)
|
|
|
- }
|
|
|
- return maxStorage
|
|
|
- },
|
|
|
+ // totalStorage: function () {
|
|
|
+ // var maxStorage = 0
|
|
|
+ // for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
+ // maxStorage += Number(this.freightspace[i].maxStorage)
|
|
|
+ // }
|
|
|
+ // return maxStorage
|
|
|
+ // },
|
|
|
},
|
|
|
activated() {
|
|
|
// this.deptBudgetList.id = this.$route.query.id
|
|
@@ -276,10 +272,12 @@ export default {
|
|
|
seeCat({ id: this.$route.query.id })
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- console.log(this,response)
|
|
|
+ console.log(response.tranCarInfoList)
|
|
|
|
|
|
- this.deptBudgetList = Object.assign({}, response)
|
|
|
- console.log(111,this.deptBudgetList)
|
|
|
+ this.receivePrivate=response.receivePrivate
|
|
|
+ this.deptBudgetList = response
|
|
|
+ console.log()
|
|
|
+ // console.log(111,this.deptBudgetList)
|
|
|
// this.freightspace = this.deptBudgetList.tranCarInfoList
|
|
|
// for(var i = 0 ; i < this.deptBudgetList.tranCarInfoList.length;i++ ){
|
|
|
// var varchar = this.deptBudgetList.tranCarInfoList[i].boxNo
|
|
@@ -292,9 +290,9 @@ export default {
|
|
|
},
|
|
|
handleExamine() {},
|
|
|
approve() {},
|
|
|
- // returnsales() {
|
|
|
- // this.$router.push({ path: 'purchaseContract' })
|
|
|
- // },
|
|
|
+ returnsales() {
|
|
|
+ this.$router.push({ path: 'purchaseContract' })
|
|
|
+ },
|
|
|
selectChapterTwo(e) {
|
|
|
for (var i = 0; i < this.ChapterTwoList.length; i++) {
|
|
|
if (this.ChapterTwoList[i].constValue == e) {
|