From 754f2fa9c8076a5d13ad7476eb9bc5984f78c99c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 四月 2023 13:25:32 +0800
Subject: [PATCH] 修改用户管理

---
 src/views/analyse/assessApply/components/reportDialog.vue |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/analyse/assessApply/components/reportDialog.vue b/src/views/analyse/assessApply/components/reportDialog.vue
index 142e16d..d009c62 100644
--- a/src/views/analyse/assessApply/components/reportDialog.vue
+++ b/src/views/analyse/assessApply/components/reportDialog.vue
@@ -172,6 +172,21 @@
                     <tr>
                       <el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.description" placeholder="评定依据(必填)" />
                     </tr>
+                    <tr v-if="reportDialogState.reportForm.person?.length>0" class="m-color b-font" style="text-align: center">审批内容</tr>
+                    <template v-if="reportDialogState.reportForm.person?.length>0" v-for="item in reportDialogState.reportForm.person">
+                      <tr>
+                        <td class="w-25 m-color">{{item.approveStage}}</td>
+                        <td class="w-25">{{item.approvePerson}}</td>
+                        <td class="w-25 m-color">审批结果</td>
+                        <td class="w-25" :class="item.approveStatus==3?'redTit':''">{{item.approveStatus==1?'未审批':item.approveStatus==2?'通过':'未通过'}}</td>
+                      </tr>
+                      <tr>
+                        <td class="w-25 m-color autoheight">审批意见</td>
+                        <td class="w-75 autoheight l-border">
+                          {{ item.approveDesc }}
+                        </td>
+                      </tr>
+                    </template>
                 </table>
             </el-form>
             <template #footer>
@@ -387,12 +402,15 @@
 
 const getPersonList = async () => {
     let res = await userApi().getUserList({
-        roleId: 1,
-        usePage: false,
         pageIndex: 1,
-        pageSize: 10
+        pageSize: 99999,
+        searchParams:{
+          roleId: null,
+          name: '',
+          realName: ''
+        }
     });
-    if(res.data.code === 100){
+    if(res.data.code === 200){
         reportDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
     }else{
         ElMessage({
@@ -514,6 +532,10 @@
      width: 75%;
  }
 
+&.redTit{
+  color: red;
+}
+
 .ant-input {
     height: 100%;
     border: none;

--
Gitblit v1.9.2