From a970199e2417318743ca3f7852dca896906ac574 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 30 八月 2023 09:09:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/inspectionManagement/commissionInspection/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 042c160..dadc02c 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -65,20 +65,20 @@
<el-table-column type="index" label="搴忓彿" min-width="10%" />
<el-table-column prop="entrust_coding" label="濮旀墭缂栧彿" min-width="10%" />
<el-table-column prop="entrusted" label="濮旀墭鍗曚綅" min-width="12%" />
- <el-table-column prop="samples_number" label="鏍峰搧缂栧彿" min-width="8%" />
+ <el-table-column prop="samples_number" label="鏍峰搧鏁伴噺" min-width="8%" />
<el-table-column prop="sample_name" label="鏍峰搧鍚嶇О" min-width="8%" />
<el-table-column prop="specifications_models" label="瑙勬牸鍨嬪彿" min-width="12%" />
- <el-table-column prop="dateSurvey" label="閫佽揪鏃堕棿" min-width="8%" />
+ <el-table-column prop="inspectionTime" label="閫佹牱鏃堕棿" min-width="8%" />
<el-table-column prop="completionDeadline" label="瀹屾垚鏈熼檺" min-width="8%" />
<el-table-column prop="contacts" label="濮旀墭缂栧埗浜�" min-width="8%" />
- <el-table-column prop="inspectionTime" label="妫�楠屾棩鏈�" min-width="8%" />
+ <el-table-column prop="insTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="inspection_status" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 1">
- <span style="color: green;">宸叉娴�</span>
+ <div v-if="scope.row.inspection_status === 0">
+ <span style="color: green;">宸叉姤妫�</span>
</div>
<div v-else>
- <span style="color: red;">寰呮娴�</span>
+ <span style="color: red;">鏈姤妫�</span>
</div>
</template>
</el-table-column>
@@ -327,6 +327,9 @@
if (document.execCommand('copy')) {
this.$message.success('宸插鍒跺埌鍓创鏉�')
}
+ },
+ handleClick(row){
+ console.log(row);
}
}
}
@@ -338,7 +341,7 @@
background: #fff;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
+ padding: 24px 24px 0px 24px;
.sermargin {
margin-right: 60px;
--
Gitblit v1.9.3