From fc539f498b82694153e4c162e9d44ceec36c1135 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 16 May 2023 10:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/process.js                     |  2 +-
 src/api/modules/reportProcess.js               |  8 ++++++++
 src/components/OrgTable.vue                    |  2 +-
 src/components/ProcessApprovalHistory.vue      | 18 +++++++++---------
 src/views/Report/reportManager/labelModal.vue  |  2 +-
 src/views/permissionApplication/examine.vue    |  2 +-
 src/views/permissionApplication/launch.vue     |  4 ++--
 .../reportProcess/components/reportForm.vue    |  2 +-
 src/views/reportProcess/examine.vue            |  2 +-
 src/views/reportProcess/launch.vue             |  4 ++--
 10 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/api/modules/process.js b/src/api/modules/process.js
index e75b831..5889d64 100644
--- a/src/api/modules/process.js
+++ b/src/api/modules/process.js
@@ -9,7 +9,7 @@ export default {
     })
   },
 
-  // 获取审批历史
+  // 获取审批记录
   getHistory (data) {
     return request({
       url: '/api/task/get_list_by_instance',
diff --git a/src/api/modules/reportProcess.js b/src/api/modules/reportProcess.js
index ab15040..703c94f 100644
--- a/src/api/modules/reportProcess.js
+++ b/src/api/modules/reportProcess.js
@@ -14,5 +14,13 @@ export default {
       method: 'post',
       data:data
     })
+  },
+  // 获取审批人的领导
+  getLeader(data) {
+    return request({
+      url: '/api/sys/user/getOwnLeader',
+      method: 'get',
+      params:data
+    })
   }
 }
diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue
index 10819e3..b2db968 100644
--- a/src/components/OrgTable.vue
+++ b/src/components/OrgTable.vue
@@ -280,7 +280,7 @@
               label="部门"
               align="center"
               show-overflow-tooltip>
-              <template #default="{ row }">{{ row.departmentName || row.DEPARTMENT || row.orgName }}
+              <template #default="{ row }">{{ row.departmentName || row.DEPARTMENT || row.ORGNAME }}
               </template>
             </el-table-column>
 
diff --git a/src/components/ProcessApprovalHistory.vue b/src/components/ProcessApprovalHistory.vue
index 9a42983..f370eeb 100644
--- a/src/components/ProcessApprovalHistory.vue
+++ b/src/components/ProcessApprovalHistory.vue
@@ -9,15 +9,15 @@
        height: '48px'}"
       border
       @sort-change="sortChange">
-<!--      <el-table-column-->
-<!--        show-overflow-tooltip-->
-<!--        prop="orgName"-->
-<!--        align="center"-->
-<!--        label="审批人所在部门">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span >{{ scope.row.orgName }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column
+        show-overflow-tooltip
+        prop="orgName"
+        align="center"
+        label="审批人所在部门">
+        <template slot-scope="scope">
+          <span >{{ scope.row.orgName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="assignee"
         align="center"
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index 733aafe..5d851f4 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -5,7 +5,7 @@
         <el-form ref="form" :model="form" label-width="80px" :show-message="false">
           <el-form-item label="上级标签" required>
             <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable
-                         :props="{ checkStrictly: true }" clearable >
+                         :props="{ checkStrictly: true}" clearable >
               <template slot-scope="{ node, data }">
                   <span :title="data.label">{{ data.label }}</span>
               </template>
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index 66aa6df..bd85cfa 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -73,7 +73,7 @@
                            :prcId="prcId" :prcType="prcType" :taskId="taskId"         @handleSubmit="handleSubmit" @handleTransfer="handleTransfer"></audit-operation>
         </div>
         <div class="process_content">
-          <span class="base_title">审批历史</span>
+          <span class="base_title">审批记录</span>
           <process-approval-history :prcNum="prcNum"></process-approval-history>
         </div>
 <!--        v-if="$route.query.type !=='yiban'"-->
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index f08ec59..0732cd9 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -17,7 +17,7 @@
           </el-row>
         </div>
         <div class="process_content" v-if="initShow">
-          <span class="base_title">审批历史</span>
+          <span class="base_title">审批记录</span>
           <process-approval-history :prcNum="prcNum"></process-approval-history>
         </div>
       </div>
@@ -59,7 +59,7 @@ export default {
       PERMISSION,
       delData:[],
       showTableD: false,
-      initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
+      initShow: false, // 控制审批记录是否显示 只有在不是第一次的时候才是true
       treeType: '',
       orgTableVal: '',
       orgTableValName: '',
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index 52fdb8a..92a4f07 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="10" :offset="4">
           <el-form-item label="标签:">
-            <el-cascader :disabled="formControl" width="100%" v-model="form.labelList" :options="cascaderOptions"
+            <el-cascader :disabled="formControl"  v-model="form.labelList" :options="cascaderOptions"
                          filterable collapse-tags
                          :props="{ checkStrictly: true ,multiple: true }" clearable placeholder="请选择标签">
               <template slot-scope="{ node, data }">
diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue
index 1d11c73..4237c82 100644
--- a/src/views/reportProcess/examine.vue
+++ b/src/views/reportProcess/examine.vue
@@ -17,7 +17,7 @@
                           :examine="submitjson" :is-disable="disabled" @handleSubmit="handleSubmit" @handleTransfer="handleTransfer"></audit-operation>
         </div>
         <div class="process_content">
-          <span class="base_title">审批历史</span>
+          <span class="base_title">审批记录</span>
           <process-approval-history :prcNum="prcNum"></process-approval-history>
         </div>
 <!--        v-if="$route.query.type !=='yiban'"-->
diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue
index 4dc0c45..20778f1 100644
--- a/src/views/reportProcess/launch.vue
+++ b/src/views/reportProcess/launch.vue
@@ -16,7 +16,7 @@
 
         </div>
         <div class="process_content" v-if="initShow">
-          <span class="base_title">审批历史</span>
+          <span class="base_title">审批记录</span>
           <process-approval-history :prcNum="prcNum"></process-approval-history>
         </div>
         <div class="process_content" v-if="isLevel">
@@ -82,7 +82,7 @@ export default {
       isLevel: true,
       dataId:'',
       showTableD: false,
-      initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
+      initShow: false, // 控制审批记录是否显示 只有在不是第一次的时候才是true
       treeType: '',
       orgTableVal: '',
       orgTableValName: '',