抽样 重置功能

src/components/jc/routineMonitorqt.vue

@@ -235,6 +235,9 @@
 		mounted: function() {
 			this.gettaskList()
 		},
+		created: function() {
+			this.gettaskList()
+		},
 		methods: {
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;

src/components/jc/setTask.vue

@@ -26,7 +26,7 @@
 						<div>{{readForm.task_class}}</div>
 					</el-form-item>
 					<el-form-item label="检测模型:" prop="bindForm.test_model_id" width="70px" class="labelItem" required>
-						<el-select v-model="bindForm.test_model_id" size="mini">
+						<el-select v-model="bindForm.test_model_id" size="mini" placeholder="请选择">
 							<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
 						</el-select>
@@ -338,7 +338,7 @@
 				// 模型列表
 				options: [{
 					id: '',
-					name: ''
+					name: '' 
 				}],
 				bindForm: {
 					test_model_id: '',
@@ -645,6 +645,12 @@
 				console.log(this.readForm)
 				this.bindForm.is_divide = res.data.is_divide
 				this.bindForm.test_model_id = Number(res.data.test_model_id)
+				if(res.data.test_model_id === null) {
+					this.bindForm.test_model_id = undefined
+				}else
+				{
+					this.bindForm.test_model_id = Number(res.data.test_model_id)
+				}
 				this.bindForm.endtime_cydsb = res.data.endtime_cydsb
 				console.log(this.divideOptions.id)
 			},

src/components/jc/setTaskcd.vue

@@ -100,52 +100,58 @@
 				<div class="footer">
 					<el-button type="success" size="mini" @click="input()">填报抽样单</el-button>
 					<!-- <el-button type="success" size="mini" @click="next">导出总览</el-button> -->
-					<el-button type="success" size="mini" @click="back">返回</el-button>
+					<!-- <el-button type="success" size="mini" @click="back">返回</el-button> -->
 				</div>
 			</el-tab-pane>
 
 			<el-tab-pane v-if="sampleShow==true" label="抽样" name="second">
 				<!-- 头部搜索栏 -->
-				<el-row style="margin-right: 0px;">
-					<el-form style="display: flex; flex-direction: row;">
-						<el-form-item label="产品编码" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
-						</el-form-item>
-						<el-form-item label="受检单位" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+				
+					<el-form style="display: flex; flex-direction: column;" ref="form2" :model="queryInfo">
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="样品名称" class="select" size="small" prop="sample_name">
+							<el-input v-model="queryInfo.sample_name"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样编码" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
-						</el-form-item>
-						<el-form-item label="样品名称" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="样品编码" class="select" size="small" prop="sample_id">
+							<el-input v-model="queryInfo.sample_id"></el-input>
 						</el-form-item>
-					</el-form>
-				</el-row>
-				<el-row style="margin-right: 0px;">
-					<el-form style="display: flex; flex-direction: row;">
-						<el-form-item label="抽样场所" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="受检单位" class="select" size="small" prop="units_name">
+							<el-input v-model="queryInfo.units_name"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样日期" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						</el-col>
+						</el-row>
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="抽样单位" class="select" size="small" prop="sample_unit_name">
+							<el-input v-model="queryInfo.sample_unit_name"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样单位" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						    </el-col>
+							<el-col :span="6">
+						<el-form-item label="抽样日期" class="select" size="small" prop="sample_data">
+							<el-input v-model="queryInfo.sample_data"></el-input>
 						</el-form-item>
-						<el-form-item label="抽样机构" class="select" size="small">
-							<el-input v-model="queryInfo.task_name"></el-input>
+						</el-col>
+						<el-col :span="6">
+						<el-form-item label="抽样场所" class="select" size="small" prop="sample_ground">
+							<el-input v-model="queryInfo.sample_ground"></el-input>
 						</el-form-item>
-						<el-button style="height: 32px;margin-left: 10px;" size="mini" type="success"
+						</el-col>
+						<el-col :span="4">
+							<el-button style="height: 32px;margin-left: 10px;" size="mini" type="success"
 							@click="searchData()">查询
 						</el-button>
 						<!-- 重置 -->
-						<el-button style="height: 32px;margin-left: 5px;" size="mini" type="success" @click="reset()">
+						<el-button style="height: 32px;margin-left: 5px;" size="mini" type="success" @click="resetForm('form2')">
 							重置
 						</el-button>
+						</el-col>
+						</el-row>
 					</el-form>
-
-				</el-row>
 				<el-row style="margin-right: 0px;">
 					<el-form style="display: flex; flex-direction: row;">
 						<!-- 	<el-form-item label="产地" class="select">
@@ -462,7 +468,13 @@
 				queryInfo: {
 					pageNum: 1,
 					pageSize: 10,
-					task_id: ''
+					task_id: '',
+					sample_id: '',
+					units_name: '',
+					sample_name: '',
+					sample_data: '',
+					sample_unit_name: '',
+					sample_ground: '',
 				},
 				// 填报对话框弹出
 				inputDialogShow: false,
@@ -654,6 +666,19 @@
 			// 	);
 			// 	this.options = res.data.rows
 			// },	// 获取任务详情
+
+			//查询
+			async searchData() {
+				console.log(this.queryInfo)
+				this.queryInfo.pageNum = 1
+				this.getSampleList()
+			},
+			//重置
+			resetForm(formName) {
+				// console.log(this.queryInfo)
+					this.$refs[formName].resetFields();
+			},
+			//获取任务详情
 			async getTaskDetail() {
 				var that = this
 				const {
@@ -777,6 +802,11 @@
 
 			// 获取抽样单列表
 			async getSampleList() {
+								for (var key in this.queryInfo) {
+					if (this.queryInfo[key] == '') {
+						delete this.queryInfo[key]
+					}
+				}
 				this.queryInfo['task_id'] = this.task_id
 				const {
 					data: res
@@ -822,7 +852,6 @@
 				})
 			},
 			// 返回
-			// 返回
 			back() {
 				var that = this
 				this.$router.push({