From 323c2e94f121ee29bee55f1d44a9247232816e1c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 23 八月 2023 16:09:21 +0800
Subject: [PATCH] 完成检验计划

---
 src/views/experiment/planAssignments/plan.vue |   59 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 0907cbc..5eb0f53 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,16 +44,20 @@
 <template>
 	<div class="plan">
 		<div class="title">
-			<span>椤圭洰鍚嶇О锛�</span>
-			<el-input v-model="search.name" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
+			<span>鐢宠鍗曠紪鍙凤細</span>
+			<el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
 			<span>妫�楠屾椂闂达細</span>
 			<el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
-				end-placeholder="缁撴潫鏃ユ湡" size="medium" style="margin-right: 20px;">
+				end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
 			</el-date-picker>
-			<span>妫�楠屼汉锛�</span>
-			<el-input v-model="search.userName" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
-			<el-button size="small" type="primary">鏌ヨ</el-button>
-			<el-button size="small">閲嶇疆</el-button>
+			<span>妫�楠岀粨鏋滐細</span>
+			<el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;">
+				<el-option label="鍏ㄩ儴" :value="null"></el-option>
+				<el-option label="鍚堟牸" :value="1"></el-option>
+				<el-option label="涓嶅悎鏍�" :value="0"></el-option>
+			</el-select>
+			<el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
+			<el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
 		</div>
 		<div class="thing">
 			<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -207,9 +211,9 @@
 		data() {
 			return {
 				search: {
-					name: null,
+					code: null,
 					date: [],
-					userName: null,
+					testValue: null,
 				},
 				tableData: [],
 				upDia: false,
@@ -228,7 +232,16 @@
 		},
 		methods: {
 			selectDataList() {
-				get(this.$url.selectAllPlan).then(res => {
+				var str = {}
+				str.code = this.search.code
+				str.status = this.search.testValue
+				try {
+					if (this.search.date.length != 0) {
+						str.beginTime = this.search.date[0]
+						str.endTime = this.search.date[1]
+					}
+				} catch (e) {}
+				get(this.$url.selectAllPlan, str).then(res => {
 					this.tableData = JSON.parse(JSON.stringify(res.data).replaceAll('pid', 'code').replaceAll('samplename',
 						'name').replaceAll('inspectionStatus', 'testState'))
 					this.tableData.forEach(a => {
@@ -331,7 +344,7 @@
 			submitUpData2() {
 				var data = []
 				this.upData.testValue.forEach(a => {
-					if(a.number!=''&&a.number!=null){
+					if (a.number != '' && a.number != null) {
 						data.push(a.number)
 					}
 				})
@@ -341,15 +354,23 @@
 				}).then(res => {
 					this.upInsDia = false
 					this.selectDataList()
-					this.$confirm(`<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`, '鎻愪氦鎴愬姛', {
-						confirmButtonText: '纭畾',
-						cancelButtonText: '鍏抽棴',
-						dangerouslyUseHTMLString:true,
-						type: `${res.data==1?'success':'error'}`
-					}).then(() => {
-					}).catch(() => {
-					})
+					this.$confirm(
+						`<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
+						'鎻愪氦鎴愬姛', {
+							confirmButtonText: '纭畾',
+							cancelButtonText: '鍏抽棴',
+							dangerouslyUseHTMLString: true,
+							type: `${res.data==1?'success':'error'}`
+						}).then(() => {}).catch(() => {})
 				})
+			},
+			cleanBtn(){
+				this.search = {
+					code: null,
+					date: [],
+					testValue: null,
+				}
+				this.selectDataList()
 			}
 		}
 	}

--
Gitblit v1.9.3