From 552561c06c7e660b4602ae5fbbf59fba49b29da2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 11:56:41 +0800
Subject: [PATCH] bug修复

---
 src/views/laboratory/gather/index.vue                                |   10 +++++++++-
 src/views/laboratory/measure/index.vue                               |    6 +++---
 src/views/inspectionManagement/commissionInspection/addCommision.vue |   10 ++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index cbb7408..306bafb 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,7 +22,11 @@
 						<el-table-column type="index" label="搴忓彿" min-width="10%" />
 						<el-table-column prop="sampleNumber" label="鏍峰搧缂栧彿" min-width="8%" />
 						<el-table-column prop="sampleName" label="鏍峰搧鍚嶇О" min-width="10%" />
-						<el-table-column prop="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" />
+						<el-table-column prop="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" >
+							<template slot-scope="scope">
+								
+							</template>
+						</el-table-column>
 						<el-table-column prop="unit" label="鍗曚綅" min-width="8%" />
 						<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
 						<!-- <el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%">
@@ -342,7 +346,6 @@
 				let res = await getContractsSampleInfo({
 					viewId
 				})
-				console.log(res.data);
 			},
 			async getSampleName() {
 				const res = await getSampleName()
@@ -467,6 +470,9 @@
 					}
 					this.detectionInfo = res.data.linkDetectionList
 				})
+			},
+			getSpeName(id){
+				return name
 			}
 		}
 	}
diff --git a/src/views/laboratory/gather/index.vue b/src/views/laboratory/gather/index.vue
index cccf8cc..c7e421a 100644
--- a/src/views/laboratory/gather/index.vue
+++ b/src/views/laboratory/gather/index.vue
@@ -17,7 +17,7 @@
       </el-form>
     </div>
     <div class="library-table">
-      <el-card v-for="item in device" :key="index" class="box-card" style="width: 22.8%;">
+      <el-card v-for="(item,index) in device" :key="index" class="box-card" style="width: 22.8%;">
         <div class="header">
           <div style="display: flex;justify-content: start; width: 100%;">
             <div class="el-icon-set-up" style="font-size: 25px;color: rgb(103, 194, 58);line-height: 55px ;"></div>
@@ -76,6 +76,14 @@
       ]
     }
   },
+	methods:{
+		searchInspections(){
+			
+		},
+		reset(){
+			
+		}
+	}
 }
 </script>
 
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index d70dd9c..abb7da9 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -70,10 +70,10 @@
             <el-table-column prop="name" label="璐熻矗浜�" min-width="10%" />
             <el-table-column prop="createTime" label="鍒涘缓鏃ユ湡" min-width="10%" />
             <el-table-column prop="name" label="鍒涘缓浜�" min-width="8%" />
-            <el-table-column prop="code" label="璁¢噺缂栧彿" min-width="8%" />
+            <el-table-column prop="code" label="璁¢噺缂栧彿" min-width="12%" />
             <el-table-column label="鎿嶄綔" min-width="15%">
               <template slot-scope="scope">
-                <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁¢噺灞ュ巻</el-button>
+                <!-- <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁¢噺灞ュ巻</el-button> -->
                 <el-button type="text" size="small">鏌ョ湅闄勪欢</el-button>
               </template>
             </el-table-column>
@@ -109,7 +109,7 @@
             </el-table-column>
           </el-table>
           <!-- 鍒嗛〉鍣� -->
-          <div style="display: flex;justify-content: end;">
+          <div style="display: flex;justify-content: end;padding: 10px 0;">
             <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
               :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
               layout="total, sizes, prev, pager, next, jumper" :total="total">

--
Gitblit v1.9.3