From 8a18e826e437d9ea3393764f61b1ad7b4161dcf9 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Fri, 25 Jan 2019 10:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=BB=E5=8A=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 .../BasicData/PersonnelManagement/index.vue   | 88 ++++++++++++-------
 2 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index f997ba78..554b1f2b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index bee0dc9a..2dd5f7cc 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -17,36 +17,36 @@
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
           <el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button>
           <el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button>
-          <!--<el-button v-popover:popover4 type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动-->
-          <!--</el-button>-->
+          <el-button v-popover:popover4 type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动
+          </el-button>
           <!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
-          <!--<el-popover-->
-          <!--ref="popover4"-->
-          <!--width="178"-->
-          <!--placement="right"-->
-          <!--trigger="click"-->
-          <!--@hide="hide()">-->
-          <!--<el-dropdown size="small" placement="bottom-start" style="margin-right: 0">-->
-          <!--<el-input-->
-          <!--v-model="nodeName1"-->
-          <!--:disabled="true"-->
-          <!--size="small"-->
-          <!--placeholder="请选择部门"/>-->
-          <!--<el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">-->
-          <!--确认-->
-          <!--</el-button>-->
-          <!--<el-dropdown-menu slot="dropdown">-->
-          <!--<el-tree-->
-          <!--ref="treeForm"-->
-          <!--:data="departmentData"-->
-          <!--:props="defaultProps"-->
-          <!--style="width: 150px"-->
-          <!--node-key="id"-->
-          <!--accordion-->
-          <!--@node-click="NodeClick"/>-->
-          <!--</el-dropdown-menu>-->
-          <!--</el-dropdown>-->
-          <!--</el-popover>-->
+          <el-popover
+            ref="popover4"
+            width="178"
+            placement="right"
+            trigger="click"
+            @hide="hide()">
+            <el-dropdown size="small" placement="bottom-start" style="margin-right: 0">
+              <el-input
+                v-model="nodeName1"
+                :disabled="true"
+                size="small"
+                placeholder="请选择部门"/>
+              <el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">
+                确认
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-tree
+                  ref="treeForm"
+                  :data="departmentData"
+                  :props="defaultProps"
+                  style="width: 150px"
+                  node-key="id"
+                  accordion
+                  @node-click="NodeClick"/>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-popover>
         </el-card>
       </el-col>
     </el-row>
@@ -389,7 +389,7 @@
 </template>
 
 <script>
-import { getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
+import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
 export default {
   data() {
     return {
@@ -761,6 +761,34 @@ export default {
     searchLeavingList() {
       this.LeavingListVisiable = true
       this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
+    },
+    moveGroupConfim() {
+      this.id = this.node
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        moveGroups(this.multipleSelection[i].人员编号, this.node).then(response => {
+          if (response.data[0].result === '1') {
+            this.handleNodeClick()
+            if (i === this.multipleSelection.length - 1) {
+              this.$message.success('移组成功')
+            }
+          } else {
+            this.$message.error('更新失败')
+          }
+        })
+      }
+    },
+    hide() {
+      this.nodeName1 = ''
+      this.node = ''
+    },
+    moveGroup() {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请至少选择一个人员')
+      }
+    },
+    NodeClick(data) {
+      this.node = data.id
+      this.nodeName1 = data.label
     }
   }
 }