【修改】修改子错误

src/api/modules/process.js

@@ -9,7 +9,7 @@ export default {
     })
   },
 
-  // 获取审批历史
+  // 获取审批记录
   getHistory (data) {
     return request({
       url: '/api/task/get_list_by_instance',

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
+    })
   }
 }

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>
 

src/components/ProcessApprovalHistory.vue

@@ -9,15 +9,15 @@
        height: '48px'}"
       border
       @sort-change="sortChange">
-<!--      <el-table-column-->
+      <el-table-column
-<!--        show-overflow-tooltip-->
+        show-overflow-tooltip
-<!--        prop="orgName"-->
+        prop="orgName"
-<!--        align="center"-->
+        align="center"
-<!--        label="审批人所在部门">-->
+        label="审批人所在部门">
-<!--        <template slot-scope="scope">-->
+        <template slot-scope="scope">
-<!--          <span >{{ scope.row.orgName }}</span>-->
+          <span >{{ scope.row.orgName }}</span>
-<!--        </template>-->
+        </template>
-<!--      </el-table-column>-->
+      </el-table-column>
       <el-table-column
         prop="assignee"
         align="center"

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>

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'"-->

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: '',

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 }">

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'"-->

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: '',