From c290621c7d69ee12512e01d8cc25fa7b30482f12 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Fri, 25 Feb 2022 18:22:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6DepartList2=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E5=BC=B9=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/DepartList2.vue     | 260 ------------------
 .../src/views/system/modules/DepartModal.vue  |   4 +-
 2 files changed, 3 insertions(+), 261 deletions(-)
 delete mode 100644 jero-web/src/views/system/DepartList2.vue

diff --git a/jero-web/src/views/system/DepartList2.vue b/jero-web/src/views/system/DepartList2.vue
deleted file mode 100644
index 4b15b0c1..00000000
--- a/jero-web/src/views/system/DepartList2.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <!--
-   -->
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysDepart-modal ref="sysDepartModal" @ok="modalFormOk"></sysDepart-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysDepartModal from './modules/DepartModal'
-  /*  import { filterObj } from '@/utils/util'
-    , queryByFactories*/
-  import {queryDepartTreeList} from '@/api/api'
-  import {deleteAction} from '@/api/manage'
-
-  // 表头
-  const columns = [
-    {
-      title: '机构名称',
-      dataIndex: 'departName',
-    },
-    {
-      title: '机构类型',
-      align: "center",
-      dataIndex: 'orgType'
-    },
-    {
-      title: '机构编码',
-      dataIndex: 'orgCode'
-    },
-    {
-      title: '手机号',
-      dataIndex: 'mobile'
-    },
-    {
-      title: '传真',
-      dataIndex: 'fax'
-    },
-    {
-      title: '地址',
-      dataIndex: 'address'
-    },
-    {
-      title: '排序',
-      align: 'center',
-      dataIndex: 'departOrder'
-    },
-    {
-      title: '操作',
-      align: "center",
-      dataIndex: 'action',
-      scopedSlots: {customRender: 'action'},
-    }
-  ];
-
-  export default {
-    name: "DepartList2",
-    components: {
-      SysDepartModal
-    },
-    data() {
-      return {
-        description: 'jero 生成SysDepart代码管理页面',
-        // 查询条件
-        queryParam: {},
-        //数据集
-        factories: '',
-        dataSource: [],
-        columns: columns,
-        // 分页参数
-        /*        ipagination:{
-                  current: 1,
-                  pageSize: 5,
-                  pageSizeOptions: ['5', '10', '20'],
-                  showTotal: (total, range) => {
-                    return range[0] + "-" + range[1] + " 共" + total + "条"
-                  },
-                  showQuickJumper: true,
-                  showSizeChanger: true,
-                  total: 0
-                },*/
-        isorter: {
-          column: 'createTime',
-          order: 'desc',
-        },
-        loading: false,
-        selectedRowKeys: [],
-        selectedRows: [],
-        url: {
-          list: "/sys/sysDepart/page",
-          delete: "/sys/sysDepart/delete",
-          deleteBatch: "/sys/sysDepart/deleteBatch",
-        },
-
-      }
-    },
-    created() {
-      this.loadData();
-    },
-    methods: {
-      loadData() {
-        this.dataSource = [];
-        queryDepartTreeList().then((res) => {
-          if (res.success) {
-            this.dataSource = res.result;
-          }
-        })
-
-      },
-
-      getQueryField() {
-        //TODO 字段权限控制
-        var str = "id,";
-        for (var a = 0; a < this.columns.length; a++) {
-          str += "," + this.columns[a].dataIndex;
-        }
-        return str;
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
-      onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-      },
-//TODO getQueryParams
-      handleDelete: function (id) {
-        var that = this;
-        deleteAction(that.url.delete, {id: id}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData();
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      handleDetail(record) {
-        this.$refs.sysDepartModal.edit(record);
-        this.$refs.sysDepartModal.title = "详情";
-        this.$refs.sysDepartModal.disableSubmit = true;
-      },
-      batchDel: function () {
-        if (this.selectedRowKeys.length <= 0) {
-          this.$message.warning('请选择一条记录！');
-          return;
-        } else {
-          var ids = "";
-          for (var a = 0; a < this.selectedRowKeys.length; a++) {
-            ids += this.selectedRowKeys[a] + ",";
-          }
-          var that = this;
-          this.$confirm({
-            title: "确认删除",
-            content: "是否删除选中数据?",
-            onOk: function () {
-              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-                if (res.success) {
-                  that.$message.success(res.message);
-                  that.loadData();
-                  that.onClearSelected();
-                } else {
-                  that.$message.warning(res.message);
-                }
-              });
-            }
-          });
-        }
-      },
-      handleEdit: function (record) {
-        this.$refs.sysDepartModal.edit(record);
-        this.$refs.sysDepartModal.title = "编辑";
-      },
-      handleAdd() {
-        this.$refs.sysDepartModal.add();
-        this.$refs.sysDepartModal.title = "新增";
-      },
-      handleTableChange(pagination, filters, sorter) {
-        //分页、排序、筛选变化时触发
-        console.log(sorter);
-        //TODO 筛选
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-        }
-        /*this.ipagination = pagination;*/
-        this.loadData();
-      },
-      modalFormOk() {
-        // 新增/修改 成功时，重载列表
-        this.loadData();
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/system/modules/DepartModal.vue b/jero-web/src/views/system/modules/DepartModal.vue
index eed530c9..ff229d5b 100644
--- a/jero-web/src/views/system/modules/DepartModal.vue
+++ b/jero-web/src/views/system/modules/DepartModal.vue
@@ -109,7 +109,8 @@
         visible: false,
         condition:true,
         disableSubmit:false,
-        model: {
+        model: {},
+        defaultModel:{
           departOrder:0,
           orgCategory:'1'
         },
@@ -165,6 +166,7 @@
       },
       edit (record) {
           this.visible = true;
+          this.model = Object.assign({}, this.defaultModel, record)
           this.loadTreeData();
           this.model.parentId = record!=null?record.toString():null;
           if(this.seen){