更新

pages/erp/index.vue

@@ -257,7 +257,7 @@
 			},
 			init(compId) {
 				console.log(this.userInfo)
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
 					compId: compId,
 				}).then(res => {
 					if (res.data.data.length != 0) {

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -394,6 +394,9 @@
 				
 				list.compId = sessionStorage.getItem('ws-pf_compId')
 				list.publisher = this.userInfo.userName
+				uni.showLoading({
+					title:"审核中"
+				})
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
 						this.$api.doRequest('post', '/workflow/api/handle', {
@@ -402,12 +405,51 @@
 							auditMind: '34',
 							needReapply: false
 						}).then(res => {
+							uni.hideLoading()
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
 								setTimeout(function() {
 										uni.navigateBack()
 								}, 1000);
+							}else{
+								this.$api.msg('审核失败！')
+							}
+						}).catch(res => {
+							uni.hideLoading()
+							if(res.message){
+								uni.showToast({
+									title: res.message,
+									icon: 'none',
+									duration: 2000
+								})
 							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						
+					}
+					else{
+						this.$api.msg('审核失败！')
+					}
+				}).catch(res => {
+					uni.hideLoading()
+					if(res.message){
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
 						})
 					}
 				})

pages/task/audit/freight_setting_approval.vue

@@ -74,7 +74,7 @@
 				var that = this
 				var tranProcessInfo = {}
 				tranProcessInfo.id = this.list.id
-				tranProcessInfo.flag = "1"
+				tranProcessInfo.flag = "2"
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
 				tranProcessInfo.reviewer = this.userInfo.userName
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {