接口联调

src/api/permission-selfhelp-manage.js

@@ -17,7 +17,7 @@ export function savePermissionApply(data) {
 }
 
 // 权限自助列表ul
-export const tableUrl = `${baseUrl}/funAuthList`
+export const tableUrl = `${baseUrl}/authApplySearch`
 
 // 获取全量应用功能菜单树
 export function allAppFuncTree() {
@@ -27,6 +27,25 @@ export function allAppFuncTree() {
   });
 }
 
+// 获取申请单详情
+export function applyDetail(params) {
+  return request({
+    url: `${baseUrl}/funApplyDetail`,
+    method: 'GET',
+    params
+  });
+}
+
+// 删除申请单
+export function delApply(params) {
+  return request({
+    url: `${baseUrl}/authApplyDelete`,
+    method: 'DELETE',
+    params
+  });
+}
+
+
 // 获取申请人已被授权得功能id
 export function userHasAuthFunIds(params) {
   return request({

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

@@ -35,7 +35,7 @@
           </el-form-item>
         </el-form>
         <!-- 表格 -->
-        <new-table ref="table" :tableUrl="tableUrl" :tableHeader="tableHeader" :condition="form"> </new-table>
+        <new-table v-if="" ref="table" :tableUrl="tableUrl" :tableHeader="tableHeader" :condition="form"> </new-table>
       </dg-col>
     </dg-row>
     <div v-footer>
@@ -78,7 +78,7 @@ export default {
         name: { value: '', op: 'like' },
         idcard: { value: '', op: 'like' }
       },
-      clearSelectedNode: false
+      clearSelectedNode: false,
     };
   },
   computed: {},

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

@@ -141,7 +141,7 @@ export default {
       }
     },
     // 打开弹窗
-    openLayer(title, content, opetare, area = ['800px', '600px']) {
+    openLayer(title, content, operate, area = ['800px', '600px']) {
       const vm = this;
       const selectedData = vm.$refs.table.newChooseArr;
       const layer = this.$dgLayer({
@@ -149,12 +149,12 @@ export default {
         content,
         props: {
           selectedData,
-          opetare
+          operate
         },
         on: {
           success() {
-            if (opetare == 'del') {
-              this.removeList(selectedData);
+            if (operate == 'del') {
+              vm.removeList(selectedData);
             } else {
               vm.handleSearch();
             }

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

@@ -1,11 +1,11 @@
 export const tableHeader = [
   {
     label: '流程标题',
-    prop: 'authorizeType'
+    prop: 'flowTitle'
   },
   {
     label: '审批类型',
-    prop: 'authorizeType',
+    prop: 'applyType',
     enum: 'AuthorizeTypeEnum'
   },
   {
@@ -16,7 +16,7 @@ export const tableHeader = [
   },
   {
     label: '当前节点',
-    prop: 'createTime'
+    prop: 'taskName'
   },
   {
     label: '未操作者',

src/pages/permission-selfhelp-manage/component/app-func-form.vue

@@ -89,7 +89,6 @@ export default {
               funId: item.id
             };
           });
-
         this.$emit('success', approveContent, this.selectedValue, resourceInfos);
       }
     },

src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -332,7 +332,7 @@ export default {
           { required: true, message: '请输入申请人电话号码', trigger: 'change' },
           { validator: checkPhoneValid, trigger: 'change' }
         ],
-        permissionValidType: {required: true, validator: checkPermissionValid, trigger: 'change' },
+        permissionValidType: { required: true, validator: checkPermissionValid, trigger: 'change' },
         applyId: [{ required: true, message: '请选择应用方', trigger: 'change' }], // 应用方
         userName: [{ required: true, message: '请输入人员名称', trigger: 'change' }],
         userType: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
@@ -452,10 +452,11 @@ export default {
           success(approveContent, selectKeys, resourceInfos = []) {
             vm.sizeForm.resourceInfos = resourceInfos;
             vm.applySelectKeys = selectKeys;
-            vm.sizeForm.flowContent =
-              vm.sizeForm.applyType !== '1'
-                ? vm.sizeForm.applicantName
-                : vm.sizeForm.applyId + '申请访问资源：' + approveContent;
+            // vm.sizeForm.flowContent =
+            //   vm.sizeForm.applyType !== '1'
+            //     ? vm.sizeForm.applicantName
+            //     : vm.sizeForm.applyId + '申请访问资源：' + approveContent;
+            vm.sizeForm.flowContent = approveContent;
             layer.close(layer.dialogIndex);
           },
           close() {

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

@@ -8,7 +8,7 @@
     <!-- 搜索项 -->
     <el-form ref="ruleForm" inline :model="form">
       <el-form-item label="流程标题">
-        <el-input v-model="form.processName.value" placeholder="请输入流程标题" clearable></el-input>
+        <el-input v-model="form.flowTitle.value" placeholder="请输入流程标题" clearable></el-input>
       </el-form-item>
       <el-form-item label="审批类型">
         <dg-select v-model="form.applyType.value" placeholder="请选择授权管理类型" enum="AuthorizeTypeEnum" clearable>
@@ -39,19 +39,19 @@
     <!-- 表格 -->
     <Table ref="myTable" :url="tableUrl" :headerData="tableHeader" :condition="form">
       <dg-table-column label="操作" align="center">
-        <template slot-scope="scope">
+        <template slot-scope="{ row }">
           <div class="u-table__operation">
             <el-tooltip content="详情" effect="dark" placement="top-end">
-              <i class="el-icon-document" @click="handleViewDetail(scope.row)"></i>
+              <i class="el-icon-document" @click="handleViewDetail(row)"></i>
             </el-tooltip>
-             <el-tooltip content="编辑" effect="dark" placement="top-end">
-              <i class="el-icon-edit" @click="handleApplyPermission(scope.row.id)"></i>
+            <el-tooltip content="编辑" effect="dark" placement="top-end" v-if="row.showEdit">
+              <i class="el-icon-edit" @click="handleApplyPermission(row.id)"></i>
             </el-tooltip>
-             <el-tooltip content="撤回" effect="dark" placement="top-end">
-              <i class="el-icon-back" @click="handleRecall(scope.row)"></i>
+            <el-tooltip content="撤回" effect="dark" placement="top-end" v-if="row.showRecall">
+              <i class="el-icon-back" @click="handleRecall(row)"></i>
             </el-tooltip>
-             <el-tooltip content="删除" effect="dark" placement="top-end">
-              <i class="el-icon-delete" @click="handleDelete(scope.row)"></i>
+            <el-tooltip content="删除" effect="dark" placement="top-end">
+              <i class="el-icon-delete" @click="handleDelete(row)"></i>
             </el-tooltip>
           </div>
         </template>
@@ -63,7 +63,7 @@
 <script>
 import Table from '@/pages/common/table';
 import { tableHeader } from './DataConfig';
-import { tableUrl } from "@/api/permission-selfhelp-manage"
+import { tableUrl, applyDetail, delApply } from '@/api/permission-selfhelp-manage';
 export default {
   components: {
     Table
@@ -73,7 +73,7 @@ export default {
       tableUrl,
       tableHeader,
       form: {
-        processName: {
+        flowTitle: {
           value: '',
           op: 'like'
         },
@@ -112,10 +112,10 @@ export default {
     handleApplyPermission(id) {
       const vm = this;
       const layer = this.$dgLayer({
-        title: '权限自助申请',
+        title: id ? '编辑' : '权限自助申请',
         props: {
-          id: id ? id : "",
-          type: id ? "edit" : "add"
+          id: id ? id : '',
+          type: id ? 'edit' : 'add'
         },
         content: require('./component/basic-form.vue'),
         area: ['1100px', '800px'],
@@ -130,12 +130,17 @@ export default {
         }
       });
     },
-    handleViewDetail() {
+    handleViewDetail(row) {
+      const params = {
+        id: row.id,
+        needFlowInfo: true
+      };
+      applyDetail(params).then((res) => {});
       const layer = this.$dgLayer({
         title: '详情',
         props: {
           id: '1111',
-          type: "detail"
+          type: 'detail'
         },
         content: require('./component/detail.vue'),
         area: ['1100px', '800px'],
@@ -150,12 +155,18 @@ export default {
       });
     },
     handleDelete(row) {
-      this.$dgConfirm(`是否确认删除该条流程！`, '提示', {}).then(() => {});
+      this.$dgConfirm(`是否确认删除该条流程！`, '提示', {}).then(() => {
+        delApply({
+          id: row.id
+        }).then((res) => {
+          this.$message.success('删除成功！');
+          this.handleSearch();
+        });
+      });
     },
     handleRecall(row) {
-       this.$dgConfirm(`是否确认撤回该条流程！`, '提示', {}).then(() => {});
+      this.$dgConfirm(`是否确认撤回该条流程！`, '提示', {}).then(() => {});
     }
-
   },
   created() {},
   mounted() {}