From f60464250a8184bef250c06fc649b41d28991b79 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 15 Apr 2020 15:47:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagement.js              |  4 +--
 .../ProjectPlanningManagementNew/index.vue    | 27 ++++++++++++++++---
 .../ProjectPlanningManagementQuery/index.vue  | 10 +++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index 2c2fa2d0..421ef68b 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -81,7 +81,7 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9
     }
   })
 }
-export function editTable(num1, num2, num3, num5, num13, num14, num15, num6, num7, num8, num9, num10, num11, num12) {
+export function editTable(num1, num2, num3, num5, num13, num14, num15, num6, num7, num8, num9, num10, num11, num12, num16) {
   return request({
     url: '',
     method: 'post',
@@ -90,7 +90,7 @@ export function editTable(num1, num2, num3, num5, num13, num14, num15, num6, num
       ModularID: router.currentRoute.path,
       type: '2',
       name: '项目计划管理_项目总计划_编辑数据',
-      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&设计者=' + num5 + '&审图计划开始时间=' + num13 + '&审图计划完成时间=' + num14 + '&审图实际完成时间=' + num15 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
+      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&设计者=' + num5 + '&审图计划开始时间=' + num13 + '&审图计划完成时间=' + num14 + '&审图实际完成时间=' + num15 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12 + '&项目计划制定人=' + num16
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index 66fdbab5..81aebd05 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -21,7 +21,7 @@
         <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
         <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
-        <el-button size="small" style="margin: 0px 0px 3px 750px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
+        <el-button size="small" style="margin: 0px 0px 3px 680px" type="success" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
       </el-row>
       <el-row v-if="false">
         <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -87,6 +87,16 @@
                 {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
               </template>
             </el-table-column>
+            <el-table-column label="项目生成" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.项目生成 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划制定" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.项目计划制定人 }}
+              </template>
+            </el-table-column>
             <el-table-column v-if="false" label="操作" width="150px" align="center">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
@@ -224,7 +234,7 @@
         <span v-if="radio==='3'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 备料</span>
         <span v-if="radio==='4'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 制造</span>
         <span v-if="radio==='5'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 装配</span>
-        <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 5px 0 3px 10px" plain @click="addTable()">增加</el-button>
+        <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:right;margin: 5px 100px 3px 0px" plain @click="addTable()">计划</el-button>
         <el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
           <el-table-column min-width="100px" label="组号" align="center">
             <template slot-scope="scope">
@@ -338,6 +348,8 @@
 
 <script>
 import { getProject, getCustomerName, searchgroupName, getToolNum, searchtable, editTable, searchTable2, searchgroup, addTable, editTable2, Delete } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+import { mapGetters } from 'vuex'
+
 export default {
   data() {
     return {
@@ -379,6 +391,11 @@ export default {
       pageCurrent: 1 // 后台获取页
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
   watch: {
     radio(val) {
       if (this.项目流水号) {
@@ -496,7 +513,9 @@ export default {
               完成顺序: response.data.rows[i].完成顺序,
               更新: response.data.rows[i].更新,
               项目流水号: response.data.rows[i].项目流水号,
-              机床流水号: response.data.rows[i].机床流水号
+              机床流水号: response.data.rows[i].机床流水号,
+              项目生成: response.data.rows[i].项目生成,
+              项目计划制定人: response.data.rows[i].项目计划制定人
             })
           }
           this.total = response.data.total
@@ -535,7 +554,7 @@ export default {
         this.备料完成 ? this.备料完成 : this.备料完成 = null
         this.制造完成 ? this.制造完成 : this.制造完成 = null
         this.装配完成 ? this.装配完成 : this.装配完成 = null
-        editTable(this.项目流水号, this.机床流水号, this.项目编号, this.设计者, this.审图开始, this.审图结束, '', this.发图完成, this.采购完成, this.备料完成, this.制造完成, this.装配完成, '', this.更新时间).then(response => {
+        editTable(this.项目流水号, this.机床流水号, this.项目编号, this.设计者, this.审图开始, this.审图结束, '', this.发图完成, this.采购完成, this.备料完成, this.制造完成, this.装配完成, '', this.更新时间, this.id).then(response => {
           if (response.data[0].result === '1') {
             this.tableData.map(v => {
               if (v.项目流水号 === this.项目流水号) {
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index c430d103..070c157a 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -98,6 +98,16 @@
                 {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
               </template>
             </el-table-column>
+            <el-table-column label="项目生成" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.项目生成 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划制定" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.项目计划制定人 }}
+              </template>
+            </el-table-column>
             <el-table-column v-if="false" label="操作" width="150px" align="center">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>

From 7d98b7edd0d63bbb753b40c376d78a9176bb7ccc Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 15 Apr 2020 16:22:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProjectPlanningManagement.js   |  4 ++--
 .../ProjectPlanningManagementNew/index.vue             |  4 ++--
 .../ProjectPlanningManagementQuery/index.vue           | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index 421ef68b..d2ed314b 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -133,7 +133,7 @@ export function Delete(num1) {
     }
   })
 }
-export function addTable(num1, num2) {
+export function addTable(num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
@@ -142,7 +142,7 @@ export function addTable(num1, num2) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '项目计划管理_项目详细计划_增加数据',
-      param: `机床流水号=` + num1 + '&计划类型=' + num2
+      param: `机床流水号=` + num1 + '&计划类型=' + num2 + '&计划人=' + num3
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index 81aebd05..0757269d 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -47,7 +47,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
+            <el-table-column label="项目名称" align="center" min-width="160px" fixed="left">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
@@ -641,7 +641,7 @@ export default {
       if (this.radio === '') {
         this.$message.error('请先选择一个类别')
       } else {
-        addTable(this.机床流水号, this.radio).then(response => {
+        addTable(this.机床流水号, this.radio, this.id).then(response => {
           if (response.data[0].result === '1') {
             this.$message({
               type: 'success',
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index 070c157a..f44e0ebd 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -271,6 +271,16 @@
               {{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
             </template>
           </el-table-column>
+          <el-table-column width="140px" label="计划人" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column width="140px" label="计划时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.计划时间1 }}
+            </template>
+          </el-table-column>
         </el-table>
       </el-card>
     </el-row>