From f16c91bc9b96c415b7129e3eccf29b5b9f93d7a3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:29:13 +0800
Subject: [PATCH] 工时查询修改, 样品搜索问题修复

---
 src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
index c820834..eb1f50b 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
@@ -181,13 +181,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>
@@ -377,6 +388,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' }],
@@ -542,7 +554,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