From 71c0a1dba85e9067793e3142acf2868901f6c363 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 25 Apr 2020 13:24:56 +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

---
 .../ProjectPlanningManagementNew/index.vue    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index f607b0d5..7c9ba3ed 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -21,7 +21,6 @@
         <!-- <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 680px" type="success" icon="el-icon-edit-outline" plain @click="limit1()">保存</el-button>
       </el-row>
       <el-row v-if="false">
         <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -240,6 +239,7 @@
         <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:right;margin: 5px 100px 3px 0px" plain @click="addTable()">计划</el-button>
+        <el-button size="small" style="float:right;margin: 5px 20px 3px 0px" type="success" icon="el-icon-edit-outline" plain @click="limit1()">保存</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">
@@ -766,19 +766,23 @@ export default {
       } else if (row.计划完成时间 < row.任务开始时间) {
         this.$message.error('计划完成时间应大于任务开始时间')
       } else {
-        editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
-          if (response.data[0].result === '1') {
-            row.edit = false
-            this.$notify({
-              title: '成功',
-              message: '信息修改成功',
-              type: 'success'
-            })
-            this.searchTable2()
-          } else {
-            this.$message.error('信息修改失败')
-          }
-        })
+        if (row.组件流水号 && row.任务名称 && row.负责人 && row.接收任务时间 && row.任务开始时间 && row.计划完成时间 && row.货期) {
+          editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
+            if (response.data[0].result === '1') {
+              row.edit = false
+              this.$notify({
+                title: '成功',
+                message: '信息修改成功',
+                type: 'success'
+              })
+              this.searchTable2()
+            } else {
+              this.$message.error('信息修改失败')
+            }
+          })
+        } else {
+          this.$message.error('请未输入项')
+        }
       }
     },
     // 表格2取消