From 889313472a84f971abe5a3b355682d5f9760f305 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 25 Apr 2020 14:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagement.js              | 13 +++++++
 .../ProjectPlanningManagementNew/index.vue    | 35 +++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index d2ed314b..198614b0 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -146,3 +146,16 @@ export function addTable(num1, num2, num3) {
     }
   })
 }
+// 获取人员
+export function personalNumber(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '项目计划管理_获取人员_查询'
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index 7c9ba3ed..c8b8708c 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -132,7 +132,14 @@
               </el-col>
               <el-col style="width: 180px;margin-left: 20px">
                 <el-form-item label="设计者" prop="设计者" >
-                  <el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 180px"/>
+                  <el-select v-model="设计者" filterable clearable size="small" style="width: 180px" placeholder="设计者">
+                    <el-option
+                      v-for="item in personalNumber"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                  <!--<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 180px"/>-->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -270,7 +277,14 @@
           <el-table-column min-width="100px" label="负责人" align="center">
             <template slot-scope="scope">
               <template v-if="scope.row.edit">
-                <el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
+                <el-select v-model="scope.row.负责人" filterable clearable size="small" style="width: 100%" placeholder="负责人">
+                  <el-option
+                    v-for="item in personalNumber"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"/>
+                </el-select>
+                <!--<el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>-->
               </template>
               <template v-else>
                 {{ scope.row.负责人 }}
@@ -352,12 +366,15 @@
 </template>
 
 <script>
-import { getProject, getCustomerName, searchgroupName, getToolNum, searchtable, editTable, searchTable2, searchgroup, addTable, editTable2, Delete } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+import { personalNumber, getProject, getCustomerName, searchgroupName, getToolNum, searchtable, editTable, searchTable2, searchgroup, addTable, editTable2, Delete } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
+      personalNumberValue1: '',
+      personalNumberValue2: '',
+      personalNumber: [],
       empty: '',
       radio: '',
       项目流水号: '',
@@ -427,6 +444,17 @@ export default {
           })
         }
       })
+      this.personalNumber = []
+      this.personalNumberValue1 = ''
+      this.personalNumberValue2 = ''
+      personalNumber().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.personalNumber.push({
+            label: response.data[i].姓名,
+            value: response.data[i].姓名
+          })
+        }
+      })
     },
     typeChange() {
       this.toolNumValue = ''
@@ -572,6 +600,7 @@ export default {
         } else if (!this.装配完成) {
           this.$message.error('请选择装配完成时间')
         } else {
+          console.log(this.审图结束, this.审图开始)
           if (this.审图结束 < this.审图开始) {
             this.$message.error('审图结束时间应大于审图开始时间')
           } else if (this.发图完成 < this.审图结束) {