前端

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.1.119:9100/',
-	// baseUrlNew: 'http://192.168.1.117:8090/',
+	// baseUrlNew: 'http://192.168.1.119:9100/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/task/audit/freight_setting_approval.vue

@@ -42,7 +42,8 @@
 
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-if='list.billingMethod==1' v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-else v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
@@ -101,20 +102,29 @@
 			},
 			passSubmit() {
 				var that = this
-				if (!this.list.tranPriceIng) {
+				if (!this.list.tranPriceIng&&this.list.billingMethod==1||!this.list.tranPriceIngCar&&this.list.billingMethod==2) {
 					this.$api.msg('运费单价不能为空')
 					return
 				}
+				
 				uni.showLoading({
 					title: "审核中"
 				})
 				var tranProcessInfo = {}
+				var url=''
 				tranProcessInfo.id = that.list.id
 				tranProcessInfo.flag = "2"
-				tranProcessInfo.tranPriceIng = that.list.tranPriceIng
+				tranProcessInfo.billingMethod=that.list.billingMethod
 				tranProcessInfo.reviewer = that.userInfo.userName
 				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
-				that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
+				if(that.list.billingMethod==1){
+					tranProcessInfo.tranPriceIng = that.list.tranPriceIng
+					url='/tranProcessInfo/api/setUpTranPrice'
+				}else{
+					tranProcessInfo.tranPriceIngCar = that.list.tranPriceIngCar
+					url='/tranProcessInfo/api/setUpTranPriceCar'
+				}
+				that.$api.doRequest('post',url , tranProcessInfo)
 					.then(res => {
 						if (res.data.code == 200) {
 							that.$api.msg('审核通过成功!')

pages/task/my_task.vue

@@ -338,7 +338,7 @@
 				var data = {}
 				if (this.statusFlag == 1) {
 					data = this.warehouseInOutInfo
-					url = '/noticeTask/query/noticeTasks'
+					url = '/newNoticeTask/query/noticeTasks'
 				} else {
 					data = this.data
 					url = '/commonUser/query/findHisPageNoticeTasks'
@@ -577,6 +577,18 @@
 								"&isShowbtn=true"
 						})
 					}
+				}else if (item.businessCode == 'TRAN-TEAM-APPROVE') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +
+								"&isShowbtn=true"
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId +
+								"&isShowbtn=true"
+						})
+					}
 				}else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({