From 5b3142176513dace94ecae2a82fb870ac1de39d7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Jan 2024 10:15:50 +0800
Subject: [PATCH] 1

---
 src/views/system/dept.vue              |  682 ++++++++++++++++++++++++++++----------------------------
 src/views/property/propertyCompany.vue |    2 
 2 files changed, 342 insertions(+), 342 deletions(-)

diff --git a/src/views/property/propertyCompany.vue b/src/views/property/propertyCompany.vue
index a13f53e..604ad31 100644
--- a/src/views/property/propertyCompany.vue
+++ b/src/views/property/propertyCompany.vue
@@ -135,7 +135,7 @@
               hide: true,
               span: 6,
               cascader: ['city'],
-              dicUrl: `/api/blade-system/region/select`,
+              dicUrl: `/api/blade-system/region/select?code=100000`,
               rules: [{
                 required: true,
                 message: '请选择省份',
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index eb50093..6a5a6ed 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,355 +1,355 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-      :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @row-del="rowDel"
-      @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
-      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-      @refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad">
-      <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-delete" v-if="permission.dept_delete" plain
-          @click="handleDelete">删 除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
-          @click.stop="handleAdd(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">新增子项
-        </el-button>
-      </template>
-      <template slot-scope="{row}" slot="deptCategory">
-        <el-tag>{{ row.deptCategoryName }}</el-tag>
-      </template>
-    </avue-crud>
-  </basic-container>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+            :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @row-del="rowDel"
+            @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
+            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad">
+            <template slot="menuLeft">
+                <el-button type="danger" size="small" icon="el-icon-delete" v-if="permission.dept_delete" plain
+                    @click="handleDelete">删 除
+                </el-button>
+            </template>
+            <template slot-scope="scope" slot="menu">
+                <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
+                    @click.stop="handleAdd(scope.row, scope.index)" v-if="permission.add_children">新增子项
+                </el-button>
+            </template>
+            <template slot-scope="{row}" slot="deptCategory">
+                <el-tag>{{ row.deptCategoryName }}</el-tag>
+            </template>
+        </avue-crud>
+    </basic-container>
 </template>
 
 <script>
 import {
-  getLazyList,
-  remove,
-  update,
-  add,
-  getDept,
-  getDeptTree
-} from "@/api/system/dept";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
+    getLazyList,
+    remove,
+    update,
+    add,
+    getDept,
+    getDeptTree
+} from "@/api/system/dept"
+import { mapGetters } from "vuex"
+import website from '@/config/website'
 
 export default {
-  data() {
-    return {
-      form: {},
-      selectionList: [],
-      query: {},
-      loading: true,
-      parentId: 0,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      option: {
-        lazy: true,
-        tip: false,
-        simplePage: true,
-        searchShow: true,
-        searchMenuSpan: 6,
-        tree: true,
-        border: true,
-        index: true,
-        selection: true,
-        viewBtn: true,
-        menuWidth: 300,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "机构名称",
-            prop: "deptName",
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入机构名称",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属租户",
-            prop: "tenantId",
-            type: "tree",
-            dicUrl: "/api/blade-system/tenant/select",
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            span: 24,
-            props: {
-              label: "tenantName",
-              value: "tenantId"
+    data () {
+        return {
+            form: {},
+            selectionList: [],
+            query: {},
+            loading: true,
+            parentId: 0,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            hide: true,
-            search: false,
-            rules: [{
-              required: true,
-              message: "请输入所属租户",
-              trigger: "click"
-            }]
-          },
-          {
-            label: "机构全称",
-            prop: "fullName",
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入机构全称",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "上级机构",
-            prop: "parentId",
-            dicData: [],
-            type: "tree",
-            hide: true,
-            addDisabled: false,
-            props: {
-              label: "title"
+            option: {
+                lazy: true,
+                tip: false,
+                simplePage: true,
+                searchShow: true,
+                searchMenuSpan: 6,
+                tree: true,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: true,
+                menuWidth: 300,
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "机构名称",
+                        prop: "deptName",
+                        search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入机构名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "所属租户",
+                        prop: "tenantId",
+                        type: "tree",
+                        dicUrl: "/api/blade-system/tenant/select",
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        span: 24,
+                        props: {
+                            label: "tenantName",
+                            value: "tenantId"
+                        },
+                        hide: true,
+                        search: false,
+                        rules: [{
+                            required: true,
+                            message: "请输入所属租户",
+                            trigger: "click"
+                        }]
+                    },
+                    {
+                        label: "机构全称",
+                        prop: "fullName",
+                        search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入机构全称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "上级机构",
+                        prop: "parentId",
+                        dicData: [],
+                        type: "tree",
+                        hide: true,
+                        addDisabled: false,
+                        props: {
+                            label: "title"
+                        },
+                        rules: [{
+                            required: false,
+                            message: "请选择上级机构",
+                            trigger: "click"
+                        }]
+                    },
+                    {
+                        label: "机构类型",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        dataType: "number",
+                        width: 120,
+                        prop: "deptCategory",
+                        slot: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入机构类型",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "管辖区域",
+                        prop: "regionCode",
+                        type: "tree",
+                        dicUrl: "/api/blade-system/region/tree?cityCode=361100",
+                        props: {
+                            label: "name",
+                            value: "id",
+                        },
+                        defaultExpandedKeys: ["361102003"],
+                        rules: [{
+                            required: false,
+                            message: "请选择管辖区域",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "排序",
+                        prop: "sort",
+                        type: "number",
+                        align: "right",
+                        width: 80,
+                        rules: [{
+                            required: true,
+                            message: "请输入排序",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "备注",
+                        prop: "remark",
+                        rules: [{
+                            required: false,
+                            message: "请输入备注",
+                            trigger: "blur"
+                        }],
+                        span: 24,
+                        hide: true
+                    }
+                ]
             },
-            rules: [{
-              required: false,
-              message: "请选择上级机构",
-              trigger: "click"
-            }]
-          },
-          {
-            label: "机构类型",
-            type: "select",
-            dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dataType: "number",
-            width: 120,
-            prop: "deptCategory",
-            slot: true,
-            rules: [{
-              required: true,
-              message: "请输入机构类型",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "管辖区域",
-            prop: "regionCode",
-            type: "tree",
-            dicUrl: "/api/blade-system/region/tree?cityCode=361100",
-            props: {
-              label: "name",
-              value: "id",
-            },
-            defaultExpandedKeys: ["361102003"],
-            rules: [{
-              required: false,
-              message: "请选择管辖区域",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "排序",
-            prop: "sort",
-            type: "number",
-            align: "right",
-            width: 80,
-            rules: [{
-              required: true,
-              message: "请输入排序",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "备注",
-            prop: "remark",
-            rules: [{
-              required: false,
-              message: "请输入备注",
-              trigger: "blur"
-            }],
-            span:24,
-            hide: true
-          }
-        ]
-      },
-      data: []
-    };
-  },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.dept_add, false),
-        viewBtn: this.vaildData(this.permission.dept_view, false),
-        delBtn: this.vaildData(this.permission.dept_delete, false),
-        editBtn: this.vaildData(this.permission.dept_edit, false)
-      };
+            data: []
+        }
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
+    computed: {
+        ...mapGetters(["userInfo", "permission"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.dept_add, false),
+                viewBtn: this.vaildData(this.permission.dept_view, false),
+                delBtn: this.vaildData(this.permission.dept_delete, false),
+                editBtn: this.vaildData(this.permission.dept_edit, false)
+            }
+        },
+        ids () {
+            let ids = []
+            this.selectionList.forEach(ele => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
+        }
+    },
+    methods: {
+        initData () {
+            getDeptTree().then(res => {
+                const column = this.findObject(this.option.column, "parentId")
+                column.dicData = res.data.data
+            })
+        },
+        handleAdd (row) {
+            this.parentId = row.id
+            const column = this.findObject(this.option.column, "parentId")
+            column.value = row.id
+            column.addDisabled = true
+            this.$refs.crud.rowAdd()
+        },
+        rowSave (row, done, loading) {
+            add(row).then((res) => {
+                // 获取新增数据的相关字段
+                const data = res.data.data
+                row.id = data.id
+                row.deptCategoryName = data.deptCategoryName
+                row.tenantId = data.tenantId
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                // 数据回调进行刷新
+                done(row)
+            }, error => {
+                window.console.log(error)
+                loading()
+            })
+        },
+        rowUpdate (row, index, done, loading) {
+            update(row).then(() => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                // 数据回调进行刷新
+                done(row)
+            }, error => {
+                window.console.log(error)
+                loading()
+            })
+        },
+        rowDel (row, index, done) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    // 数据回调进行刷新
+                    done(row)
+                })
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    // 刷新表格数据并重载
+                    this.data = []
+                    this.parentId = 0
+                    this.$refs.crud.refreshTable()
+                    this.$refs.crud.toggleSelection()
+                    // 表格数据重载
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.parentId = 0
+            this.onLoad(this.page)
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.parentId = ''
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
+            done()
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            this.$refs.crud.toggleSelection()
+        },
+        beforeOpen (done, type) {
+            if (["add", "edit"].includes(type)) {
+                this.initData()
+            }
+            if (["edit", "view"].includes(type)) {
+                getDept(this.form.id).then(res => {
+                    this.form = res.data.data
+                })
+            }
+            done()
+        },
+        beforeClose (done) {
+            this.parentId = ""
+            const column = this.findObject(this.option.column, "parentId")
+            column.value = ""
+            column.addDisabled = false
+            done()
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            this.loading = true
+            getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
+                this.data = res.data.data
+                this.loading = false
+                this.selectionClear()
+            })
+        },
+        treeLoad (tree, treeNode, resolve) {
+            const parentId = tree.id
+            getLazyList(parentId).then(res => {
+                resolve(res.data.data)
+            })
+        }
     }
-  },
-  methods: {
-    initData() {
-      getDeptTree().then(res => {
-        const column = this.findObject(this.option.column, "parentId");
-        column.dicData = res.data.data;
-      });
-    },
-    handleAdd(row) {
-      this.parentId = row.id;
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = row.id;
-      column.addDisabled = true;
-      this.$refs.crud.rowAdd();
-    },
-    rowSave(row, done, loading) {
-      add(row).then((res) => {
-        // 获取新增数据的相关字段
-        const data = res.data.data;
-        row.id = data.id;
-        row.deptCategoryName = data.deptCategoryName;
-        row.tenantId = data.tenantId;
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    rowDel(row, index, done) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          // 数据回调进行刷新
-          done(row);
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          // 刷新表格数据并重载
-          this.data = [];
-          this.parentId = 0;
-          this.$refs.crud.refreshTable();
-          this.$refs.crud.toggleSelection();
-          // 表格数据重载
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-    },
-    searchReset() {
-      this.query = {};
-      this.parentId = 0;
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.parentId = '';
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    beforeOpen(done, type) {
-      if (["add", "edit"].includes(type)) {
-        this.initData();
-      }
-      if (["edit", "view"].includes(type)) {
-        getDept(this.form.id).then(res => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    beforeClose(done) {
-      this.parentId = "";
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = "";
-      column.addDisabled = false;
-      done();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    treeLoad(tree, treeNode, resolve) {
-      const parentId = tree.id;
-      getLazyList(parentId).then(res => {
-        resolve(res.data.data);
-      });
-    }
-  }
-};
+}
 </script>
 
 <style></style>

--
Gitblit v1.9.3