From 99318e64b108e6245b7976bcb2188f8270f736f6 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Tue, 26 Dec 2023 09:47:05 +0800
Subject: [PATCH] 评优任务页面优化

---
 src/views/evaluate/components/viewEvaluateDetail.vue |   26 ++++++++++++++++++++++++++
 src/option/leave/leaveWords.js                       |   21 +++++++++++++++++++--
 src/views/evaluate/components/addDialog.vue          |    4 ++--
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/option/leave/leaveWords.js b/src/option/leave/leaveWords.js
index 165c458..7d72d7e 100644
--- a/src/option/leave/leaveWords.js
+++ b/src/option/leave/leaveWords.js
@@ -11,6 +11,7 @@
   addBtn: false,
   selection: true,
   dialogClickModal: false,
+  menuFixd: 'right',
   // menu: false,
   column: [
     {
@@ -35,25 +36,34 @@
       label: "留言人/回复人",
       prop: "userName",
       type: "input",
+      minWidth: 150,
     },
     {
       // 留言人职位/回复人
       label: "职位",
       prop: "userPost",
       type: "input",
+      minWidth: 100,
+    },
+    { label: '部门',
+      prop: "userDept",
+      type: "input",
+      minWidth: 100,
     },
     {
       label: "留言内容",
       prop: "content",
       type: "input",
       search: true,
-      slot: true
+      slot: true,
+      minWidth: 100,
     },
     {
       label: "图片",
       prop: "imageUrls",
       type: "input",
-      slot: true
+      slot: true,
+      minWidth: 100,
     },
     {
       label: "创建人",
@@ -63,6 +73,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 100,
     },
     {
       label: "创建部门",
@@ -72,6 +83,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 100,
     },
     {
       label: "留言时间/回复时间",
@@ -80,6 +92,7 @@
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      minWidth: 150,
     },
     {
       label: "修改人",
@@ -89,6 +102,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 100,
     },
     {
       label: "修改时间",
@@ -98,6 +112,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 150,
     },
     {
       label: "状态",
@@ -107,6 +122,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 50,
     },
     {
       label: "是否已删除",
@@ -116,6 +132,7 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
+      minWidth: 50,
     },
   ]
 }
diff --git a/src/views/evaluate/components/addDialog.vue b/src/views/evaluate/components/addDialog.vue
index a191ae7..b541c94 100644
--- a/src/views/evaluate/components/addDialog.vue
+++ b/src/views/evaluate/components/addDialog.vue
@@ -46,8 +46,8 @@
                         format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                 </el-form-item>
                 <el-form-item label="评优数量:" prop="evaluateNum">
-                    <el-input-number min="0" :max="maxEvaluateNum || Infinity" v-model="addForm.evaluateNum"
-                        controls-position="right" :placeholder="`请输入评优数量（最多不可超过${maxEvaluateNum}）`"
+                    <el-input-number min="0" :max="(params.type? false : maxEvaluateNum) || Infinity" v-model="addForm.evaluateNum"
+                        controls-position="right" :placeholder="`请输入评优数量${ params.type? '' : '（最多可选' + maxEvaluateNum + '人）' }`"
                         class="evaluateNum-input"></el-input-number>
                 </el-form-item>
                 <el-form-item label="评优截止日期:" prop="evaluateCutoffTime" v-if="params.type">
diff --git a/src/views/evaluate/components/viewEvaluateDetail.vue b/src/views/evaluate/components/viewEvaluateDetail.vue
index 7aa9139..4ca4489 100644
--- a/src/views/evaluate/components/viewEvaluateDetail.vue
+++ b/src/views/evaluate/components/viewEvaluateDetail.vue
@@ -22,6 +22,7 @@
     getCandidateList,
     getFinallyResult
 } from '@/api/evaluate/evaluateTask'
+import _ from 'lodash'
 
 const { findObject } = getCurrentInstance().appContext.config.globalProperties;
 
@@ -86,6 +87,12 @@
         prop: 'evaluateState',
         value: '',
         width: '50%'
+    },
+    {
+        title: '候选人数量',
+        prop: 'candidateNum',
+        value: '',
+        width: '100%'
     },
     {
         title: '候选结果',
@@ -170,6 +177,12 @@
     {
         title: '评优评先状态',
         prop: 'evaluateState',
+        value: '',
+        width: '100%'
+    },
+    {
+        title: '评优人数量',
+        prop: 'candidateNum',
         value: '',
         width: '100%'
     },
@@ -261,6 +274,19 @@
                 obj.evaluateState = data[item.prop]
             }
         }
+        
+        if (item.prop === 'candidateNum') {
+            const candidateNumStrArr = []
+            const { candidateNum } = _.cloneDeep(data)
+            candidateNum.forEach(item => {
+                const userList = []
+                item.users.forEach(user => {
+                    userList.push(user.name)
+                })
+                candidateNumStrArr.push(`${item.deptName}(${item.users.length}人)：${userList.join('、')}`)
+            })
+            item.value = candidateNumStrArr.join('\n')
+        }
 
         if (item.prop === 'candidateResult') {
             const res = await candidateList()

--
Gitblit v1.9.3