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

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -246,7 +246,7 @@
 				</view>
 			</u-form>
 		</view>
-		<view v-if='show' class="shade">
+		<view v-if='show1' class="shade">
 			<view class="wrap">
 				<view class="alert-top">
 					<view class="title">
@@ -292,6 +292,7 @@
 				retreatList: {}, //退
 				type: '移库',
 				show: false,
+				show1: false,
 				auditMind: '',
 				pjList: [{
 						type: '一等品'
@@ -366,14 +367,15 @@
 				this.EnterList.gradeKey = e[0] + 1
 			},
 			close() {
-				this.show = false
+				this.show1 = false
 			},
 			pass() {
-				this.show = true
+				this.show1 = true
 				this.title = '审核意见（通过）'
 			},
 			reject() {
-				this.show = true
+				
+				this.show1 = true
 				this.title = '驳回原因（驳回）'
 			},
 			passSubmit() {