From 56cd9223acb88e7d27607657f683c998f05f2fb0 Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Fri, 25 Jan 2019 11:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20=E5=8A=A0=E5=85=A5=E5=8D=95=E4=BD=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept.js    |   2 +-
 src/api/system/unit.js    |  48 ++++++++++
 src/views/system/dept.vue | 189 ++++++++++++--------------------------
 3 files changed, 106 insertions(+), 133 deletions(-)
 create mode 100644 src/api/system/unit.js

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 51d62cf..0a521b8 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -42,7 +42,7 @@ export function UpdateDept(data) {
 
 export function GetDeptTree() {
   return fetch({
-    url: '/dept/pulldeptree',
+    url: '/dept/treelist',
     method: 'post',
   })
 }
diff --git a/src/api/system/unit.js b/src/api/system/unit.js
new file mode 100644
index 0000000..2cb64e3
--- /dev/null
+++ b/src/api/system/unit.js
@@ -0,0 +1,48 @@
+import fetch from '@/utils/fetch'
+
+export function UnitList(params) {
+  return fetch({
+    url: '/unit/list',
+    method: 'post',
+    params,
+  })
+}
+
+export function DeleteUnit(id) {
+  return fetch({
+    url: '/unit/delete',
+    method: 'post',
+    params: { id },
+  })
+}
+
+export function GetUnitDetail(id) {
+  return fetch({
+    url: '/unit/detail',
+    method: 'post',
+    params: { id },
+  })
+}
+
+export function AddUnit(data) {
+  return fetch({
+    url: '/unit/add',
+    method: 'post',
+    data,
+  })
+}
+
+export function UpdateUnit(data) {
+  return fetch({
+    url: '/unit/update',
+    method: 'post',
+    data,
+  })
+}
+
+export function GetUnitTree() {
+  return fetch({
+    url: '/unit/treelist',
+    method: 'post',
+  })
+}
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 23c0822..bd8aece 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -3,72 +3,20 @@
     id="dept"
     class=" widget-box">
 
-    <el-button
-      type="primary"
-      size="small"
-      style="margin:10px 0px"
-      @click="New()">新增</el-button>
-
-    <el-table
-      v-loading.body="listLoading"
-      :data="list"
-      element-loading-text="拼命加载中"
-      border
-      fit
-      highlight-current-row>
-      <el-table-column
-        align="center"
-        label="序号"
-        width="95">
-        <template slot-scope="scope">
-          {{ scope.$index+1 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="部门名称">
-        <template slot-scope="scope">
-          {{ scope.row.deptname }}
-        </template>
-      </el-table-column>
-      <el-table-column label="排序码">
-        <template slot-scope="scope">
-          {{ scope.row.rank }}
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        label="操作"
-        align="center"
-        min-width="110px">
-        <template slot-scope="scope">
-          <el-button
-            type="success"
-            size="small"
-            @click="Edit(scope.row.id)">编辑</el-button>
-
-          <el-button
-            type="danger"
-            size="small"
-            @click="Delete(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :current-page="listQuery.pageNumber"
-      :page-sizes="[10, 20, 30]"
-      :page-size="listQuery.pageSize"
-
-      :total="listQuery.totalCount"
-      layout="total,sizes, prev, pager, next"
-      style="margin-top:5px"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
-
-    <el-dialog
-      :title="textMap[dialogStatus]"
-      :visible.sync="dialogFormVisible"
-      :modal-append-to-body="false"
-      width="50%">
-      <el-form
+
+<el-row>
+  <el-col :span="8">
+     <el-tree
+            ref="tree"
+            :data="deptList"
+            :props="defaultProps"
+            show-checkbox
+            node-key="nodeName"
+            highlight-current
+            check-strictly/>
+  </el-col>
+    <el-col :span="16">
+         <el-form
         :model="temp"
         class="small-space"
         label-position="left"
@@ -87,96 +35,83 @@
             placeholder="请输入排序码"/>
         </el-form-item>
 
+    <el-form-item label="分管单位">
+          <el-tree
+            ref="tree"
+            :data="unitList"
+            :props="defaultProps"
+            show-checkbox
+            node-key="nodeName"
+            highlight-current
+            check-strictly/>
+
+        </el-form-item>
+
+
       </el-form>
-      <div
-        slot="footer"
-        class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button
-          v-if="dialogStatus=='create'"
-          type="primary"
-          @click="create">确 定</el-button>
-        <el-button
-          v-else
-          type="primary"
-          @click="update">确 定</el-button>
-      </div>
-    </el-dialog>
+
+    </el-col>
+
+</el-row>
+
+
+        <el-button>确 定</el-button>
 
   </div>
 </template>
 
 <script>
 import {
-  DeptList,
+  GetDeptTree,
   DeleteDept,
   GetDeptDetail,
   AddDept,
   UpdateDept,
 } from '@/api/system/dept';
 
+import {
+  GetUnitTree,
+} from '@/api/system/unit';
+
 export default {
   name: 'Dept',
   data() {
     return {
-      textMap: {
-        update: '编辑',
-        create: '新增',
-      },
-      dialogFormVisible: false,
-      dialogStatus: '',
-      list: null,
-      listLoading: true,
+
+      deptList: null,
+      unitList: null,
       temp: {
         id: '',
         deptname: '',
         rank: '',
         isdeleted: false,
       },
-      listQuery: {
-        totalCount: 0,
-        pageSize: 10,
-        pageNumber: 1,
-      },
-      depttree: [],
       defaultProps: {
         children: 'children',
-        label: 'text',
+        label: 'nodeName',
       },
     }
   },
 
   created() {
-    // GetDeptTree().then(response => {
-    //   this.depttree = JSON.parse(response.data);
-    // });
-    this.fetchData(this.listQuery)
+    this.fetchDept()
+    this.fetchUnit()
   },
   methods: {
 
-    handleSizeChange(val) {
-      this.listQuery.pageSize = val
-      this.fetchData(this.listQuery)
-    },
-    handleCurrentChange(val) {
-      this.listQuery.pageNumber = val
-      this.fetchData(this.listQuery)
-    },
 
-    fetchData(params) {
-      this.listLoading = true;
-      DeptList(params).then((response) => {
-        this.list = response.data.list
-        this.listQuery.totalCount = parseInt(response.data.total, 10)
-        this.listLoading = false
+    fetchDept() {
+      GetDeptTree().then((response) => {
+        this.deptList = response.data;
       });
     },
-    New() {
-      this.dialogFormVisible = true;
-      this.temp.deptname = '';
-      this.temp.rank = '';
-      this.dialogStatus = 'create';
+
+    fetchUnit() {
+      GetUnitTree().then((response) => {
+        this.unitList = response.data;
+      });
     },
+
     Delete(id) {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
@@ -185,33 +120,23 @@ export default {
       })
         .then(() => {
           DeleteDept(id).then(() => {
-            this.fetchData()
+            this.fetchDept()
           })
         })
     },
     Edit(id) {
-      this.dialogStatus = 'update';
-
       GetDeptDetail(id).then((response) => {
-        this.dialogStatus = 'update';
         this.temp = response.data;
-        console.log(this.temp)
-        this.dialogFormVisible = true;
       });
     },
-
-
     create() {
       AddDept(this.temp).then(() => {
-        this.dialogFormVisible = false;
-        this.fetchData();
+        this.fetchDept();
       });
     },
     update() {
       UpdateDept(this.temp).then(() => {
-        this.dialogFormVisible = false;
-
-        this.fetchData();
+        this.fetchDept();
       });
     },
   },