From bd4fdac0fee9cf4f96dd947fef6f6ae950a450fe Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 九月 2023 17:07:48 +0800
Subject: [PATCH] 	modified:   package.json 	modified:   src/components/experiment/template_testReport/index.vue 	modified:   src/views/experiment/checkTheReport/index.vue 	modified:   src/views/experiment/inspectionApplication/index.vue 	modified:   src/views/inspectionManagement/commissionInspection/index.vue 	modified:   src/views/inspectionManagement/reportForInspection/index.vue

---
 src/views/experiment/inspectionApplication/index.vue |   46 ++++++++++++++++++----------------------------
 1 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 7fcd26e..be7fb86 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -39,16 +39,6 @@
 					</el-form>
 				</div>
 				<div class="library-table">
-					<div class="table-header">
-						<div class="search-bar">
-							<el-radio-group v-model="radioValue">
-								<el-radio-button label="鍏ㄩ儴" />
-								<el-radio-button label="寰呮彁浜�" />
-								<el-radio-button label="宸叉彁浜�" />
-								<el-radio-button label="宸蹭綔搴�" />
-							</el-radio-group>
-						</div>
-					</div>
 					<div class="table-box">
 						<el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
 							:cell-style="{textAlign: 'center'}"
@@ -619,8 +609,12 @@
 			},
 			reset() {
 				this.countSize = 1;
-				this.pageSize = 8;
-				this.searchData = {};
+				this.pageSize = 10;
+				this.searchData = {
+					applicationnumber: '',
+					type: '',
+					state: '',
+				};
 				this.selectInspectsList();
 			},
 			//琚�変腑鐨勪俊鎭� 鍗曢��
@@ -780,12 +774,18 @@
 				this.addInspection()
 			},
 			delInspect(row){
-				delInspect({
-					id: row.id
-				}).then(res=>{
-					this.$message.success('宸蹭綔搴�')
-					this.selectInspectsList()
-				})
+				this.$confirm('鎮ㄧ‘璁ゅ垹闄よ繖鏉℃暟鎹悧?', '鎻愮ず', {
+					confirmButtonText: '纭畾',
+					cancelButtonText: '鍙栨秷',
+					type: 'warning'
+				}).then(() => {
+					delInspect({
+						id: row.id
+					}).then(()=>{
+						this.$message.success('宸蹭綔搴�')
+						this.selectInspectsList()
+					})
+				}).catch(() => {});
 			}
 		}
 	}
@@ -874,16 +874,6 @@
 		margin-top: 50px;
 		display: flex;
 		flex-direction: column;
-
-		.table-header {
-			padding: 20px;
-			display: flex;
-			justify-content: space-between;
-
-			.el-form-item {
-				margin-bottom: 30px !important;
-			}
-		}
 
 		.table-box {
 			padding: 0px 20px;

--
Gitblit v1.9.3