From 57a27ebff672df2ef0ca52d069d6a2c3c3956aa0 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 27 Nov 2018 08:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicData/PersonnelManagement/index.vue   | 31 ++++++++++---------
 .../ProductionCapacityBalance/index.vue       |  1 +
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index 76cbc503..0e325821 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -15,7 +15,8 @@
             <el-button slot="append" icon="el-icon-search" @click="fetchPeopleForName"/>
           </el-input>
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</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"-->
@@ -29,7 +30,9 @@
           <!--:disabled="true"-->
           <!--size="small"-->
           <!--placeholder="请选择部门"/>-->
-          <!--<el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">确认</el-button>-->
+          <!--<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"-->
@@ -176,18 +179,18 @@
     </el-row>
 
     <!--新增和编辑部门-->
-    <!--<el-dialog :title="department_Title" :visible.sync="department_DFV" center style="min-height: 200px" width="400px">-->
-    <!--<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">-->
-    <!--<el-form-item label="部门名称" prop="DepartmentName">-->
-    <!--<el-input v-model="department_Form.DepartmentName" size="small" style="width:200px"/>-->
-    <!--</el-form-item>-->
-    <!--</el-form>-->
-    <!--<div slot="footer" class="dialog-footer">-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--<el-button v-if="department_Title==='新增部门'" type="primary" @click="submitAdd">确定</el-button>-->
-    <!--<el-button v-else-if="department_Title==='编辑部门'" type="primary" @click="submitEdit">确定</el-button>-->
-    <!--</div>-->
-    <!--</el-dialog>-->
+    <el-dialog :title="department_Title" :visible.sync="department_DFV" center style="min-height: 200px" width="400px">
+      <el-form ref="department_Form" :model="department_Form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="部门名称" prop="DepartmentName">
+          <el-input v-model="department_Form.DepartmentName" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取消</el-button>
+        <el-button v-if="department_Title==='新增部门'" type="primary" @click="submitAdd">确定</el-button>
+        <el-button v-else-if="department_Title==='编辑部门'" type="primary" @click="submitEdit">确定</el-button>
+      </div>
+    </el-dialog>
 
     <el-dialog :title="people_title" :visible.sync="people_DFV" center style="min-height: 200px" width="800px">
       <el-form ref="people_form" :rules="rules" :model="people_form" label-position="left" label-width="110px" class="demo-ruleForm">
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index eaac00f1..8304f184 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -1224,6 +1224,7 @@ export default {
               }
             }).then(() => {
               this.tableData1.push(this.result[i])
+              console.log(this.tableData1)
               selection2(this.工艺计划流水号[this.indexAdjust]).then(response => { // 刷新对话框显示和颜色
                 for (let i = 0; i < response.data.length; i++) {
                   this.partType = response.data[i].零件类型