From d5b656af4c0e7e062d1bedb39e1612e99566341f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Sep 2021 17:19:28 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/securityGuardManagement/registerOnce.vue | 85 +++---------------------------------------
1 files changed, 6 insertions(+), 79 deletions(-)
diff --git a/src/views/securityGuardManagement/registerOnce.vue b/src/views/securityGuardManagement/registerOnce.vue
index 17d545a..79bffa2 100644
--- a/src/views/securityGuardManagement/registerOnce.vue
+++ b/src/views/securityGuardManagement/registerOnce.vue
@@ -1,31 +1,17 @@
/*
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 15:41:13
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-17 17:13:04
* menu-name 保安员注册查询
*/
<template>
<div>
<el-row class="registersss">
- <el-col :span="spanLeft">
- <div class="box">
- <el-scrollbar>
- <basic-container>
- <avue-tree
- :option="treeOption"
- :data="treeData"
- @node-click="nodeClick"
- />
- </basic-container>
- </el-scrollbar>
- </div>
- </el-col>
<el-col :span="spanRight">
<basic-container>
<avue-crud
:option="option"
- :search.sync="search"
:table-loading="loading"
:data="data"
ref="crud"
@@ -41,24 +27,6 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
>
- <!-- @on-load="onLoad" -->
- <!-- @row-click="handleRowClick" -->
- <!-- <template slot-scope="{row}"
- slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
- </template>
- <template slot-scope="{row}"
- slot="roleName">
- <el-tag>{{row.roleName}}</el-tag>
- </template>
- <template slot-scope="{row}"
- slot="deptName">
- <el-tag>{{row.deptName}}</el-tag>
- </template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
- </template> -->
<template slot-scope="{ row }" slot="deptId">
<el-tag
class="rowClickSelf"
@@ -298,36 +266,8 @@
deptTree: [],
},
- treeDeptId: "",
jurisdiction: "",
- treeData: [],
- treeOption: {
- nodeKey: "id",
- defaultExpandAll: true,
- lazy: true,
- treeLoad: function (node, resolve) {
- const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then((res) => {
- resolve(
- res.data.data.map((item) => {
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
- },
- addBtn: false,
- menu: false,
- size: "small",
- props: {
- labelText: "标题",
- label: "title",
- value: "value",
- children: "children",
- },
- },
+
option: {
// 操作栏多余按钮去除
delBtn: false,
@@ -374,7 +314,7 @@
searchSpan: 5,
display: false,
overHidden: true,
- search: true,
+ // search: true,
width: 280,
},
{
@@ -764,17 +704,6 @@
};
this.dialogVisible = true;
},
- nodeClick(data) {
- // this.treeDeptId = data.id;
- // console.log(data, 55555);
- if (data.title != "南昌市公安局") {
- this.jurisdiction = data.id;
- } else {
- this.jurisdiction = "";
- }
- this.page.currentPage = 1;
- this.onLoad(this.page);
- },
initData(tenantId) {
getRoleTree(tenantId).then((res) => {
const column = this.findObject(this.option.group, "roleId");
@@ -877,13 +806,12 @@
this.loading = true;
params["jurisdiction"] = this.jurisdiction;
if (this.departmentid) {
- deptId = this.departmentid;
+ params["deptId"] = this.departmentid;
}
getListSecurity(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query),
- deptId
+ Object.assign(params, this.query)
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
@@ -901,7 +829,6 @@
this.selectionClear();
});
},
-
platformSelectionClear() {
this.platformSelectionList = [];
this.$refs.platformCrud.toggleSelection();
--
Gitblit v1.9.3