gjy 2 年之前
父节点
当前提交
c07dcb5fc4

+ 2 - 2
config/index.js

@@ -6,9 +6,9 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.9:9100/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 3 - 3
pages/task/audit/freight_settlement_approvalcopy.vue

@@ -273,7 +273,7 @@
 							}
 						}
 						this.num=this.num.toFixed(2)
-						this.list = res.data.data.tranSettlementReportList
+						this.list = res.data.data.tranTaskInfoList
 						// console.log(this.list, 124)
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -394,8 +394,8 @@
 								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),
-									operatorName: this.list[0].requester,
+									operatorTitle: this.dataobj.creater.substring(0, 2),
+									operatorName: this.dataobj.creater,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',

+ 3 - 4
pages/task/audit/freight_settlement_detailscopy.vue

@@ -65,7 +65,6 @@
 					<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}}
@@ -254,7 +253,7 @@
 							}
 						}
 						this.num=this.num.toFixed(2)
-						this.list = res.data.data.tranSettlementReportList
+						this.list = res.data.data.tranTaskInfoList
 						// console.log(this.list, 124)
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -375,8 +374,8 @@
 								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),
-									operatorName: this.list[0].requester,
+									operatorTitle: this.dataobj.creater.substring(0, 2),
+									operatorName: this.dataobj.creater,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',