前端

pages/erpbusiness/edit_quality_testing.vue

@@ -39,12 +39,10 @@
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
 						 	 name="input"></input>
-					<input v-if='flag==1' v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
-						 	 	 name="input"></input>
-					<input style='color:#ccc' v-if='flag!=1&&gridList.reBuckleMiscellaneous' v-model='gridList.reBuckleMiscellaneous' disabled placeholder="复检扣杂" @input="waterContentChange"
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" 
+						name="input"></input>
+					<input v-else :disabled='flag!=1' v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂"
 						name="input"></input>
-					<input style='color:#ccc' v-if='flag!=1&&gridList.reBuckleMiscellaneous==null' value='未复检' disabled placeholder="复检扣杂" @input="waterContentChange"
-							name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -107,12 +105,10 @@
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 					 name="input"></input>
-					 <input v-if='flag==1' v-model='gridList.reWaterContent' placeholder="复检水分" @input="waterContentChange"
-					  name="input"></input>
-					  <input style='color:#ccc' v-if='flag!=1&&gridList.reWaterContent' v-model='gridList.reWaterContent' disabled placeholder="复检水分"
+					  <input v-if='flag==0' value='未复检' disabled placeholder="复检水分"
 					  	name="input"></input>
-					<input style='color:#ccc' v-if='flag!=1&&gridList.reWaterContent==null' value='未复检' disabled placeholder="复检水分"
-							name="input"></input>
+						<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
+						 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -321,9 +317,9 @@
 			},
 			submit(){
 				this.gridList.flag=this.flag
-				if(this.flag==2){
-					this.gridList.reInspector=this.userInfo.userName
-				}
+				// if(this.flag==2){
+				// 	this.gridList.reInspector=this.userInfo.userName
+				// }
 				var that = this
 				if (!this.gridList.qualityNo) {
 					this.$api.msg('编号不能为空')

pages/task/my_task.vue

@@ -196,6 +196,8 @@
 					data = this.data
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
+				data.currentPage = pages
+				data.pageSize = limit
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {