修改自动审核

common/helper.js

@@ -1,52 +1,72 @@
 import * as config from '../config'
 const selectContractNo = {}
 const detailData = {}
-const erpWarehouse={}
+const erpWarehouse = {}
 const rolesList = []
-const now = Date.now || function () {  
-    return new Date().getTime();  
-};  
-const isArray = Array.isArray || function (obj) {  
-    return obj instanceof Array;  
-};  
-const getListByUserId = function(){
+const now = Date.now || function() {
+	return new Date().getTime();
+};
+const isArray = Array.isArray || function(obj) {
+	return obj instanceof Array;
+};
+const getListByUserId = function() {
 	let baseUrlNew = config.def().baseUrlNew
 	var userInfo = uni.getStorageSync("userInfo")
 	uni.request({
-	    url: baseUrlNew + '/roleMenu/query/getListByUserId',
-	    data: {
-	    	userId: userInfo.id
-	    },
+		url: baseUrlNew + '/roleMenu/query/getListByUserId',
+		data: {
+			userId: userInfo.id
+		},
 		method: 'GET',
-	    success: (res) => {			
-	    	if (res.statusCode === 200) {
+		success: (res) => {
+			if (res.statusCode === 200) {
 				uni.setStorageSync("jurisdiction", res.data.data)
 				let list = getUserAllRoles(res.data.data);
 				uni.setStorageSync("rolesList", list)
-				
-	    	}
-	    }
+
+			}
+		}
 	})
 }
 const getUserAllRoles = (item) => {
 	console.log(item)
-	
-	for(let i = 0;i<item.length;i++){
+
+	for (let i = 0; i < item.length; i++) {
 		rolesList.push(item[i].name)
 		// console.log('用户权限',rolesList)
-		if(item[i].children&&item[i].children.length>0){
+		if (item[i].children && item[i].children.length > 0) {
 			getUserAllRoles(item[i].children)
 		}
 	}
 	return rolesList;
 }
+const setAudit = (item) => {
+	let _list = uni.getStorageSync("copyTaskInfo")
+	let _isShowbtn =true
+	if(_list.length==0){
+		_isShowbtn = false
+	}
+	for (let i = 0; i < _list.length; i++) {
+		if (_list[i].businessId == item.id) {
+			_list.splice(i, 1)
+			uni.setStorageSync("copyTaskInfo",_list)
+		} else {
+			uni.navigateTo({
+				url: _list[i].itemUrl+'&isShowbtn='+_isShowbtn,
+			})
+		}
+	}
+	console.log(item)
+}
 
 
-export default {  
+
+export default {
 	detailData,
 	selectContractNo,
-    now,  
-    isArray,
+	now,
+	isArray,
 	erpWarehouse,
-	getListByUserId
-}
+	getListByUserId,
+	setAudit
+}

config/index.js

@@ -1,6 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erp/receivingfeedback/details.vue

@@ -917,7 +917,6 @@
 			},
 			train(index){
 				console.log(index)
-				// debugger
 				this.freightspace[index].show2 = true
 				this.$forceUpdate();
 				this.index=index

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -249,8 +249,8 @@
 		<u-popup v-model="show1" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（驳回）</view>
-				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="rejectSubmit()" type="success">确定</u-button>
@@ -260,8 +260,8 @@
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（通过）</view>
-				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="passSubmit()" type="success">确定</u-button>
@@ -278,12 +278,14 @@
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				everyCheck: '',
 				height: 200,
 				autoHeight: true,
 				border: false,
@@ -296,7 +298,7 @@
 				show1: false,
 				show2: false,
 				rejectInfo: "", //驳回原因
-				rejectInfo1: "",//通过意见
+				rejectInfo1: "", //通过意见
 				pjList: [{
 						type: '一等品'
 					},
@@ -315,8 +317,15 @@
 		// onReady() {
 		// 	this.$refs.uForm.setRules(this.rules);
 		// },
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
 			this.getList()
 		},
 		computed: {
@@ -453,7 +462,7 @@
 				list.compId = sessionStorage.getItem('ws-pf_compId')
 				// list.publisher = this.userInfo.userName
 				uni.showLoading({
-					title:"审核中"
+					title: "审核中"
 				})
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
@@ -463,25 +472,28 @@
 							auditMind: this.rejectInfo1,
 							needReapply: false
 						}).then(res => {
-							uni.hideLoading()
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
-								setTimeout(function() {
-									uni.navigateBack()
-								}, 1000);
-							}else{
+							} else {
 								this.$api.msg('审核失败！')
 							}
+							setTimeout(function() {
+								if (this.everyCheck) {
+									helper.setAudit(this.list)
+								} else {
+									uni.navigateBack()
+								}
+								uni.hideLoading()
+							}, 1000);
 						}).catch(res => {
 							uni.hideLoading()
-							if(res.message){
+							if (res.message) {
 								uni.showToast({
 									title: res.message,
 									icon: 'none',
 									duration: 2000
 								})
-							}
-							else{
+							} else {
 								uni.showToast({
 									title: "系统异常，请联系管理员",
 									icon: 'none',
@@ -489,21 +501,19 @@
 								})
 							}
 						})
-						
-					}
-					else{
+
+					} else {
 						this.$api.msg('审核失败！')
 					}
 				}).catch(res => {
 					uni.hideLoading()
-					if(res.message){
+					if (res.message) {
 						uni.showToast({
 							title: res.message,
 							icon: 'none',
 							duration: 2000
 						})
-					}
-					else{
+					} else {
 						uni.showToast({
 							title: "系统异常，请联系管理员",
 							icon: 'none',
@@ -513,6 +523,9 @@
 				})
 			},
 			requestaudit(list, status) {
+				uni.showLoading({
+					title: "审核中"
+				})
 				list.compId = '2710b21efc1e4393930c5dc800010dc4'
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
@@ -526,7 +539,12 @@
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
 								setTimeout(function() {
-									uni.navigateBack()
+									if (this.everyCheck) {
+										helper.setAudit(this.list)
+									} else {
+										uni.navigateBack()
+									}
+									uni.hideLoading()
 								}, 1000);
 							}
 						})
@@ -535,56 +553,56 @@
 			},
 			check() {
 				// （1出库2入库3移库4退库并出库）taskTypeKey
-				if(this.OutList.taskTypeKey == 1 || this.OutList.taskTypeKey == 3){
+				if (this.OutList.taskTypeKey == 1 || this.OutList.taskTypeKey == 3) {
 					if (!this.OutList.grade) {
-					this.$api.msg('品级不能为空')
-					return
-				}
-				if (!this.OutList.bulkDensity) {
-					this.$api.msg('容重不能为空')
-					return
-				}
-				if (this.OutList.bulkDensity < 500 || this.OutList.bulkDensity > 1000) {
-					this.$api.msg('容重输入错误')
-					return
-				}
-				if (String(this.OutList.bulkDensity).indexOf('.') != -1 && String(this.OutList.bulkDensity).length - (
-						String(this.OutList.bulkDensity).indexOf('.') + 1) > 0) {
-					this.$api.msg('容重输入错误')
-					return
-				}
-				if (!this.OutList.waterContent) {
-					this.$api.msg('水分不能为空')
-					return
-				}
-				if (isNaN(this.OutList.waterContent) ||
-					(String(this.OutList.waterContent).indexOf('.') != -1 &&
-						String(this.OutList.waterContent).length -
-						(String(this.OutList.waterContent).indexOf('.') + 1) >
-						2) ||
-					this.OutList.waterContent < 1 ||
-					this.OutList.waterContent > 40
-				) {
-					this.$api.msg('水分输入错误！')
-					return
-				}
-				if (!this.OutList.unitPrice) {
-					this.$api.msg('单价不能为空')
-					return
-				}
-				if (isNaN(this.OutList.unitPrice) ||
-					(String(this.OutList.unitPrice).indexOf('.') != -1 &&
-						String(this.OutList.unitPrice).length -
-						(String(this.OutList.unitPrice).indexOf('.') + 1) >
-						2) ||
-					this.OutList.unitPrice < 1 ||
-					this.OutList.unitPrice > 10000
-				) {
-					this.$api.msg('单价输入错误！')
-					return
-				}
+						this.$api.msg('品级不能为空')
+						return
+					}
+					if (!this.OutList.bulkDensity) {
+						this.$api.msg('容重不能为空')
+						return
+					}
+					if (this.OutList.bulkDensity < 500 || this.OutList.bulkDensity > 1000) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (String(this.OutList.bulkDensity).indexOf('.') != -1 && String(this.OutList.bulkDensity).length - (
+							String(this.OutList.bulkDensity).indexOf('.') + 1) > 0) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (!this.OutList.waterContent) {
+						this.$api.msg('水分不能为空')
+						return
+					}
+					if (isNaN(this.OutList.waterContent) ||
+						(String(this.OutList.waterContent).indexOf('.') != -1 &&
+							String(this.OutList.waterContent).length -
+							(String(this.OutList.waterContent).indexOf('.') + 1) >
+							2) ||
+						this.OutList.waterContent < 1 ||
+						this.OutList.waterContent > 40
+					) {
+						this.$api.msg('水分输入错误！')
+						return
+					}
+					if (!this.OutList.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+					if (isNaN(this.OutList.unitPrice) ||
+						(String(this.OutList.unitPrice).indexOf('.') != -1 &&
+							String(this.OutList.unitPrice).length -
+							(String(this.OutList.unitPrice).indexOf('.') + 1) >
+							2) ||
+						this.OutList.unitPrice < 1 ||
+						this.OutList.unitPrice > 10000
+					) {
+						this.$api.msg('单价输入错误！')
+						return
+					}
 				}
-				
+
 				if (this.OutList.taskTypeKey == 1) {
 					if (!this.OutList.businessDescribe) {
 						this.$api.msg('业务描述不能为空')
@@ -595,7 +613,7 @@
 						return
 					}
 				}
-				if (this.EnterList.taskTypeKey ==2 && this.EnterList.judge) {
+				if (this.EnterList.taskTypeKey == 2 && this.EnterList.judge) {
 					if (!this.EnterList.grade) {
 						this.$api.msg('品级不能为空')
 						return
@@ -608,7 +626,8 @@
 						this.$api.msg('容重输入错误')
 						return
 					}
-					if (String(this.EnterList.bulkDensity).indexOf('.') != -1 && String(this.EnterList.bulkDensity).length - (
+					if (String(this.EnterList.bulkDensity).indexOf('.') != -1 && String(this.EnterList.bulkDensity)
+						.length - (
 							String(this.EnterList.bulkDensity).indexOf('.') + 1) > 0) {
 						this.$api.msg('容重输入错误')
 						return
@@ -662,7 +681,7 @@
 						return
 					}
 				}
-				if(this.retreatList.taskTypeKey == 4 && this.retreatList.judge){
+				if (this.retreatList.taskTypeKey == 4 && this.retreatList.judge) {
 					if (!this.retreatList.grade) {
 						this.$api.msg('品级不能为空')
 						return
@@ -675,7 +694,8 @@
 						this.$api.msg('容重输入错误')
 						return
 					}
-					if (String(this.retreatList.bulkDensity).indexOf('.') != -1 && String(this.retreatList.bulkDensity).length - (
+					if (String(this.retreatList.bulkDensity).indexOf('.') != -1 && String(this.retreatList.bulkDensity)
+						.length - (
 							String(this.retreatList.bulkDensity).indexOf('.') + 1) > 0) {
 						this.$api.msg('容重输入错误')
 						return
@@ -857,6 +877,7 @@
 			}
 		}
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -865,10 +886,12 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
 </style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -9,8 +9,7 @@
 						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 						<image src="../../../static/img/daishenhe.png" mode=""
-							v-if="status == '审核中' || status == '待决策人审核'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
+							v-if="status == '审核中' || status == '待决策人审核'" style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{status}}</view>
 				</view>
@@ -50,8 +49,8 @@
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（通过）</view>
-				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="passSubmit()" type="success">确定</u-button>
@@ -61,26 +60,28 @@
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<!-- getRoles("acquisitionQuality.initial") -->
-			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click='show2 = true' type="success" class="btn2">通过</u-button>
-<!-- 			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='show2 = true' type="success" class="btn2">通过</u-button>
+			<!-- 			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button> -->
 		</view>
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				isSHowBtn: true,
 				height: 200,
 				autoHeight: true,
 				border: false,
-				show2:false,
-				show1:false,
+				show2: false,
+				show1: false,
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
@@ -88,12 +89,21 @@
 				rejectInfo1: "", //审核通过意见
 				List: [],
 				status: "",
-				updateDate:"",
-				warehouseName:"",
+				updateDate: "",
+				warehouseName: "",
+				everyCheck: ''
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
 		},
 		onShow(options) {
 			this.getList()
@@ -128,9 +138,10 @@
 			rejectSubmit() {
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
-				}else{
+				} else {
 					var that = this
 					that.show1 = false
+
 					if (this.List.length > 0) {
 						uni.showModal({
 							content: "确定驳回付款申请？",
@@ -144,13 +155,13 @@
 						})
 					}
 				}
-		
+
 			},
 			//通過
 			passSubmit() {
 				if (!this.rejectInfo1) {
 					this.$api.msg('审核意见不能为空！')
-				}else{
+				} else {
 					var that = this
 					this.show2 = false
 					uni.showModal({
@@ -164,9 +175,12 @@
 						}
 					})
 				}
-		
+
 			},
 			audit(item, index, status, status2, reason) {
+				uni.showLoading({
+					title: "审核中"
+				})
 				if (this.List.length > 0) {
 					if (status == true && item.status == "已驳回") {
 						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
@@ -191,16 +205,20 @@
 					}
 				} else {
 					if (status == true) {
-						that.$api.msg('通过成功')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
+						this.$api.msg('通过成功')
 					} else if (status == false) {
-						that.$api.msg('驳回成功')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
+						this.$api.msg('驳回成功')
 					}
+					let that = this
+					setTimeout(function() {
+
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+						uni.hideLoading()
+					}, 1000);
 				}
 			},
 		}
@@ -314,6 +332,7 @@
 			}
 		}
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -322,10 +341,12 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
 </style>

pages/task/audit/freight_setting_approval.vue

@@ -32,14 +32,14 @@
 					<view class="text_info">
 						{{list.sendPrivate}}{{list.sendCity}}{{list.sendArea}}{{list.sendDetailedAddress}}
 					</view>
-					
+
 				</u-form-item>
 				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
 					<!-- <u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled /> -->
 					<view class="text_info">
 						{{list.receivePrivate}}{{list.receiveCity}}{{list.receiveArea}}{{list.receiveDetailedAddress}}
 					</view>
-					
+
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
 					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
@@ -58,31 +58,43 @@
 				</view>
 			</view>
 		</u-popup> -->
-		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button>
+		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
+		</u-button>
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				isSHowBtn: true,
+				everyCheck: '',
 				list: {
 					priceStatus: "",
 				},
 				id: "",
-				show1:false,
-				rejectInfo:"",//审核意见
+				show1: false,
+				rejectInfo: "", //审核意见
 				//弹窗属性
 				// height:200,
 				// autoHeight: true,
 				// border: false,
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
 			this.getList()
 		},
 		computed: {
@@ -105,13 +117,16 @@
 				// if (!this.rejectInfo1) {
 				// 	this.$api.msg('审核意见不能为空！')
 				// }else{
-				
+
 				// }
 				uni.showModal({
 					content: "是否通过该设置?",
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
+						uni.showLoading({
+							title: "审核中"
+						})
 						if (res.confirm) {
 							var tranProcessInfo = {}
 							tranProcessInfo.id = that.list.id
@@ -124,10 +139,15 @@
 									if (res.data.code == 200) {
 										that.$api.msg('审核通过成功!')
 										setTimeout(function() {
-											uni.navigateBack()
+											if (that.everyCheck) {
+												helper.setAudit(that.list)
+											} else {
+												uni.navigateBack()
+											}
+											uni.hideLoading()
 										}, 1000);
 									}
-							})
+								})
 						}
 					}
 				})
@@ -197,6 +217,7 @@
 		border-radius: 40rpx;
 		margin-top: 40rpx;
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -205,13 +226,16 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
-	.text_info{
+
+	.text_info {
 		display: flex;
 		width: 100%;
 		justify-content: flex-end;

pages/task/audit/freight_settlement_approval.vue

@@ -77,16 +77,18 @@
 		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click="show1 = true" type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click="show2 = true" type="success" class="btn2">通过</u-button>
+			<u-button v-if='isSHowBtn' @click="show1 = true" type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click="show2 = true" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	export default {
 		data() {
 			return {
+				isSHowBtn: true,
 				currentPage: 1,
 				pageSize: 10,
 				list: {
@@ -99,10 +101,19 @@
 				height: 200,
 				autoHeight: true,
 				border: false,
+				everyCheck: ''
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
 			this.getList()
 		},
 		methods: {
@@ -169,6 +180,10 @@
 			},
 			//审核方法
 			audit(list, index, status, status2, reason) {
+				uni.showLoading({
+					title: "审核中"
+				})
+				let that = this
 				if (this.list) {
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: list.taskId,
@@ -178,15 +193,16 @@
 					}).then(res => {
 						if (status == true) {
 							this.$api.msg('通过成功')
-							setTimeout(function() {
-								uni.navigateBack()
-							}, 1000);
 						} else if (status == false) {
 							this.$api.msg('驳回成功')
-							setTimeout(function() {
-								uni.navigateBack()
-							}, 1000);
 						}
+						setTimeout(function() {
+							if (that.everyCheck) {
+								helper.setAudit(that.list)
+							} else {
+								uni.navigateBack()
+							}
+						}, 1000);
 					})
 				}
 			},

pages/task/audit/purchase_settlement_approval.vue

@@ -8,8 +8,9 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].status == '审核中'||list[0].status == '未审核'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="list[0].status == '审核中'||list[0].status == '未审核'" style="height: 40rpx;"></image>
+						<!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list[0].status}}</view>
 				</view>
@@ -34,7 +35,8 @@
 					</view>
 					<view class="row">
 						<view class="left car-type-item">扣款</view>
-						<view class="right weightInfoCss">￥{{item.deductionAmountchange?item.deductionAmountchange:"0"}}/吨</view>
+						<view class="right weightInfoCss">
+							￥{{item.deductionAmountchange?item.deductionAmountchange:"0"}}/吨</view>
 					</view>
 					<view class="row ">
 						<view class="left money">应付</view>
@@ -46,8 +48,8 @@
 		<u-popup v-model="show1" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（驳回）</view>
-				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="rejectSubmit()" type="success">确定</u-button>
@@ -57,8 +59,8 @@
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（通过）</view>
-				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="passSubmit()" type="success">确定</u-button>
@@ -66,40 +68,49 @@
 			</view>
 		</u-popup>
 		<u-toast ref="uToast" />
-		
+
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
+			<u-button v-if='isSHowBtn' @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	export default {
 		data() {
 			return {
+				isSHowBtn: true,
+				everyCheck: '',
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [
-					{
-						status:"",
-					}
-				],
+				list: [{
+					status: "",
+				}],
 				contractNo: "",
 				rejectInfo: "",
 				rejectInfo1: "",
-				show1:false,
-				show2:false,
+				show1: false,
+				show2: false,
 				height: 200,
 				autoHeight: true,
 				border: false,
-				unitPrice:"",
-				goodsName:"",
+				unitPrice: "",
+				goodsName: "",
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
+			this.everyCheck = uni.getStorageSync("everyTask")
 			this.id = options.id
+			this.isSHowBtn = options.isShowbtn
 			this.getList()
 		},
 		methods: {
@@ -132,18 +143,18 @@
 				} else {
 					if (!this.rejectInfo) {
 						this.$api.msg('驳回原因不能为空！')
-					}else{
+					} else {
 						that.show1 = false
-					uni.showModal({
-						content: "是否确定驳回？",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, '已驳回')
+						uni.showModal({
+							content: "是否确定驳回？",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									that.audit(that.list[0], 0, false, true, '已驳回')
+								}
 							}
-						}
-					})
+						})
 					}
 				}
 			},
@@ -153,25 +164,28 @@
 				if (this.list.length == 0) {
 					that.$api.msg('没有要审核的条目！')
 				} else {
-				if (!this.rejectInfo1) {
-					this.$api.msg('审核意见不能为空！')
-				}else{
-					that.show2 = false
-					uni.showModal({
-						content: "是否确定通过？",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2)
+					if (!this.rejectInfo1) {
+						this.$api.msg('审核意见不能为空！')
+					} else {
+						that.show2 = false
+						uni.showModal({
+							content: "是否确定通过？",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									that.audit(that.list[0], 0, true, 2)
+								}
 							}
-						}
-					})
+						})
 					}
 				}
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
+				uni.showLoading({
+					title: "审核中"
+				})
 				if (index < this.list.length) {
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
@@ -183,16 +197,18 @@
 					})
 				} else {
 					if (status == true) {
-						this.$api.msg('通过成功')
-						// setTimeout(function() {
-						// 		uni.navigateBack()
-						// }, 1000);
+						that.$api.msg('通过成功')
 					} else if (status == false) {
-						this.$api.msg('驳回成功')
-						setTimeout(function() {
-								uni.navigateBack()
-						}, 1000);
+						that.$api.msg('驳回成功')
 					}
+					setTimeout(function() {
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+						uni.hideLoading()
+					}, 1000);
 				}
 			},
 		}
@@ -206,6 +222,7 @@
 
 	.content {
 		margin-top: 30rpx;
+
 		.top {
 			display: flex;
 			justify-content: space-between;
@@ -225,7 +242,8 @@
 			text-align: left;
 			margin: 20rpx 0;
 		}
-		.car-container{
+
+		.car-container {
 			border-bottom: 2rpx solid #EEEEEE;
 		}
 
@@ -254,7 +272,7 @@
 		.money {
 			font-size: 32rpx;
 			font-weight: 500;
-			margin-bottom: 30rpx ;
+			margin-bottom: 30rpx;
 		}
 
 		.moneyInfo {
@@ -262,67 +280,75 @@
 			font-size: 32rpx;
 		}
 	}
-.bottom-btn {
+
+	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom:0;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
 		left: 0;
 		background-color: #f8f8f8;
 		flex-direction: column;
-		.btn1,.btn2{
+
+		.btn1,
+		.btn2 {
 			width: 100%;
 			margin-bottom: 26rpx;
 			border-radius: 90rpx;
 		}
-		.btn1{
+
+		.btn1 {
 			background: white;
 			color: #00C265;
 		}
-		}
-		.topInfo {
-			height: 210rpx;
-			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
-			padding: 30rpx;
-		
-			.topInfo-item {
-				height: 150rpx;
-				background-color: #FFFFFF;
-				border-radius: 20rpx;
-				padding: 40rpx;
-		
-				.logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-top: 8rpx;
-				}
-		
-				.infoText {
-					font-size: 36rpx;
-					font-weight: 600;
-					margin-left: 20rpx;
-				}
-		
-				.infoData {
-					color: #878C9C;
-					font-size: 26rpx;
-					margin-top: 10rpx;
-				}
+	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
 			}
 		}
-		.rejectInfoCss {
-			border: 1px solid #ccc;
-			border-radius: 10rpx;
-			background-color: #F9F9FA;
-			// height: 100px;
-			overflow-y: auto;
-			margin: 30rpx;
-		}
-		.rejectText {
-			text-align: center;
-		}
-		/deep/.u-input__textarea{
-			height: 300rpx!important;
-		}
+	}
+
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+
+	.rejectText {
+		text-align: center;
+	}
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
 </style>

pages/task/audit/purchasecontract.vue

@@ -118,7 +118,7 @@
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息">
 			</u-form-item>
-			<u-form-item >
+			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="附件">
@@ -136,9 +136,10 @@
 			</u-form-item>
 		</u-form>
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus' @click='reject' type="error" class="btn1" hover-class='none'>驳回
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
+				驳回
 			</u-button>
-			<u-button v-if='list.approveStatus' @click='pass' type="success" class="btn2">通过</u-button>
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -163,19 +164,21 @@
 
 <script>
 	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
 	export default {
 		components: {
 			upload
 		},
 		data() {
 			return {
+				isSHowBtn: true,
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
 				list: {
 					status: "",
 					contractGoodsInfo: {},
-					contractProcessInfo:{}
+					contractProcessInfo: {}
 				},
 				imglist: [],
 				auditMind: '',
@@ -185,18 +188,28 @@
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
-				imgShow:false,
-				url:"",
+				imgShow: false,
+				url: "",
+				everyCheck: ''
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
 			this.getList()
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
+
 		},
 		methods: {
-			shadeshow(url){
-				this.imgShow=true
-				this.url=url
+			shadeshow(url) {
+				this.imgShow = true
+				this.url = url
 			},
 			getList(id) {
 				var that = this
@@ -245,11 +258,15 @@
 					auditMind: this.auditMind,
 					needReapply: true,
 				}).then(res => {
-					uni.hideLoading()
 					that.$api.msg('驳回成功')
 					that.show = false
 					setTimeout(function() {
-						uni.navigateBack()
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+						uni.hideLoading()
 					}, 1000);
 				})
 			},
@@ -280,11 +297,15 @@
 						auditMind: this.auditMind,
 						needReapply: true,
 					}).then(res => {
-						uni.hideLoading()
 						that.$api.msg('通过成功')
 						that.show = false
 						setTimeout(function() {
-							uni.navigateBack()
+							if (that.everyCheck) {
+								helper.setAudit(that.list)
+							} else {
+								uni.navigateBack()
+							}
+							uni.hideLoading()
 						}, 1000);
 					})
 				}
@@ -292,6 +313,7 @@
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
+
 				if (index < this.list.length) {
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
@@ -494,20 +516,24 @@
 		width: 100%;
 		text-align: right;
 	}
-	.shade{
-		background:#000;
-		position:fixed;
-		top:0;left:0;
-	   width:100%;height:100%;
-	   z-index:10000;
+
+	.shade {
+		background: #000;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
 	}
-	.textarea{
-		margin:20px auto;
+
+	.textarea {
+		margin: 20px auto;
 		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
 		border: 1px solid #EEEEEE;
-		font-size:28rpx;
-		padding:10px;
+		font-size: 28rpx;
+		padding: 10px;
 	}
 </style>

pages/task/audit/salecontract.vue

@@ -137,11 +137,13 @@
 			</u-form-item>
 		</u-form>
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus' @click='reject' type="error" class="btn1" hover-class='none'>驳回
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='show1 = true' type="error" class="btn1"
+				hover-class='none'>驳回
+			</u-button>
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='show2 = true' type="success" class="btn2">通过
 			</u-button>
-			<u-button v-if='list.approveStatus' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
-		<view v-if='show' class="shade">
+		<!-- <view v-if='show' class="shade">
 			<view class="wrap">
 				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>
 					{{title}}
@@ -153,7 +155,30 @@
 				<view @click='passSubmit()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
-		</view>
+		</view> -->
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（驳回）</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（通过）</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+
 		<view @click='imgShow=false' v-if="imgShow" class="shade">
 			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
 		</view>
@@ -162,12 +187,14 @@
 
 <script>
 	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
 	export default {
 		components: {
 			upload
 		},
 		data() {
 			return {
+				everyCheck: '',
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
@@ -179,17 +206,33 @@
 				imglist: [],
 				auditMind: '',
 				show: false,
+				show1: false,
+				show2: false,
 				title: '',
 				contractNo: "",
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				url: "",
-				imgShow: false
+				imgShow: false,
+				height: 200,
+				autoHeight: true,
+				border: false,
+				rejectInfo: "",
+				rejectInfo1: "",
+				isSHowBtn: true,
 			}
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
 			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
 			this.getList()
 		},
 		methods: {
@@ -247,12 +290,20 @@
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
-					auditMind: this.auditMind,
+					auditMind: this.rejectInfo,
 					needReapply: true,
 				}).then(res => {
-					uni.hideLoading()
 					that.$api.msg('驳回成功')
 					that.show = false
+					setTimeout(function() {
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+
+						uni.hideLoading()
+					}, 1000);
 				})
 			},
 			pass() {
@@ -273,14 +324,18 @@
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: true,
-					auditMind: this.auditMind,
+					auditMind: this.rejectInfo1,
 					needReapply: true,
 				}).then(res => {
-					uni.hideLoading()
 					that.$api.msg('通过成功')
 					that.show = false
 					setTimeout(function() {
-						uni.navigateBack()
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+						uni.hideLoading()
 					}, 1000);
 				})
 			},
@@ -507,4 +562,21 @@
 		font-size: 28rpx;
 		padding: 10px;
 	}
+
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+
+	.rejectText {
+		text-align: center;
+	}
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -62,8 +62,10 @@
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">{{item.basePrice}}</view>
 				</view>
-				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1" :class="index1==item.modelList.length-1?'boder':''">
-					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
+				<view class="row" v-for="(item1,index1) in item.modelList" :key="index1"
+					:class="index1==item.modelList.length-1?'boder':''">
+					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）
+					</view>
 					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
 				</view>
@@ -83,8 +85,8 @@
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（通过）</view>
-				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="audit()" type="success">确定</u-button>
@@ -93,13 +95,14 @@
 		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
+			<u-button v-if='isSHowBtn' @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
@@ -107,14 +110,16 @@
 		name: "task",
 		data() {
 			return {
+				everyCheck: '',
+				isSHowBtn: true,
 				show: false,
 				height: 200,
 				autoHeight: true,
 				border: false,
-				show2:false,
-				show1:false,
-				rejectInfo:"",
-				rejectInfo1:"",
+				show2: false,
+				show1: false,
+				rejectInfo: "",
+				rejectInfo1: "",
 				id: 0,
 				list: {},
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
@@ -125,8 +130,16 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onBackPress(e) {
+			uni.navigateTo({
+				url: "/pages/task/my_task"
+			})
+			return true;
+		},
 		onLoad(options) {
+			this.everyCheck = uni.getStorageSync("everyTask")
 			this.id = options.id
+			this.isSHowBtn = options.isShowbtn
 		},
 		onShow() {
 			var that = this
@@ -151,7 +164,7 @@
 			audit() {
 				if (!this.rejectInfo1) {
 					this.$api.msg('审核意见不能为空！')
-				}else{
+				} else {
 					var that = this
 					that.show2 = false
 					uni.showModal({
@@ -160,27 +173,36 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
-									if (res.data.code == 200) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
-											approved: true,
-											auditMind: that.rejectInfo1,
-											needReapply: true,
-											taskId:  that.list.taskId,
-										}).then(res1 => {
-											if (res1.data.code == 200) {
-												that.$api.msg('审核成功');
-												setTimeout(function() {
-														uni.navigateBack()
-												}, 1000);
-											} else {
-												that.$api.msg(res1.data.message);
-											}
-										})
-									} else {
-										that.$api.msg('系统异常，请联系管理员');
-									}
+								uni.showLoading({
+									title: "审核中"
 								})
+								that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
+									.then(res => {
+										if (res.data.code == 200) {
+											that.$api.doRequest('post', '/workflow/api/handle', {
+												approved: true,
+												auditMind: that.rejectInfo1,
+												needReapply: true,
+												taskId: that.list.taskId,
+											}).then(res1 => {
+												if (res1.data.code == 200) {
+													that.$api.msg('审核成功');
+													setTimeout(function() {
+														if (this.everyCheck) {
+															helper.setAudit(that.list)
+														} else {
+															uni.navigateBack()
+														}
+														uni.hideLoading()
+													}, 1000);
+												} else {
+													that.$api.msg(res1.data.message);
+												}
+											})
+										} else {
+											that.$api.msg('系统异常，请联系管理员');
+										}
+									})
 							}
 						}
 					})
@@ -189,7 +211,7 @@
 			reject() {
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
-				}else{
+				} else {
 					var that = this
 					that.show1 = false
 					uni.showModal({
@@ -207,7 +229,12 @@
 									if (res1.data.code == 200) {
 										that.$api.msg('驳回成功');
 										setTimeout(function() {
+											if (that.everyCheck) {
+												helper.setAudit(that.list)
+											} else {
 												uni.navigateBack()
+											}
+											uni.hideLoading()
 										}, 1000);
 									} else {
 										that.$api.msg(res1.data.message);
@@ -262,18 +289,21 @@
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom:0;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
 		left: 0;
 		background-color: #f8f8f8;
 		flex-direction: column;
-		.btn1,.btn2{
+
+		.btn1,
+		.btn2 {
 			width: 100%;
 			margin-bottom: 26rpx;
 			border-radius: 90rpx;
 		}
-		.btn1{
+
+		.btn1 {
 			background: white;
 			color: #00C265;
 		}
@@ -284,33 +314,35 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.boder{
-		border:0;
-		border-bottom: 0!important;
+
+	.boder {
+		border: 0;
+		border-bottom: 0 !important;
 	}
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-	
+
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-	
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-	
+
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
@@ -318,6 +350,7 @@
 			}
 		}
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -326,10 +359,12 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
 </style>

pages/task/my_task.vue

@@ -5,10 +5,17 @@
 				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
-			<view>
-				<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-				<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			<view class="top2">
+				<view class="left">
+					<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+					<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+				</view>
+				<view class="right">
+					<view class="right-contrent1">逐条审核</view>
+					<u-switch v-model="checked" active-color="#22C572" inactive-color="#eee" size='40'></u-switch>
+				</view>
 			</view>
+
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" @click="navToDetailPage(item)">
@@ -49,6 +56,7 @@
 			return {
 				PageCur: "task",
 				taskInfo: [],
+				checked: false,
 				pages: 1, //页数
 				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
@@ -68,13 +76,102 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				keyword: ""
+				keyword: "",
+				copyTaskInfo: []
 			};
 		},
+		watch: {
+			checked(val) {
+				uni.setStorageSync("everyTask", this.checked)
+			},
+			taskInfo: function(val) {
+				this.copyTaskInfo = this.$u.deepClone(this.taskInfo);
+				//添加跳转链接
+				for (let i = 0; i < this.copyTaskInfo.length; i++) {
+					let item = this.copyTaskInfo[i]
+					if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
+						item.itemUrl = '/pages/task/procurement_details?id=' + item.businessId
+					} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
+						item.itemUrl = '/pages/task/sale_details?id=' + item.businessId
+					} else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
+						item.itemUrl = '/pages/task/audit/salecontract?id=' + item.businessId
+					} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
+						item.itemUrl = '/pages/task/audit/purchasecontract?id=' + item.businessId
+					} else if (item.businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
+						item.itemUrl = '/pages/task/procurement_report_details?id=' + item.businessId
+					} else if (item.businessCode == 'PROCUREMENT-CLOSE-REPORT') {
+						item.itemUrl = '/pages/task/procurement_close_details?id=' + item.businessId
+					} else if (item.businessCode == 'SALE-RECEIPT-REPORT') {
+						item.itemUrl = '/pages/task/sale_report_details?id=' + item.businessId
+					} else if (item.businessCode == 'SALE-CLOSE-REPORT') {
+						item.itemUrl = '/pages/task/sale_close_details?id=' + item.businessId
+					} else if (item.businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/warehouse_approval?id=${item.businessId}`
+						} else {
+							item.itemUrl = '/pages/task/audit/warehouse_details/?id=' + item.businessId
+						}
+					} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}`
+						} else {
+							item.itemUrl = '/pages/task/audit/acquisition_settlement_details/?id=' + item.businessId
+						}
+					} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId
+						}
+
+					} else if (item.businessCode == 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/purchase_settlement_approval?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/purchase_settlement_details?id=` + item.businessId
+						}
+					} else if (item.businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/freight_settlement_approval?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/freight_settlement_details?id=` + item.businessId +
+								'&compId=' + this
+								.pcUserInfo.compId
+						}
+					} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/freight_setting_approval?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/freight_setting_details?id=` + item.businessId
+						}
+					}
+					if (item.taskType == "入库任务") {
+
+						if (item.statusFlag == 3) {
+							item.itemUrl = `/pageD/warehousings/warehousingDetails?id=${item.id}`
+						} else {
+							item.itemUrl =
+								`/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+						}
+					} else if (item.taskType == "出库任务") {
+						if (item.statusFlag == 3) {
+							item.itemUrl = `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+						} else {
+							item.itemUrl =
+								`/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+						}
+					}
+
+				}
+				console.log('监听列表数据', this.copyTaskInfo)
+				uni.setStorageSync("copyTaskInfo", this.copyTaskInfo)
+			}
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
+			this.checked = uni.getStorageSync("everyTask")
 			this.warehouseInOutInfo.currentPage = 1
 			this.data.currentPage = 1
 			this.taskInfo = []
@@ -104,7 +201,7 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.pages+=1
+				this.pages += 1
 				if (this.statusFlag == 1) {
 					this.warehouseInOutInfo.currentPage += 1
 				} else {
@@ -170,6 +267,9 @@
 			// 	}
 			// 	return false
 			// },
+			change(status) {
+				console.log(status);
+			},
 			searchKeyWord() {
 				if (!this.keyword) {
 					this.$api.msg('关键字不能为空')
@@ -188,7 +288,7 @@
 								icon: 'none',
 								duration: 2000
 							})
-							uni.hideLoading(this.taskInfo,"信息")
+							uni.hideLoading(this.taskInfo, "信息")
 						}
 						console.log()
 					}).catch(res => {
@@ -218,7 +318,7 @@
 				}
 				data.currentPage = pages
 				data.pageSize = limit
-				
+
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
@@ -241,12 +341,12 @@
 						for (var i = 0; i < this.taskInfo.length; i++) {
 							let _str = this.taskInfo[i]
 							// let a = this.getRoles()
-							if(_str.messageContent.indexOf("您发起")>-1){
+							if (_str.messageContent.indexOf("您发起") > -1) {
 								_str.showRow = false
-							}else{
+							} else {
 								_str.showRow = true;
 							}
-							this.taskInfo[i].department=this.taskInfo[i].messageContent.split(' ')[0]
+							this.taskInfo[i].department = this.taskInfo[i].messageContent.split(' ')[0]
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '出入库任务'
@@ -255,7 +355,7 @@
 								if (this.taskInfo[i].businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 									this.taskInfo[i].messageTitle = '付款管理'
 								}
-								
+
 							} else if (this.taskInfo[i].businessType == 'REPORT') {
 								if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
 									this.taskInfo[i].messageTitle = '采购平仓统计'
@@ -328,105 +428,106 @@
 			navToDetailPage(item) {
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
-						url: '/pages/task/procurement_details?id=' + item.businessId
+						url: '/pages/task/procurement_details?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
 					uni.navigateTo({
-						url: '/pages/task/sale_details?id=' + item.businessId
+						url: '/pages/task/sale_details?id=' + item.businessId + "&isShowbtn=true"
 					})
-				} 
-				else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
+				} else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
 					uni.navigateTo({
-						url: '/pages/task/audit/salecontract?id=' + item.businessId
+						url: '/pages/task/audit/salecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
-				}else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
+				} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
 					uni.navigateTo({
-						url: '/pages/task/audit/purchasecontract?id=' + item.businessId
+						url: '/pages/task/audit/purchasecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url: '/pages/task/procurement_report_details?id=' + item.businessId
+						url: '/pages/task/procurement_report_details?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'PROCUREMENT-CLOSE-REPORT') {
 					uni.navigateTo({
-						url: '/pages/task/procurement_close_details?id=' + item.businessId
+						url: '/pages/task/procurement_close_details?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'SALE-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url: '/pages/task/sale_report_details?id=' + item.businessId
+						url: '/pages/task/sale_report_details?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'SALE-CLOSE-REPORT') {
 					uni.navigateTo({
-						url: '/pages/task/sale_close_details?id=' + item.businessId
+						url: '/pages/task/sale_close_details?id=' + item.businessId + "&isShowbtn=true"
 					})
 				} else if (item.businessCode == 'PROCUREMENT-PRICE-APPROVE') {
-					if(this.statusFlag==1){
+					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/warehouse_approval?id=${item.businessId}`
+							url: `/pages/task/audit/warehouse_approval?id=${item.businessId}&isShowbtn=true`
 						})
-					}else{
+					} else {
 						uni.navigateTo({
-							url: '/pages/task/audit/warehouse_details/?id=' + item.businessId
+							url: '/pages/task/audit/warehouse_details/?id=' + item.businessId + "&isShowbtn=true"
 						})
 					}
 				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
-					if(this.statusFlag==1){
+					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}`
+							url: `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}&isShowbtn=true`
 						})
-					}else{
+
+					} else {
 						uni.navigateTo({
-							url: '/pages/task/audit/acquisition_settlement_details/?id=' + item.businessId
+							url: '/pages/task/audit/acquisition_settlement_details/?id=' + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+				} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId
-							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId
+							url: `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
 
-				}else if (item.businessCode == 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
+				} else if (item.businessCode == 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/purchase_settlement_approval?id=` + item.businessId
-							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/purchase_settlement_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/purchase_settlement_details?id=` + item.businessId
+							url: `/pages/task/audit/purchase_settlement_details?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
+				} else if (item.businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/freight_settlement_approval?id=` + item.businessId
-							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/freight_settlement_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/freight_settlement_details?id=` + item.businessId + '&compId=' + this
-								.pcUserInfo.compId
+							url: `/pages/task/audit/freight_settlement_details?id=` + item.businessId +
+								'&compId=' + this
+								.pcUserInfo.compId + "&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+				} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId
-							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId
+							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
 				}
@@ -434,21 +535,23 @@
 
 					if (item.statusFlag == 3) {
 						uni.navigateTo({
-							url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+							url: `/pageD/warehousings/warehousingDetails?id=${item.id}&isShowbtn=true`
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+							url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}&isShowbtn=true`
 						})
+
 					}
 				} else if (item.taskType == "出库任务") {
 					if (item.statusFlag == 3) {
 						uni.navigateTo({
-							url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+							url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}&isShowbtn=true`
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+							url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}&isShowbtn=true`
+
 						})
 					}
 				}
@@ -467,9 +570,11 @@
 		border-radius: 3px;
 		margin: 3px;
 	}
-	.introduce-section{
+
+	.introduce-section {
 		// background: red;
 	}
+
 	.introduce-section .title_b .title-tip {
 		font-size: 13px;
 		height: 40px;
@@ -508,7 +613,7 @@
 		height: 50px;
 		line-height: 50px;
 		border-bottom: 1px solid #EEEEEE;
-		
+
 	}
 
 	.introduce-section .title .title-tip-a {
@@ -554,18 +659,37 @@
 	/deep/.u-action-active {
 		margin-right: 6px;
 	}
-	.content1-top{
+
+	.content1-top {
 		background: white;
 		padding: 20rpx;
 		border-radius: 0 0 30rpx 30rpx;
 	}
-	.search-form{
+
+	.search-form {
 		margin-bottom: 20rpx;
 	}
-	.title-row1{
+
+	.title-row1 {
 		font-size: 34rpx;
 	}
-	.row2{
+
+	.row2 {
 		margin-top: 55rpx;
 	}
+
+	.top2 {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.right {
+			display: flex;
+			align-items: center;
+
+			.right-contrent1 {
+				margin: 20rpx;
+			}
+		}
+	}
 </style>

pages/user/user.vue

@@ -328,7 +328,6 @@
 						// });
 					}
 				})
-				// debugger
 				if (!uni.getStorageSync('compName')) {
 					this.$api.doRequest('get', '/commonUser/getCompOwn', {
 						phone: this.userInfo.phone