|
|
@@ -51,7 +51,21 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="car-container">
|
|
|
- <view v-for="item in list" class="car-container-item">
|
|
|
+ <view v-for="item1 in list" class="car-container-item">
|
|
|
+ <view style='display:flex;align-items: center;' class="top1">
|
|
|
+ <view>运输编号</view>
|
|
|
+ <view class="top_info">{{item1.taskNo}}</view>
|
|
|
+ </view>
|
|
|
+ <view style='display:flex;align-items: center;' class="top1">
|
|
|
+ <view>发货地</view>
|
|
|
+ <view class="top_info">{{item1.startPrivate}}{{item1.startCity}}{{item1.startArea}}{{item1.startDetailedAddress}}</view>
|
|
|
+ </view>
|
|
|
+ <view style='display:flex;align-items: center;' class="top1">
|
|
|
+ <view>收货地</view>
|
|
|
+ <view class="top_info">{{item1.endPrivate}}{{item1.endCity}}{{item1.endArea}}{{item1.endDetailedAddress}}</view>
|
|
|
+ </view>
|
|
|
+ <view v-for="item in item1.tranSettlementReportList" class="car-container-item">
|
|
|
+
|
|
|
<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
|
|
|
<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
|
|
|
<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
|
|
|
@@ -101,7 +115,7 @@
|
|
|
<view class="textInfo">{{item.totalPayable}}元</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<u-form ref="uForm">
|
|
|
@@ -220,16 +234,22 @@
|
|
|
},
|
|
|
methods: {
|
|
|
getList() {
|
|
|
+ var that =this
|
|
|
this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
|
|
|
id: this.id
|
|
|
}).then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
this.dataobj=res.data.data
|
|
|
- if(res.data.data.tranSettlementReportList.length>0){
|
|
|
+ if(res.data.data.tranTaskInfoList.length>0){
|
|
|
this.num=0
|
|
|
- for (var i = 0; i < res.data.data.tranSettlementReportList.length; i++) {
|
|
|
- if(res.data.data.tranSettlementReportList[i].totalPayable){
|
|
|
- this.num+=res.data.data.tranSettlementReportList[i].totalPayable
|
|
|
+ for (var i = 0; i < res.data.data.tranTaskInfoList.length; i++) {
|
|
|
+ if(res.data.data.tranTaskInfoList.tranSettlementReportList){
|
|
|
+ var data=res.data.data.tranTaskInfoList.tranSettlementReportList
|
|
|
+ for (var q = 0; q < data.length; q++) {
|
|
|
+ if(data[q].totalPayable){
|
|
|
+ this.num+=data[q].totalPayable
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -243,7 +263,8 @@
|
|
|
}).then(res1 => {
|
|
|
this.$api.doRequest('get', '/commonUser/getHis', {
|
|
|
workflowId: res1.data.data[0].id,
|
|
|
- businessKey: this.id
|
|
|
+ businessKey: this.id,
|
|
|
+ // branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
|
|
|
}).then(response => {
|
|
|
uni.hideLoading()
|
|
|
for (let i = 0; i < response.data.data.length; i++) {
|
|
|
@@ -351,7 +372,7 @@
|
|
|
}
|
|
|
}
|
|
|
this.auditList = response.data.data
|
|
|
- var time2 = new Date(this.list[0].createDate).getTime()
|
|
|
+ var time2 = new Date(this.dataobj.createDate).getTime()
|
|
|
var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
|
|
|
this.auditList.unshift({
|
|
|
operatorTitle: this.list[0].requester.substring(0, 2),
|
|
|
@@ -374,11 +395,11 @@
|
|
|
// }).then(res => {
|
|
|
// this.contractNo = res.data.data.contractNo
|
|
|
// this.carId = res.data.data.carId
|
|
|
- // this.customerName = res.data.data.customer
|
|
|
+ // this.customerName = res.data.data.customer
|
|
|
// this.shippingAddress = res.data.data.send
|
|
|
// this.receivingAddress = res.data.data.receive
|
|
|
// if (res.data.code == 200) {
|
|
|
- // this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
|
|
|
+ // this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
|
|
|
// compId: "2710b21efc1e4393930c5dc800010dc4",
|
|
|
// currentPage: this.currentPage,
|
|
|
// pageSize: this.pageSize,
|
|
|
@@ -387,10 +408,12 @@
|
|
|
// }).then(res => {
|
|
|
// if (res.data.code == 200) {
|
|
|
// this.list = res.data.data.records[0]
|
|
|
+ // console.log(this.list, 124)
|
|
|
// }
|
|
|
// })
|
|
|
// }
|
|
|
// })
|
|
|
+
|
|
|
},
|
|
|
fanHui() {
|
|
|
uni.navigateBack()
|
