Преглед изворни кода

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

ccj пре 2 година
родитељ
комит
0ea7d2ec24

+ 1 - 1
config/index.js

@@ -7,7 +7,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// 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/',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 1 - 1
pages/task/audit/freight_setting_approval.vue

@@ -134,7 +134,7 @@
 								if (that.everyCheck) {
 									helper.setAudit(that.list)
 								} else {
-									uni.navigateBack()
+									// uni.navigateBack()
 								}
 								uni.hideLoading()
 							}, 1000);

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

@@ -198,7 +198,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, that.rejectInfo)
+								that.audit(that.list[0], 0, false, true, that.auditMind)
 							}
 						}
 					})
@@ -218,7 +218,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2, that.rejectInfo1)
+								that.audit(that.list[0], 0, true, 2, that.auditMind)
 							}
 						}
 					})
@@ -234,7 +234,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
-						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
+						auditMind: this.auditMind ,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						if (status == true) {