From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue |   59 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
index ac989ea..2dd7789 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
@@ -1,16 +1,18 @@
 <!-- 浜哄憳鑳藉姏 -->
 <template>
   <div>
-    <div style="display: flex;justify-content: space-between;">
-      <el-form ref="page" size="small" :inline="true">
-        <el-form-item label="濮撳悕">
-          <el-input v-model="userName" placeholder="璇疯緭鍏ュ鍚�" size="small" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button size="small" type="primary" @click="refreshTable">鏌� 璇�</el-button>
-        </el-form-item>
-      </el-form>
-      <div>
+    <div style="display: flex;justify-content: space-between">
+      <div style="display: flex;">
+        <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+          <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">濮撳悕</span>
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="userName"
+                    @keyup.enter.native="refreshTable"></el-input>
+        </div>
+        <div style="line-height: 30px;">
+          <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+        </div>
+      </div>
+      <div style="line-height: 30px;">
         <el-button v-if="!isDepartment" size="small" type="primary" @click="addAppointPost('add')">鏂板</el-button>
       </div>
     </div>
@@ -181,13 +183,24 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item prop="confirmOperatingPersonnelId" label="纭浜猴細">
             <el-select v-model="form.confirmOperatingPersonnelId" clearable :disabled="operationType === 'view' || operationType === 'confirm'"
-                       filterable size="small" style="width: 50%;">
+                       filterable size="small">
               <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item prop="confirmDate" label="纭鏃堕棿锛�">
+            <el-date-picker v-model="form.confirmDate"
+                            format="yyyy-MM-dd"
+                            :disabled="operationType === 'view' || operationType === 'confirm'"
+                            placeholder="閫夋嫨鏃ユ湡"
+                            size="small"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="date"></el-date-picker>
           </el-form-item>
         </el-col>
       </el-form>
@@ -250,33 +263,33 @@
         {
           label: '宀椾綅',
           prop: 'postName',
-          minWidth: '100'
+          width: '100'
         }, {
           label: '濮撳悕',
           prop: 'userName',
-          minWidth: '100'
+          width: '100'
         }, {
           label: '瀛﹀巻',
           prop: 'academicDegree',
-          minWidth: '100'
+          width: '100'
         }, {
           label: '涓撲笟',
           prop: 'major',
-          minWidth: '100'
+          width: '100'
         }, {
           label: '鑱岀О',
           prop: 'professionalTitle',
-          minWidth: '100'
+          width: '100'
         }, {
           dataType: 'slot',
           label: '宀椾綅鑱岃矗',
           prop: 'jobResponsibilities',
-          minWidth: '200px',
+          width: '400',
           slot: 'jobResponsibilities'
         }, {
           dataType: 'tag',
           label: '缁煎悎璇勪环',
-          minWidth: '140px',
+          width: '140px',
           prop: 'comprehensiveAssessment',
           formatData: (params) => {
             if (params == 'Qualified this position') {
@@ -299,14 +312,13 @@
         }, {
           label: '纭浜�',
           prop: 'confirmOperatingPersonnelName',
-          minWidth: '100'
+          width: '100'
         }, {
           label: '纭鏃ユ湡',
           prop: 'confirmDate',
-          minWidth: '160'
+          width: '160'
         }, {
           dataType: 'action',
-          minWidth: '220',
           label: '鎿嶄綔',
           fixed: 'right',
           operation: [
@@ -378,6 +390,7 @@
       responsibleOptions: [],
       rules: {
         confirmOperatingPersonnelId: [{ required: true, message: '璇烽�夋嫨纭浜�', trigger: 'change' }],
+        confirmDate: [{ required: true, message: '璇烽�夋嫨纭鏃堕棿', trigger: 'change' }],
         userId: [{ required: true, message: '璇烽�夋嫨浜哄憳', trigger: 'change' }],
         academicDegree: [{ required: true, message: '璇疯緭鍏ュ鍘嗘煡鏍哥粨鏋�', trigger: 'blur' }],
         academicConformNot: [{ required: true, message: '璇烽�夋嫨瀛﹀巻绗﹀悎涓庡惁', trigger: 'change' }],
@@ -543,7 +556,7 @@
       this.dialogVisible = false;
     },
     getUserList(){
-      selectUserCondition().then(res => {
+      selectUserCondition({type: 2}).then(res => {
         if (res.code == 200) {
           this.responsibleOptions = res.data
         }

--
Gitblit v1.9.3