From b93657ca98a9f1ced3aacc255c3fa09b7d39cca4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 18:01:45 +0800
Subject: [PATCH] feat: 质量监控/人员培训/体系文件控制功能与界面调整

---
 src/views/CNAS/personnel/personnelInfo/components/Edit.vue |   80 ++++++++++++++++++++++++---------------
 1 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index 1dc611e..95d521d 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -10,40 +10,44 @@
     </div>
     <div class="form_title">
       <el-row>
-        <el-col :span="7">
+        <el-col :span="8">
           <span class="form_label">鍩硅鍐呭锛�</span>
           <span> {{ trainingForm.trainingContent }} </span>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <span class="form_label">鐘舵�侊細</span>
           <el-tag v-if="trainingForm.state === 1" type="success">宸插畬鎴�</el-tag>
           <el-tag v-if="trainingForm.state === 2" type="warning">寰呰瘎浠�</el-tag>
           <el-tag v-if="trainingForm.state === 3" type="primary">鏈紑濮�</el-tag>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="5">
           <span class="form_label">鍩硅璁插笀锛�</span>
           <span> {{ trainingForm.trainingLecturerName }} </span>
         </el-col>
+        <el-col :span="7">
+          <span class="form_label">鍩硅鏃ユ湡锛�</span>
+          <span> {{ trainingForm.trainingDate || '-' }} </span>
+        </el-col>
       </el-row>
       <el-row style="margin: 15px 0">
-        <el-form>
+        <el-form label-width="130px">
           <el-row>
           <el-col :span="6">
-            <el-form-item label="鍩硅鏃ユ湡:">
+            <el-form-item label="寮�濮嬫椂闂�:">
               <el-date-picker v-model="trainingForm.openingTime" format="YYYY-MM-DD" :disabled="currentRow.state !== 3"
-                              placeholder="閫夋嫨鏃ユ湡" size="small" value-format="YYYY-MM-DD"
-                              type="date" style="width: 60%"></el-date-picker>
+                              placeholder="閫夋嫨瀹為檯寮�濮嬫棩鏈�" size="small" value-format="YYYY-MM-DD"
+                              type="date" style="width: 100%"></el-date-picker>
             </el-form-item>
           </el-col>
-            <el-col :span="7">
+            <el-col :span="9">
               <el-form-item label="鍩硅鍦扮偣">
                 <el-input v-model="trainingForm.placeTraining" :disabled="currentRow.state !== 3" :rows="2" placeholder="璇疯緭鍏�"
-                          size="small" style="width: 60%" type="text"></el-input>
+                          size="small" style="width: 100%" type="text"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="9">
               <el-form-item label="璇勪环浜�">
-                <el-select v-model="trainingForm.assessmentUserId" :disabled="currentRow.state !== 3" placeholder="璇烽�夋嫨" size="small" style="width: 50%">
+                <el-select v-model="trainingForm.assessmentUserId" :disabled="currentRow.state !== 3" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
                   <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
@@ -51,7 +55,7 @@
             <el-col :span="12">
               <el-form-item label="鑰冩牳鏂瑰紡">
                 <el-input v-model="trainingForm.assessmentMethod" :disabled="currentRow.state !== 3" :rows="2" placeholder="璇疯緭鍏�"
-                          size="small" style="width: 79%" type="textarea"></el-input>
+                          size="small" style="width: 100%" type="textarea"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -60,14 +64,14 @@
               <el-form-item label="璇勪环鏃堕棿">
                 <el-date-picker v-model="trainingForm.assessmentDate" :disabled="currentRow.state !== 2 || isDisabled"
                                 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" size="small"
-                                placeholder="閫夋嫨鏃ユ湡">
+                                placeholder="閫夋嫨鏃ユ湡" style="width: 100%">
                 </el-date-picker>
               </el-form-item>
             </el-col>
           <el-col :span="12">
             <el-form-item label="鏈鍩硅缁煎悎璇勪环">
               <el-input v-model="trainingForm.comprehensiveAssessment" :disabled="currentRow.state !== 2 || isDisabled" :rows="2" placeholder="璇疯緭鍏�"
-                        size="small" style="width: 68%" type="textarea"></el-input>
+                        size="small" style="width: 100%" type="textarea"></el-input>
             </el-form-item>
           </el-col>
           </el-row>
@@ -76,15 +80,17 @@
     </div>
     <el-divider>浜哄憳璇︽儏</el-divider>
     <div>
-      <div class="items_center">
-        <span>濮撳悕</span>
-        <el-input v-model="userName" class="search" placeholder="璇疯緭鍏�"
-                  size="small"></el-input>
-        <el-button size="small" type="primary" @click="getInfo">鏌ヨ</el-button>
-      </div>
-      <div class="items_btn">
-        <el-button :disabled="currentRow.state === 1" size="small" type="primary" @click="addPerson">鏂板浜哄憳</el-button>
-        <el-button :disabled="currentRow.state === 1" size="small" @click="batchDelete">鎵归噺鍒犻櫎</el-button>
+      <div class="items_header">
+        <div class="items_center">
+          <span>濮撳悕</span>
+          <el-input v-model="userName" class="person-search-input" placeholder="璇疯緭鍏�"
+                    size="small" clearable @keyup.enter="getInfo"></el-input>
+          <el-button size="small" type="primary" @click="getInfo">鏌ヨ</el-button>
+        </div>
+        <div class="items_btn">
+          <el-button :disabled="currentRow.state === 1" size="small" type="primary" @click="addPerson">鏂板浜哄憳</el-button>
+          <el-button :disabled="currentRow.state === 1" size="small" @click="batchDelete">鎵归噺鍒犻櫎</el-button>
+        </div>
       </div>
       <el-table :data="trainingTableData" height="calc(100vh - 30em)" stripe style="width: 100%"
  border
@@ -117,7 +123,7 @@
         </el-form>
       </div>
       <div v-if="selectUserDia" class="body" style="height: 60vh;">
-        <lims-table :tableData="tableData1" :column="column1"
+        <lims-table :tableData="tableData1" :column="column1" :page="page1"
                     :isSelection="true" :handleSelectionChange="selectMethod"
                     height="500" :tableLoading="tableLoading1"></lims-table>
       </div>
@@ -402,15 +408,27 @@
 }
 
 
+.items_header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
 .items_center {
-  float: left;
-  width: 50%;
-  text-align: left;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.items_center > span {
+  line-height: 24px;
+  white-space: nowrap;
+}
+.items_center .person-search-input {
+  width: 200px;
 }
 .items_btn {
-  text-align: right;
-  width: 50%;
-  float: right;
-  margin-bottom: 1em;
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 </style>

--
Gitblit v1.9.3