From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/a5-laboratory-qualifications.vue |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 0ee1b12..a5baa5e 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -61,7 +61,7 @@
 					</el-radio-group>
 				</el-col>
 				<el-col :span="12" style="text-align: right;" v-if="radio==0">
-					<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
+					<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">璧勮川鏇存柊</el-button>
 					<el-button size="medium" icon="el-icon-delete" @click="handleDel" v-if="delPower">鍒犻櫎</el-button>
 				</el-col>
 			</el-row>
@@ -149,7 +149,7 @@
 		</div>
     <el-dialog title="璧勮川鏇存柊" :visible.sync="qualificationsConnectVisible" width="400px">
 			<div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">璧勮川鍚嶇О锛�</div>
+        <div class="search_label" style="width:120px"><span class="required-span">* </span>璧勮川鍚嶇О锛�</div>
         <div class="search_input">
           <el-select v-model="formData.name" placeholder="璇烽�夋嫨" style="width: 100%;" size="small" clearable>
             <el-option
@@ -162,7 +162,7 @@
         </div>
       </div>
       <div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">璧勮川缂栫爜锛�</div>
+        <div class="search_label" style="width:120px"><span class="required-span">* </span>璧勮川缂栫爜锛�</div>
         <div class="search_input">
           <el-input
           size="small"
@@ -172,7 +172,7 @@
         </div>
       </div>
       <div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">棰佸彂鏈烘瀯锛�</div>
+        <div class="search_label" style="width:120px"><span class="required-span">* </span>棰佸彂鏈烘瀯锛�</div>
         <div class="search_input">
           <el-input
           size="small"
@@ -191,10 +191,12 @@
 					v-model="formData.explanation"></el-input>
         </div>
       </div>
+     
+
       <div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">棣栨棰佸彂鏃堕棿锛�</div>
+        <div class="search_label" style="width:120px"><span class="required-span">* </span>棰佸彂鏃堕棿锛�</div>
         <div class="search_input">
-          <el-date-picker style="width:100%" v-model="formData.firstTime"
+          <el-date-picker style="width:100%" v-model="formData.dateOfIssuance"
           type="datetime"
 					size="small"
           format="yyyy-MM-dd HH:mm:ss"
@@ -203,22 +205,9 @@
           placeholder="閫夋嫨鏃ユ湡">
 					</el-date-picker>
         </div>
-      </div>
+      </div> 
       <div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">鏈�杩戦鍙戞椂闂达細</div>
-        <div class="search_input">
-          <el-date-picker style="width:100%" v-model="formData.recentlyTime"
-          type="datetime"
-					size="small"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          clearable
-          placeholder="閫夋嫨鏃ユ湡">
-					</el-date-picker>
-        </div>
-      </div>
-      <div class="search_thing" style="margin-bottom: 16px;">
-        <div class="search_label" style="width:120px">鍒版湡棰佸彂鏃堕棿锛�</div>
+        <div class="search_label" style="width:120px"><span class="required-span">* </span>鍒版湡鏃堕棿锛�</div>
         <div class="search_input">
           <el-date-picker style="width:100%" v-model="formData.expireTime"
           type="datetime"

--
Gitblit v1.9.3