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

# Conflicts:
#	config/index.js

config/index.js

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

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -246,32 +246,29 @@
 				</view>
 			</u-form>
 		</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 v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</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 class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
-		</u-popup>
+		</view>
 		<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 @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 
@@ -295,10 +292,7 @@
 				retreatList: {}, //退
 				type: '移库',
 				show: false,
-				show1: false,
-				show2: false,
-				rejectInfo: "", //驳回原因
-				rejectInfo1: "", //通过意见
+				auditMind: '',
 				pjList: [{
 						type: '一等品'
 					},
@@ -371,12 +365,24 @@
 				this.EnterList.grade = this.pjList[e[0]].type
 				this.EnterList.gradeKey = e[0] + 1
 			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
 			passSubmit() {
-				if (!this.rejectInfo1) {
-					this.$api.msg('审核意见不能为空！')
+				var that = this
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
 				} else {
 					let that = this
-					that.show2 = false
+					that.show = false
 					uni.showModal({
 						content: "是否确定通过?",
 						showCancel: true,
@@ -414,7 +420,7 @@
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
-					this.show1 = false
+					this.show = false
 					let that = this
 					uni.showModal({
 						content: "是否确定驳回?",
@@ -878,17 +884,84 @@
 		}
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
 	}
 
-	.rejectText {
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
 		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
 	}
 
 	/deep/.u-input__textarea {

pages/task/audit/acquisition_settlement_approval.vue

@@ -35,35 +35,30 @@
 				</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" 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 v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</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 class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
-		</u-popup>
+		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<!-- getRoles("acquisitionQuality.initial") -->
-			<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> -->
+			<u-button v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -80,13 +75,12 @@
 				height: 200,
 				autoHeight: true,
 				border: false,
-				show2: false,
-				show1: false,
+				title: '',
+				show: false,
+				auditMind:'',
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
-				rejectInfo: "", //审核驳回意见
-				rejectInfo1: "", //审核通过意见
 				List: [],
 				status: "",
 				updateDate: "",
@@ -134,13 +128,24 @@
 					}
 				})
 			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
 			//驳回
 			rejectSubmit() {
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
 					var that = this
-					that.show1 = false
+					that.show = false
 
 					if (this.List.length > 0) {
 						uni.showModal({
@@ -159,11 +164,12 @@
 			},
 			//通過
 			passSubmit() {
-				if (!this.rejectInfo1) {
-					this.$api.msg('审核意见不能为空！')
+				var that = this
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
 				} else {
 					var that = this
-					this.show2 = false
+					this.show = false
 					uni.showModal({
 						content: "确定通过付款申请？",
 						showCancel: true,
@@ -333,17 +339,84 @@
 		}
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
 	}
 
-	.rejectText {
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
 		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
 	}
 
 	/deep/.u-input__textarea {

pages/task/audit/freight_setting_approval.vue

@@ -77,7 +77,7 @@
 					priceStatus: "",
 				},
 				id: "",
-				show1: false,
+				show: false,
 				rejectInfo: "", //审核意见
 				//弹窗属性
 				// height:200,
@@ -148,6 +148,8 @@
 										}, 1000);
 									}
 								})
+						} else {
+							uni.hideLoading()
 						}
 					}
 				})

pages/task/audit/freight_settlement_approval.vue

@@ -53,32 +53,29 @@
 				</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" 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 v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</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 class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
-		</u-popup>
+		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<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 v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -94,11 +91,10 @@
 				list: {
 					approveStatus: "",
 				},
-				rejectInfo: "",
-				rejectInfo1: "",
-				show1: false,
-				show2: false,
+				title: '',
+				show: false,
 				height: 200,
+				auditMind:'',
 				autoHeight: true,
 				border: false,
 				everyCheck: ''
@@ -139,13 +135,24 @@
 					}
 				})
 			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
 			// 驳回
 			rejectSubmit() {
 				var that = this
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
-					this.show1 = false
+					this.show = false
 					uni.showModal({
 						content: "是否确定驳回?",
 						showCancel: true,
@@ -162,10 +169,10 @@
 			//通过
 			passSubmit() {
 				var that = this
-				if (!this.rejectInfo1) {
-					this.$api.msg('审核意见不能为空！')
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
 				} else {
-					this.show2 = false
+					this.show = false
 					uni.showModal({
 						content: "是否确定通过?",
 						showCancel: true,
@@ -344,17 +351,84 @@
 		}
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
 	}
 
-	.rejectText {
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
 		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
 	}
 
 	/deep/.u-input__textarea {

pages/task/audit/purchase_settlement_approval.vue

@@ -45,33 +45,29 @@
 				</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>
+		<u-toast ref="uToast" />
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</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 class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
-		</u-popup>
-		<u-toast ref="uToast" />
-
+		</view>
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<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 v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -90,10 +86,9 @@
 					status: "",
 				}],
 				contractNo: "",
-				rejectInfo: "",
-				rejectInfo1: "",
-				show1: false,
-				show2: false,
+				title: '',
+				show: false,
+				auditMind: '',
 				height: 200,
 				autoHeight: true,
 				border: false,
@@ -135,6 +130,17 @@
 					}
 				})
 			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
 			//驳回
 			rejectSubmit() {
 				var that = this
@@ -161,8 +167,8 @@
 			//通过
 			passSubmit() {
 				var that = this
-				if (this.list.length == 0) {
-					that.$api.msg('没有要审核的条目！')
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
 				} else {
 					if (!this.rejectInfo1) {
 						this.$api.msg('审核意见不能为空！')
@@ -335,17 +341,84 @@
 		}
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
 	}
 
-	.rejectText {
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
 		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
 	}
 
 	/deep/.u-input__textarea {

pages/task/audit/purchasecontract.vue

@@ -143,14 +143,18 @@
 		</view>
 		<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}}
-					<u-icon name="close"></u-icon>
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view style='padding:10px;'>
-					<input v-model='auditMind' v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text"
-						value="" />
-					<input v-model='auditMind' v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -275,16 +279,16 @@
 			},
 			pass() {
 				this.show = true
-				this.title = '审核意见'
+				this.title = '审核意见（通过）'
 			},
 			reject() {
 				this.show = true
-				this.title = '驳回原因'
+				this.title = '驳回原因（驳回）'
 			},
 			//通过
 			passSubmit() {
 				var that = this
-				if (this.title == '驳回原因') {
+				if (this.title == '驳回原因（驳回）') {
 					this.rejectSubmit()
 				} else {
 					uni.showLoading({
@@ -474,7 +478,7 @@
 		left: 0;
 		height: 100%;
 		width: 100%;
-		background: rgba(0, 0, 0, 0.1);
+		background: rgba(0, 0, 0, 0.4);
 		z-index: 3;
 
 		.wrap {
@@ -485,8 +489,28 @@
 			bottom: 0;
 			margin: auto;
 			background: #fff;
-			width: 80%;
-			height: 30%;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
 		}
 	}
 
@@ -499,15 +523,18 @@
 		bottom: 0;
 		padding: 10px;
 		border-top: 1px solid #eee;
+		font-size: 34rpx;
 	}
 
 	.cancel {
 		left: 0;
 		border-right: 1px solid #eee;
+		color: #AFB3BF;
 	}
 
 	.confirm {
 		right: 0;
+		color: #22C572;
 	}
 
 	.textCss {
@@ -517,15 +544,6 @@
 		text-align: right;
 	}
 
-	.shade {
-		background: #000;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 10000;
-	}
 
 	.textarea {
 		margin: 20px auto;
@@ -536,4 +554,20 @@
 		font-size: 28rpx;
 		padding: 10px;
 	}
+
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -137,47 +137,31 @@
 			</u-form-item>
 		</u-form>
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus||isSHowBtn' @click='show1 = true' 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||isSHowBtn' @click='show2 = true' type="success" class="btn2">通过
+			<u-button v-if='list.approveStatus||isSHowBtn' @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}}
-					<u-icon name="close"></u-icon>
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view style='padding:10px;'>
-					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
-				<view @click='passSubmit()' class="cancel">取消</view>
+				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</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>
 
 		<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>
@@ -204,11 +188,9 @@
 					contractProcessInfo: {}
 				},
 				imglist: [],
+				title: '',
 				auditMind: '',
 				show: false,
-				show1: false,
-				show2: false,
-				title: '',
 				contractNo: "",
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -280,6 +262,17 @@
 					this.isAdd = false;
 				}
 			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
 			//驳回
 			rejectSubmit() {
 				var that = this
@@ -317,27 +310,34 @@
 			//通过
 			passSubmit() {
 				var that = this
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				that.$api.doRequest('post', '/workflow/api/handle', {
-					taskId: that.list.taskId,
-					approved: true,
-					auditMind: this.rejectInfo1,
-					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);
-				})
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
+				} else {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					that.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: that.list.taskId,
+						approved: true,
+						auditMind: this.rejectInfo1,
+						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);
+					})
+				}
+
+
+
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -501,7 +501,7 @@
 		left: 0;
 		height: 100%;
 		width: 100%;
-		background: rgba(0, 0, 0, 0.1);
+		background: rgba(0, 0, 0, 0.4);
 		z-index: 3;
 
 		.wrap {
@@ -512,8 +512,28 @@
 			bottom: 0;
 			margin: auto;
 			background: #fff;
-			width: 80%;
-			height: 30%;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
 		}
 	}
 
@@ -526,31 +546,18 @@
 		bottom: 0;
 		padding: 10px;
 		border-top: 1px solid #eee;
+		font-size: 34rpx;
 	}
 
 	.cancel {
 		left: 0;
 		border-right: 1px solid #eee;
+		color: #AFB3BF;
 	}
 
 	.confirm {
 		right: 0;
-	}
-
-	.textCss {
-		display: flex;
-		justify-content: flex-end;
-		width: 100%;
-	}
-
-	.shade {
-		background: #000;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 10000;
+		color: #22C572;
 	}
 
 	.textarea {
@@ -563,17 +570,20 @@
 		padding: 10px;
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
-	}
-
-	.rejectText {
-		text-align: center;
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
 	}
 
 	/deep/.u-input__textarea {

pages/task/audit/warehouse_approval.vue

@@ -71,28 +71,44 @@
 				</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" class="rejectInfoCss"
-					placeholder="请输入审核意见" />
-				<view class="flex">
-					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
-					<u-button @click="reject()" type="success">确定</u-button>
+		<view v-if='show1' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						审核意见（驳回）
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{rejectInfo.length}}/100个字
+					</view>
+					<u-input class="" v-model='rejectInfo' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+				<u-button @click="reject()" type="success">确定</u-button>
 			</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="audit()" type="success">确定</u-button>
+		</view>
+		<view v-if='show2' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						审核意见（通过）
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{rejectInfo1.length}}/100个字
+					</view>
+					<u-input class="" v-model='rejectInfo1' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
 				</view>
+				<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+				<u-button @click="audit()" type="success">确定</u-button>
 			</view>
-		</u-popup>
+		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='isSHowBtn' @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
@@ -351,19 +367,85 @@
 		}
 	}
 
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		// height: 100px;
-		overflow-y: auto;
-		margin: 30rpx;
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
 	}
 
-	.rejectText {
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
 		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
 	}
 
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}

pages/task/my_task.vue

@@ -171,7 +171,12 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
-			this.checked = uni.getStorageSync("everyTask")
+			if (uni.getStorageSync("everyTask") == true) {
+				this.checked = true
+			} else {
+				this.checked = false
+			}
+
 			this.warehouseInOutInfo.currentPage = 1
 			this.data.currentPage = 1
 			this.taskInfo = []

pages/user/setUp.vue

@@ -77,11 +77,18 @@
 					index: 3
 				})
 				uni.clearStorageSync();
+				var that=this
+				this.$api.doRequest('post', '/auth/api/logout').then(res => {
+					if (res.data.data) {
+						
+					}
+				})
 				this.$store.commit('logout')
 				this.$api.logout()
-				uni.navigateTo({
-					url: `/pages/public/login`
-				})
+						uni.navigateTo({
+							url: `/pages/public/login`
+						})
+				
 			},
 			getList() {
 				this.userInfo = uni.getStorageSync('userInfo')

store/index.js

@@ -121,6 +121,7 @@ const store = new Vuex.Store({
 			state.hasLogin = false;
 			state.userInfo = {};
 			uni.removeStorageSync('userInfo')
+			uni.removeStorageSync('pcUserInfo')
 		},
 		configfreightTransport(state,flag){
 			state.isConfigfreightTransport = flag