Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/freight_setting_approval.vue

@@ -2,18 +2,7 @@
 	<view class="warp">
 		<view class="topInfo">
 			<view class="topInfo-item">
-				<view class="flex info" v-if='list.billingMethod==2'>
-					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatusCar == '已驳回'"
-							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatusCar == '已通过'"
-							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatusCar == '审核中'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
-					</view>
-					<view class="infoText">{{list.priceStatusCar}}</view>
-				</view>
-				<view class="flex info" v-else>
+				<view class="flex info">
 					<view class="logo">
 						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
@@ -144,15 +133,23 @@
 				that.$api.doRequest('post', url, tranProcessInfo)
 					.then(res => {
 						if (res.data.code == 200) {
-							that.$api.msg('审核通过成功!')
-							setTimeout(function() {
-								if (that.everyCheck) {
-									helper.setAudit(that.list)
-								} else {
-									uni.navigateBack()
-								}
-								uni.hideLoading()
-							}, 1000);
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: true,
+								auditMind: '',
+								needReapply: true,
+							}).then(res => {
+								that.$api.msg('通过成功')
+								that.show = false
+								setTimeout(function() {
+									if (that.everyCheck) {
+										helper.setAudit(that.list)
+									} else {
+										uni.navigateBack()
+									}
+									uni.hideLoading()
+								}, 1000);
+							})
 						}
 					})
 

pages/task/audit/freight_setting_details.vue

@@ -18,6 +18,9 @@
 		</view>
 		<view class="transaction">
 			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="运费类型" prop="contractNo" label-width="140">
+					{{list.tranType}}运费
+				</u-form-item>
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -34,8 +37,11 @@
 					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-if='list.billingMethod==2' v-model="list.tranPriceCar" input-align="right" placeholder="请输入运费单价" disabled/>
-					<u-input v-else v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-if='list.billingMethod==2&&list.tranPriceCar!=0' v-model="list.tranPriceCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==2&&list.tranPriceCar==0' v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==1&&list.tranPrice==0' v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.tranPrice' v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</view>

pages/task/my_task.vue

@@ -153,7 +153,7 @@
 								'&compId=' + this
 								.pcUserInfo.compId
 						}
-					} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+					} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/freight_setting_approval?id=` + item.businessId
 						} else {
@@ -437,7 +437,7 @@
 									this.taskInfo[i].messageTitle = '仓库设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'Tran') {
-								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
+								if (this.taskInfo[i].businessCode == 'YUNJIA-TRAN-APPROVE') {
 									this.taskInfo[i].messageTitle = '运费设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'ACQ') {
@@ -591,7 +591,7 @@
 								.pcUserInfo.compId + "&isShowbtn=true"
 						})
 					}
-				} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+				} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +