修改树形表格+bug修复

src/api/permission-selfhelp-manage.js

@@ -55,6 +55,14 @@ export function delApply(params) {
   });
 }
 
+// 申请撤回
+export function recallApply(params) {
+  return request({
+    url: `${baseUrl}/authApplyCancel`,
+    method: 'GET',
+    params
+  });
+}
 
 // 获取申请人已被授权得功能id
 export function userHasAuthFunIds(params) {

src/pages/common/select-tree/index.vue

@@ -14,6 +14,7 @@
             filterable
             visible-type="branch"
             radioType= "all"
+            :placeholder="placeholder"
             @change="handleChange"
         >
         </dg-tree-drop>
@@ -31,6 +32,10 @@ export default {
         apiName: {
             type: String,
             default: "getTree"
+        },
+        placeholder: {
+            type: String,
+            default: "请选择所属单位"
         }
     },
     components: {},

src/pages/data-auth-module/auth-subject-manage/user-prop-manage/index.vue

@@ -20,7 +20,7 @@
       </el-form-item>
 
       <el-form-item label="所属机构">
-        <select-tree ref="selectTree" api-name="getOrgTree" @submitTreeValue="getTreeValue" :key="key"></select-tree>
+        <select-tree ref="selectTree" api-name="getOrgTree" @submitTreeValue="getTreeValue" :key="key" placeholder="请选择所属机构"></select-tree>
       </el-form-item>
 
       <el-form-item>

src/pages/list-manage/red-list-manage/component/app-func.vue

@@ -3,14 +3,15 @@
     <!-- 筛选项 -->
     <el-form ref="ruleForm" inline>
       <el-form-item label="红名单级别">
-        <dg-select v-model="form.level.value" placeholder="请选择用户类型" enum="ListLevelEnum" clearable> </dg-select>
+        <dg-select v-model="form.level.value" placeholder="请选择红名单级别" enum="ListLevelEnum" clearable>
+        </dg-select>
       </el-form-item>
       <el-form-item label="应用系统名称">
         <el-input v-model="form.appName.value" placeholder="请输入应用系统名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="应用系统编号">
+      <!-- <el-form-item label="应用系统编号">
         <el-input v-model="form.appCode.value" placeholder="请输入应用系统编号" clearable></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
         <dg-button type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
@@ -22,18 +23,44 @@
       <dg-button type="primary" @click="handleSetListLevel" icon="el-icon-setting">批量设置名单级别</dg-button>
       <dg-button type="primary" @click="handleBatchRemove" icon="el-icon-remove-outline">批量移除</dg-button>
     </dg-row>
-    <vxe-grid v-bind="gridOptions" ref="vxeGrid" :data="tableData" @checkbox-change="selectChangeEvent">
-      <template #level_column="{ row }">
-        {{ levelToLabel(row.level) }}
-      </template>
-      <template #operate_header="{ row }">
-        <div class="u-table__operation">
-          <el-tooltip content="移除" effect="dark" placement="top-end">
-            <i class="el-icon-remove-outline" @click="handleRemove(row)"></i>
-          </el-tooltip>
-        </div>
-      </template>
-    </vxe-grid>
+    <vxe-table ref="vxeGrid" :data="tableData" v-bind="gridOptions">
+      <vxe-table-column type="checkbox" width="60" align="center">
+        <template #header="row">
+          <span class="custom-checkbox">
+            <el-checkbox
+              :indeterminate="row.indeterminate"
+              v-model="row.checked"
+              @change="handleToggleAllCheck"
+            ></el-checkbox>
+          </span>
+        </template>
+        <template #checkbox="scoped">
+          <span class="custom-checkbox">
+            <el-checkbox
+              :indeterminate="scoped.indeterminate"
+              v-model="scoped.checked"
+              @change="handleToggleCheck(scoped.row)"
+            ></el-checkbox>
+          </span>
+        </template>
+      </vxe-table-column>
+      <vxe-table-column type="seq" width="60" align="center" title="序号"></vxe-table-column>
+      <vxe-table-column align="center" title="应用功能名称" field="label" :treeNode="true"></vxe-table-column>
+      <vxe-table-column align="center" title="红名单级别" field="level">
+        <template #default="{ row }">
+          {{ levelToLabel(row.level) }} 
+        </template>
+      </vxe-table-column>
+      <vxe-table-column align="center" title="操作" field="operate">
+        <template #default="{ row }">
+          <div class="u-table__operation">
+            <el-tooltip content="移除" effect="dark" placement="top-end">
+              <i class="el-icon-remove-outline" @click="handleRemove(row)"></i>
+            </el-tooltip>
+          </div>
+        </template>
+      </vxe-table-column>
+    </vxe-table>
     <!-- 分页器 -->
     <div class="pagination-section">
       <el-pagination
@@ -41,7 +68,7 @@
         @current-change="handleCurrentChange"
         :current-page="currentPage"
         :page-sizes="[10, 20, 30]"
-        :page-size="size"
+        :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
@@ -59,6 +86,7 @@ import jzApi from '@/api/jz-base';
 export default {
   data() {
     return {
+      a: '0',
       form: {
         level: {
           value: '',
@@ -76,7 +104,7 @@ export default {
       // 分页器
       currentPage: 1,
       total: 0,
-      size: 10,
+      pageSize: 10,
       // 数据
       tableData: [],
       gridOptions: {
@@ -87,23 +115,17 @@ export default {
         checkboxConfig: {
           // 设置复选框支持分页勾选，需要设置 rowId 行数据主键
           reserve: true
-        },
-        columns: [
-          { type: 'checkbox', width: 50, align: 'center' },
-          { type: 'seq', width: 60, align: 'center', title: '序号' },
-          { title: '应用功能名称', field: 'label', treeNode: true, align: 'center' },
-          { field: 'level', title: '红名单级别', align: 'center', slots: { default: 'level_column' } },
-          {
-            field: 'address',
-            title: '操作',
-            slots: { default: 'operate_header' },
-            align: 'center'
-          }
-        ]
+        }
       }
     };
   },
   methods: {
+    handleToggleCheck(row) {
+      this.$refs.vxeGrid.toggleCheckboxRow(row);
+    },
+    handleToggleAllCheck() {
+      this.$refs.vxeGrid.toggleAllCheckboxRow();
+    },
     /**
      * @description:查询
      */
@@ -200,10 +222,14 @@ export default {
       });
     },
 
-    handleSizeChange(val) {},
-    handleCurrentChange(val) {},
-    selectChangeEvent({ records, reserves, indeterminates, checked, row }) {
-      console.info(`勾选${records.length}个树形节点`, records);
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getList();
     },
     /**
      * 获取列表
@@ -211,7 +237,7 @@ export default {
     getList() {
       const params = {
         page: this.currentPage,
-        size: this.size,
+        size: this.pageSize,
         searchCondition: this.form
       };
 

src/pages/list-manage/red-list-manage/component/batch-add-appfunc.vue

@@ -12,10 +12,32 @@
       <el-form-item>
         <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
       </el-form-item>
-    </el-form>  
+    </el-form>
     <!-- 表格树 -->
-    <vxe-grid v-bind="gridOptions" ref="vxeGrid" :data="sourceData" @checkbox-change="selectChangeEvent"></vxe-grid>
-    <!-- <vxe-grid v-bind="gridOptions" ref="vxeGrid" :data="targetData" @checkbox-change="selectChangeEvent"></vxe-grid> -->
+    <vxe-table ref="vxeGrid" :data="sourceData" v-bind="gridOptions">
+      <vxe-table-column type="checkbox" width="60" align="center">
+        <template #header="row">
+          <span class="custom-checkbox">
+            <el-checkbox
+              :indeterminate="row.indeterminate"
+              v-model="row.checked"
+              @change="handleToggleAllCheck"
+            ></el-checkbox>
+          </span>
+        </template>
+        <template #checkbox="scoped">
+          <span class="custom-checkbox">
+            <el-checkbox
+              :indeterminate="scoped.indeterminate"
+              v-model="scoped.checked"
+              @change="handleToggleCheck(scoped.row)"
+            ></el-checkbox>
+          </span>
+        </template>
+      </vxe-table-column>
+      <vxe-table-column type="seq" width="60" align="center" title="序号"></vxe-table-column>
+      <vxe-table-column align="center" title="应用功能名称" field="label" :treeNode="true"></vxe-table-column>
+    </vxe-table>
 
     <div v-footer>
       <dg-button @click="handleCancel">取消</dg-button>
@@ -27,7 +49,7 @@
 <script>
 import getTreeDataMixin from '@/pages/common/transfer-tree/mixin';
 import batchSetlevelAppFunc from './batch-setlevel-appfunc.vue';
-import { getFunIdsInRedList } from '@/api/list-manage'
+import { getFunIdsInRedList } from '@/api/list-manage';
 export default {
   props: {
     data: [Array]
@@ -44,40 +66,43 @@ export default {
       gridOptions: {
         border: true,
         rowId: 'id',
-        treeConfig: { children: 'child', indent: 40},
+        treeConfig: { children: 'child', indent: 40 },
         loading: false,
         checkboxConfig: {
           // 设置复选框支持分页勾选，需要设置 rowId 行数据主键
           reserve: true
-        },
-        columns: [
-          { type: 'checkbox', width: 50, align: 'center' },
-          { type: 'seq', width: 60, align: 'center', title: '序号' },
-          { title: '应用功能名称', field: 'label', treeNode: true, align: 'center' }
-        ]
+        }
       }
     };
   },
   computed: {},
   methods: {
-    selectChangeEvent() {},
-    handleSearch() {},
+    handleToggleCheck(row) {
+      this.$refs.vxeGrid.toggleCheckboxRow(row);
+    },
+    handleToggleAllCheck() {
+      this.$refs.vxeGrid.toggleAllCheckboxRow();
+    },
+    handleSearch() {
+       this.dataSource = this.data.filter(item => item.label.indexOf(this.appName) > -1);
+
+    },
     handleCancel() {
       this.$emit('close');
     },
     handleSubmit() {
       // 获取全选和半选的节点
-       const checkboxRecords = this.$refs.vxeGrid.getCheckboxRecords(true);
-       const indeterminateRecords = this.$refs.vxeGrid.getCheckboxIndeterminateRecords(true);
-       const totalRecords = [...checkboxRecords,...indeterminateRecords].filter(item => item.appId);
-       
+      const checkboxRecords = this.$refs.vxeGrid.getCheckboxRecords(true);
+      const indeterminateRecords = this.$refs.vxeGrid.getCheckboxIndeterminateRecords(true);
+      const totalRecords = [...checkboxRecords, ...indeterminateRecords].filter((item) => item.appId);
+
       if (totalRecords.length > 0) {
         this.setLevel(totalRecords);
       } else {
         this.$message.warning('请至少选择一个应用功能!');
       }
     },
-      /**
+    /**
      * 设置名单等级
      */
     setLevel(selectedData) {
@@ -87,14 +112,14 @@ export default {
         content: batchSetlevelAppFunc,
         props: {
           data: this.data,
-          value: selectedData.map(item => item.id),
+          value: selectedData.map((item) => item.id),
           selectedData,
-          operate: "add"
+          operate: 'add'
         },
         on: {
           success() {
-             vm.$emit('success');
-              layer.close(layer.dialogIndex);
+            vm.$emit('success');
+            layer.close(layer.dialogIndex);
           }
         },
         cancel: function (index) {
@@ -108,9 +133,9 @@ export default {
   },
   created() {
     // 查询已被添加为红名单的功能id
-    getFunIdsInRedList().then(res => {
-       this.value = res.data.content;
-    })
+    getFunIdsInRedList().then((res) => {
+      this.value = res.data.content;
+    });
   },
   mounted() {}
 };

src/pages/list-manage/red-list-manage/component/batch-delete-appfunc.vue

@@ -60,6 +60,7 @@ export default {
     handleCancel() {
       this.$emit('close');
     },
+    // 批量删除
     handleSubmit() {
       delBatchRedAppFunc({
         listIds: this.selectedData.map(item => item.listId)

src/pages/list-manage/white-list-manage/component/batch-add-user.vue

@@ -5,38 +5,31 @@
 -->
 <template>
   <div>
-    <dg-row :gutter="20">
-      <dg-col :span="8">
-        <org-tree
-          ref="tree"
-          class="u-pm__left"
-          treeHeight="620px"
-          paddingRight="15px"
-          :search="true"
-          :isClearSelectedNode="clearSelectedNode"
-          @handleGetNode="handleGetNode"
-          @submitRootNode="submitRootNode"
-          @doClickSearchItem="handleGetNode"
-          @setClearNodesFlag="getClearNodesFlag"
-        ></org-tree>
-      </dg-col>
-      <dg-col :span="16">
-        <!-- 搜索栏 -->
-        <el-form :inline="true" class="search-form">
-          <el-form-item label="姓名">
-            <el-input v-model="form.name.value" clearable style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="身份证号码">
-            <el-input v-model="form.idcard.value" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
-            <dg-button type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
-          </el-form-item>
-        </el-form>
-        <!-- 表格 -->
-        <new-table v-if="" ref="table" :tableUrl="tableUrl" :tableHeader="tableHeader" :condition="form"> </new-table>
-      </dg-col>
+    <dg-row>
+      <!-- 搜索栏 -->
+      <el-form :inline="true" class="search-form">
+        <el-form-item label="姓名">
+          <el-input v-model="form.name.value" clearable style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号码">
+          <el-input v-model="form.idcard.value" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="所属单位">
+          <select-tree
+            ref="selectTree"
+            api-name="getOrgTree"
+            nodeKey="id"
+            @submitTreeValue="getTreeValue"
+            :key="key"
+          ></select-tree>
+        </el-form-item>
+        <el-form-item>
+          <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
+          <dg-button type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
+        </el-form-item>
+      </el-form>
+      <!-- 表格 -->
+      <new-table ref="table" :tableUrl="tableUrl" :tableHeader="tableHeader" :condition="form"> </new-table>
     </dg-row>
     <div v-footer>
       <dg-button @click="handleCancel">取消</dg-button>
@@ -46,21 +39,21 @@
 </template>
 
 <script>
-import orgTree from '@/pages/common/tree';
 import { notInWhiteUserTableUrl } from '@/api/list-manage';
 import newTable from '@/pages/common/new-table';
 import batchSetlevelUser from './batch-setlevel-user.vue';
+import selectTree from '@/pages/common/select-tree';
 
 export default {
   components: {
-    orgTree,
-    newTable
+    newTable,
+    selectTree
   },
   data() {
     return {
       tableUrl: notInWhiteUserTableUrl,
       tableHeader: [
-          {
+        {
           label: '姓名',
           prop: 'name'
         },
@@ -78,7 +71,7 @@ export default {
         name: { value: '', op: 'like' },
         idcard: { value: '', op: 'like' }
       },
-      clearSelectedNode: false,
+      key: 0
     };
   },
   computed: {},
@@ -93,34 +86,21 @@ export default {
      * 重置
      */
     handleReset() {
+      if (this.form.orgId.value) {
+        this.key++;
+      }
       for (const key in this.form) {
         this.form[key].value = '';
       }
     },
     /**
-     * @description: 获取机构节点
-     * @param {*} node
-     */
-    handleGetNode({ id }) {
-      const oldValue = this.form.orgId.value;
-      if (oldValue !== id) {
-        this.form.orgId.value = id;
-        this.handleSearch();
-      }
-    },
-    // 默认获取根节点
-    submitRootNode({ id }) {
-      this.$nextTick(() => {
-        this.handleGetNode({ id });
-      });
-    },
-    /**
-     * @description: 设置清除选中节点标志
-     * @param {*} val
+     * 接收机构树值
      */
-    getClearNodesFlag(val) {
-      this.clearSelectedNode = val;
+
+    getTreeValue(val) {
+      this.form.orgId.value = val;
     },
+
     /**
      * 取消
      */
@@ -148,12 +128,12 @@ export default {
         content: batchSetlevelUser,
         props: {
           selectedData,
-          operate: "add"
+          operate: 'add'
         },
         on: {
           success() {
-             vm.$emit('success');
-              layer.close(layer.dialogIndex);
+            vm.$emit('success');
+            layer.close(layer.dialogIndex);
           }
         },
         cancel: function (index) {

src/pages/list-manage/white-list-manage/component/user-list.vue

@@ -17,7 +17,7 @@
       <el-form-item label="身份证号码">
         <el-input v-model="form.idcard.value" placeholder="请输入身份证号码" clearable></el-input>
       </el-form-item>
-      <el-form-item label="单位名称">
+      <el-form-item label="所属单位">
         <select-tree
           ref="selectTree"
           api-name="getOrgTree"

src/pages/permission-selfhelp-manage/DataConfig.js

@@ -1,7 +1,8 @@
 export const tableHeader = [
   {
     label: '流程标题',
-    prop: 'flowTitle'
+    prop: 'flowTitle',
+    width: '380px'
   },
   {
     label: '审批类型',

src/pages/permission-selfhelp-manage/index.vue

@@ -63,7 +63,7 @@
 <script>
 import Table from '@/pages/common/table';
 import { tableHeader } from './DataConfig';
-import { tableUrl, applyDetail, delApply, userHasAuthFunIds } from '@/api/permission-selfhelp-manage';
+import { tableUrl, delApply, recallApply } from '@/api/permission-selfhelp-manage';
 export default {
   components: {
     Table
@@ -160,7 +160,15 @@ export default {
       });
     },
     handleRecall(row) {
-      this.$dgConfirm(`是否确认撤回该条流程！`, '提示', {}).then(() => {});
+      this.$dgConfirm(`是否确认撤回该条流程！`, '提示', {}).then(() => {
+        const params = {
+          id: row.id
+        };
+        recallApply(params).then((res) => {
+          this.$message.success('撤回成功！');
+          this.handleSearch();
+        });
+      });
     }
   },
   created() {},

src/utils/request-base.js

@@ -37,7 +37,7 @@ service.interceptors.request.use(
         // Do something before request is sent
         config = window.loginUtil.beforeRequest(config);
         config.headers["X-Requested-With"] = "XMLHttpRequest";
-        config.headers['userToken'] = Cookies.get('_idp_session') || 'testUserToken',
+        config.headers['userToken'] = Cookies.get('_idp_session') || null,
         loadingShow(config);
 
         return config;