From c908fdb0a049b07e0f27a04d00b588ba5d061042 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Fri, 25 Jan 2019 15:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                           |  2 +-
 .../BasicData/PersonnelManagement/index.vue    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 554b1f2b..f997ba78 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://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231: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 2dd5f7cc..83e039d8 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -17,7 +17,7 @@
           <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 v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动
           </el-button>
           <!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
           <el-popover
@@ -124,12 +124,12 @@
             </el-table-column>
             <el-table-column align="center" label="入职时间" width="100">
               <template slot-scope="scope">
-                {{ scope.row.入公司时间 }}
+                {{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="出生日期" width="100">
               <template slot-scope="scope">
-                {{ scope.row.出生日期 }}
+                {{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="联系方式" width="110">
@@ -170,7 +170,7 @@
           <div class="block" style="margin-top: 10px;">
             <el-pagination
               :current-page="PageCurrent"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[10, 20, 30, 40, 50]"
               :page-size="PageSize"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
@@ -345,12 +345,12 @@
         </el-table-column>
         <el-table-column align="center" label="入职时间" width="100">
           <template slot-scope="scope">
-            {{ scope.row.入公司时间 }}
+            {{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="出生日期" width="100">
           <template slot-scope="scope">
-            {{ scope.row.出生日期 }}
+            {{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="联系方式" width="110">
@@ -368,7 +368,7 @@
             {{ scope.row.民族 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="家庭住址" width="200">
+        <el-table-column align="center" label="家庭住址">
           <template slot-scope="scope">
             {{ scope.row.家庭住址 }}
           </template>
@@ -393,6 +393,7 @@ import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDe
 export default {
   data() {
     return {
+      disabledMove: true,
       PageCurrentN: 1,
       PageSizeN: 10,
       totalN: null,
@@ -403,7 +404,7 @@ export default {
       i: 1,
       id: '',
       PageCurrent: 1,
-      PageSize: 10,
+      PageSize: 50,
       List: [],
       total: null,
       nodeName: '',
@@ -729,6 +730,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
+      this.multipleSelection.length === 0 ? this.disabledMove = true : this.disabledMove = false
     },
     Quit() {
       if (this.multipleSelection.length === 0) {