From cea09bfcd9175c018777400ecc8914e198b6f2a0 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Tue, 19 Apr 2022 14:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=8A=A5=E8=A1=A8=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/com_auth_customer_report.js    |   4 +-
 .../report/com_auth_customer_report.vue       | 112 +++++++++++-------
 src/views/modules/report/report_manage.vue    |   6 +-
 .../modules/report/user_customer_report.vue   |   6 +-
 src/views/modules/sys/role.vue                |  24 +++-
 5 files changed, 98 insertions(+), 54 deletions(-)

diff --git a/src/api/report/com_auth_customer_report.js b/src/api/report/com_auth_customer_report.js
index ec15ca1..5842472 100644
--- a/src/api/report/com_auth_customer_report.js
+++ b/src/api/report/com_auth_customer_report.js
@@ -1,7 +1,7 @@
 import { createAPI } from '@/utils/httpRequest.js'
 
 // 获取查询列
-export const getAuthRoles = data => createAPI('report/getAuthRoles', 'POST', data)
+export const getCustomerReportAuths = data => createAPI('report/getCustomerReportAuths', 'POST', data)
 
 // 赋值权限
-export const saveAuthCustomerReport = data => createAPI('report/saveAuthSingleCustomerReport', 'POST', data)
+export const saveCustomerReportAuths = data => createAPI('report/saveCustomerReportAuths', 'POST', data)
diff --git a/src/views/modules/report/com_auth_customer_report.vue b/src/views/modules/report/com_auth_customer_report.vue
index 6386f34..37dfd95 100644
--- a/src/views/modules/report/com_auth_customer_report.vue
+++ b/src/views/modules/report/com_auth_customer_report.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="380px" style="height: 490px;" class="customer-dialog">
+               width="520px" style="height: 490px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 300px;"
                label-width="80px">
           <el-row>
@@ -16,8 +16,8 @@
         <el-form>
             <el-table height="240"
                :cell-style="customerCellStyle" :cell-class-name="customerCellClassName"
-              :data="authRoleList"
-              border
+              :data="customerReportList"
+              border ref="customerReportTable"
               v-loading="dataListLoading"
               style="width: 100%; margin-top: 0px;">
               <el-table-column
@@ -25,7 +25,7 @@
                 width="55">
               </el-table-column>
               <el-table-column
-                v-for="(item,index) in authRoleArray" :key="index"
+                v-for="(item,index) in columnReportArray" :key="index"
                 :sortable="item.columnSortable"
                 :prop="item.columnProp"
                 :header-align="item.headerAlign"
@@ -47,7 +47,7 @@
         </el-form>
       </el-form>
       <span slot="footer" class="dialog-footer" style="margin-top: 0px;">
-        <el-button type="primary" @click="saveAuthCustomerReportBun">保存</el-button>
+        <el-button type="primary" @click="saveCustomerReportAuthsBun">保存</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -58,9 +58,9 @@
 <script>
   /*引入js*/
   import {
-    getAuthRoles,
-    saveAuthCustomerReport,
-} from '@/api/report/com_auth_single_customer_report.js';
+    getCustomerReportAuths,
+    saveCustomerReportAuths,
+} from '@/api/report/com_auth_customer_report.js';
 export default {
   data() {
     return {
@@ -72,20 +72,19 @@ export default {
         roleName: '',
       },
       customerReportList: [],
-      customerReportArray: [
+      columnReportArray: [
         {
           userId: this.$store.state.user.name,
-          functionId: 5307,
-          serialNumber: '5307CustomerReportId',
-          tableId: "5307Customer",
-          tableName: "查询列",
+          functionId: 5306,
+          serialNumber: '5306ReportReportId',
+          tableId: "5306Report",
+          tableName: "自定义报表",
           columnProp: "reportId",
           headerAlign: "center",
           align: "center",
           columnLabel: "报表ID",
-          columnWidth: 120,
+          columnWidth: '',
           columnHidden: false,
-          columnAttr: 'ori',
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
@@ -94,17 +93,16 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5307,
-          serialNumber: '5307CustomerRoleName',
-          tableId: "5307Customer",
-          tableName: "查询列",
-          columnProp: "roleName",
+          functionId: 5306,
+          serialNumber: '5306ReportReportName',
+          tableId: "5306Report",
+          tableName: "自定义报表",
+          columnProp: "reportName",
           headerAlign: "center",
           align: "center",
-          columnLabel: "角色名称",
-          columnWidth: 140,
+          columnLabel: "报表名称",
+          columnWidth: '',
           columnHidden: false,
-          columnAttr: 'ori',
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
@@ -113,17 +111,34 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5307,
-          serialNumber: '5307CustomerColumnDefaultValue',
-          tableId: "5307Customer",
-          tableName: "查询列",
-          columnProp: "checkedFlag",
+          functionId: 5306,
+          serialNumber: '5306ReportReportType',
+          tableId: "5306Report",
+          tableName: "自定义报表",
+          columnProp: "reportType",
           headerAlign: "center",
           align: "center",
-          columnLabel: "授权",
-          columnWidth: 90,
+          columnLabel: "报表分类",
+          columnWidth: '',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5306,
+          serialNumber: '5306ReportReportRemark',
+          tableId: "5306Report",
+          tableName: "自定义报表",
+          columnProp: "reportRemark",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "备注",
+          columnWidth: '',
           columnHidden: false,
-          columnAttr: 'check',
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
@@ -138,8 +153,9 @@ export default {
   methods: {
     /*初始化页面参数*/
     init(currentRow) {
+      //清空参数
+      this.customerReportList = [];
       //设置参数
-      debugger;
       this.pageData.roleId = currentRow.roleId;
       this.pageData.roleName = currentRow.roleName;
       //刷新页面的参数
@@ -156,13 +172,23 @@ export default {
     /*刷新当前的页面参数*/
     refreshPageData(){
       //刷新材料的数据
-      this.refreshAuthRoleTable();
+      this.refreshCustomerReportAuthTable();
     },
 
-    //刷新当前卷的时间数据
-    refreshAuthRoleTable(){
-      getAuthRoles(this.pageData).then(({data}) => {
-        this.authRoleList = data.rows;
+    //刷新定制报表的权限
+    refreshCustomerReportAuthTable(){
+      getCustomerReportAuths(this.pageData).then(({data}) => {
+        this.customerReportList = data.rows;
+        //循环判断是否选定当前的行
+        //延时1秒执行
+        setTimeout(() => {
+          this.customerReportList.forEach(row => {
+            let authedFlag = row.authedFlag;
+            if(authedFlag === 'Y'){
+              this.$refs.customerReportTable.toggleRowSelection(row);
+            }
+          });
+        }, 300)
       });
     },
 
@@ -183,9 +209,15 @@ export default {
     },
 
     /*保存已经修改好的参数数据*/
-    saveAuthCustomerReportBun(){
-      let requestData = {pageData: JSON.stringify(this.pageData), authRoles: JSON.stringify(this.authRoleList)};
-      saveAuthCustomerReport(requestData).then(({data}) => {
+    saveCustomerReportAuthsBun(){
+      let checkedList = this.$refs.customerReportTable.selection;
+      //判断选中行数
+      if(checkedList.length === 0){
+        this.$message.error('请选择赋权限的报表!')
+        return false;
+      }
+      let requestData = {pageData: JSON.stringify(this.pageData), customerReports: JSON.stringify(checkedList)};
+      saveCustomerReportAuths(requestData).then(({data}) => {
         if(data.code === 200){
           this.$message.success(data.msg);
           //关闭当前的页面
diff --git a/src/views/modules/report/report_manage.vue b/src/views/modules/report/report_manage.vue
index 8d31d17..e99b531 100644
--- a/src/views/modules/report/report_manage.vue
+++ b/src/views/modules/report/report_manage.vue
@@ -24,10 +24,6 @@
     </el-form>
     <!--  工单主表信息  -->
     <el-main style="margin-top: 5px; padding: 0px; width: 100%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'主记录'">
-        </el-form-item>
-      </el-form>
       <el-table
         :height="height"
         :data="reportList"
@@ -36,7 +32,7 @@
         highlight-current-row
         @row-click="setCurrentReportRow"
         v-loading="dataListLoading"
-        style="margin-top: -20px; width: 100%;">
+        style="margin-top: 0px; width: 100%;">
         <el-table-column
           fixed="left"
           header-align="center"
diff --git a/src/views/modules/report/user_customer_report.vue b/src/views/modules/report/user_customer_report.vue
index 4eb590c..cff83b8 100644
--- a/src/views/modules/report/user_customer_report.vue
+++ b/src/views/modules/report/user_customer_report.vue
@@ -23,10 +23,6 @@
     </el-form>
     <!--  工单主表信息  -->
     <el-main style="margin-top: 5px; padding: 0px; width: 100%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'主记录'">
-        </el-form-item>
-      </el-form>
       <el-table
         :height="height"
         :data="reportList"
@@ -35,7 +31,7 @@
         highlight-current-row
         @row-click="setCurrentReportRow"
         v-loading="dataListLoading"
-        style="margin-top: -20px; width: 100%;">
+        style="margin-top: 0px; width: 100%;">
         <el-table-column
           fixed="left"
           header-align="center"
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 6d012cb..194d44a 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -44,6 +44,7 @@
         <template slot-scope="scope">
           <a v-if="isAuth('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.roleId)">修改</a>
           <a v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.roleId)">删除</a>
+          <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">报表赋权</a>
         </template>
       </el-table-column>
     </el-table>
@@ -58,14 +59,23 @@
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <!--报表赋权限-->
+    <authCustomerReport ref="authCustomerReport" :close-on-click-modal="false"
+                        :visible.sync="showAuthCustomerReportFlag" @refreshDataList="getDataList">
+
+    </authCustomerReport>
+
+
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './role-add-or-update'
+  import authCustomerReport from '../report/com_auth_customer_report' /**/
   export default {
     data () {
       return {
+        showAuthCustomerReportFlag: false,
         dataForm: {
           roleName: ''
         },
@@ -79,7 +89,8 @@
       }
     },
     components: {
-      AddOrUpdate
+      AddOrUpdate,
+      authCustomerReport,/*报表赋权限*/
     },
     activated () {
       this.getDataList()
@@ -152,7 +163,16 @@
             }
           })
         }).catch(() => {})
-      }
+      },
+
+      /*给角色报表赋权限*/
+      showAuthCustomerReportModal(currentRow){
+        this.$nextTick(() => {
+          this.showAuthCustomerReportFlag = true;
+          this.$refs.authCustomerReport.init(currentRow);
+        });
+      },
+
     }
   }
 </script>