From dfd3fb5d7fd095e033ea109221a7a4f7b7be633d Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Mon, 13 May 2019 15:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagement/index.vue       | 18 +++++
 .../ProjectPlanningQuery/index.vue            | 67 +++++++++++++++++--
 .../OutsourcingTaskExecution/index.vue        |  2 +-
 .../Outsourcing/PreorderAssociation/index.vue | 56 ++++++++++++++++
 .../ImportParts/specificationData.vue         |  2 +-
 .../StockPreparation/index.vue                |  2 +-
 6 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
index 2a4deda7..fbd5794b 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -75,6 +75,16 @@
             {{ scope.row.发货节点 }}
           </template>
         </el-table-column>
+        <el-table-column label="设备预验节点" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.设备预验收节点 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="安装调试节点" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.安装调试节点 }}
+          </template>
+        </el-table-column>
         <el-table-column label="客户名称" align="center" width="280px">
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
@@ -459,6 +469,12 @@ export default {
             if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
               response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
             }
+            if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
+              response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
+            }
+            if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
+              response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
+            }
             if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
               response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
             }
@@ -507,6 +523,8 @@ 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].机床设计者,
               机床设计完成时间: response.data.rows[i].机床设计完成时间,
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index 697112f5..a7896b9e 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -89,6 +89,16 @@
                 <span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="设备预验节点" align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.设备预验收节点 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="安装调试节点" align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.安装调试节点 }}
+              </template>
+            </el-table-column>
             <el-table-column label="审图（计划开始）" align="center" min-width="170px">
               <template slot-scope="scope">
                 {{ scope.row.审图计划开始时间 }}
@@ -106,7 +116,7 @@
             </el-table-column>
             <el-table-column label="发图" align="center" min-width="140px">
               <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间.split(' ')[0] }}</span>
+                <span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间 }}</span>
               </template>
             </el-table-column>
             <el-table-column label="发图（实际）" align="center" width="140px">
@@ -116,7 +126,7 @@
             </el-table-column>
             <el-table-column label="采购" align="center" min-width="140px">
               <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间.split(' ')[0] }}</span>
+                <span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间 }}</span>
               </template>
             </el-table-column>
             <el-table-column label="采购（实际）" align="center" width="140px">
@@ -126,7 +136,7 @@
             </el-table-column>
             <el-table-column label="备料" align="center" min-width="140px">
               <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间.split(' ')[0] }}</span>
+                <span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间 }}</span>
               </template>
             </el-table-column>
             <el-table-column label="备料（实际）" align="center" width="140px">
@@ -136,7 +146,7 @@
             </el-table-column>
             <el-table-column label="制造" align="center" min-width="140px">
               <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间.split(' ')[0] }}</span>
+                <span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间 }}</span>
               </template>
             </el-table-column>
             <el-table-column label="制造（实际）" align="center" width="140px">
@@ -146,7 +156,7 @@
             </el-table-column>
             <el-table-column label="装配" align="center" min-width="140px">
               <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间.split(' ')[0] }}</span>
+                <span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间 }}</span>
               </template>
             </el-table-column>
             <el-table-column label="装配（实际）" align="center" width="140px">
@@ -455,9 +465,54 @@ export default {
               if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
                 response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
               }
+              if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
+                response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
+              }
+              if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
+                response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
+              }
+              if (response.data[i].审图计划开始时间 !== '' && response.data[i].审图计划开始时间 !== null) {
+                response.data[i].审图计划开始时间 = response.data[i].审图计划开始时间.split(' ')[0]
+              }
+              if (response.data[i].审图计划完成时间 !== '' && response.data[i].审图计划完成时间 !== null) {
+                response.data[i].审图计划完成时间 = response.data[i].审图计划完成时间.split(' ')[0]
+              }
+              if (response.data[i].审图实际完成时间 !== '' && response.data[i].审图实际完成时间 !== null) {
+                response.data[i].审图实际完成时间 = response.data[i].审图实际完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床设计完成时间 !== '' && response.data[i].机床设计完成时间 !== null) {
+                response.data[i].机床设计完成时间 = response.data[i].机床设计完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床设计实际完成时间 !== '' && response.data[i].机床设计实际完成时间 !== null) {
+                response.data[i].机床设计实际完成时间 = response.data[i].机床设计实际完成时间.split(' ')[0]
+              }
+              if (response.data[i].采购完成时间 !== '' && response.data[i].采购完成时间 !== null) {
+                response.data[i].采购完成时间 = response.data[i].采购完成时间.split(' ')[0]
+              }
+              if (response.data[i].采购实际完成时间 !== '' && response.data[i].采购实际完成时间 !== null) {
+                response.data[i].采购实际完成时间 = response.data[i].采购实际完成时间.split(' ')[0]
+              }
+              if (response.data[i].备料完成时间 !== '' && response.data[i].备料完成时间 !== null) {
+                response.data[i].备料完成时间 = response.data[i].备料完成时间.split(' ')[0]
+              }
+              if (response.data[i].备料实际完成时间 !== '' && response.data[i].备料实际完成时间 !== null) {
+                response.data[i].备料实际完成时间 = response.data[i].备料实际完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床生产完成时间 !== '' && response.data[i].机床生产完成时间 !== null) {
+                response.data[i].机床生产完成时间 = response.data[i].机床生产完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床生产实际完成时间 !== '' && response.data[i].机床生产实际完成时间 !== null) {
+                response.data[i].机床生产实际完成时间 = response.data[i].机床生产实际完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床装配完成时间 !== '' && response.data[i].机床装配完成时间 !== null) {
+                response.data[i].机床装配完成时间 = response.data[i].机床装配完成时间.split(' ')[0]
+              }
+              if (response.data[i].机床装配实际完成时间 !== '' && response.data[i].机床装配实际完成时间 !== null) {
+                response.data[i].机床装配实际完成时间 = response.data[i].机床装配实际完成时间.split(' ')[0]
+              }
             }
             this.loading = false
-            console.log(response.data)
+            console.log(response.data, 222222)
             this.tableData = response.data
           }).then(() => {
             searchtable2(this.machineValue, 1).then(response => {
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index a12d16fe..ed762044 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -275,7 +275,7 @@
           </el-table-column>
           <el-table-column label="成交" align="center" width="130px">
             <template slot-scope="scope">
-              <el-input v-model="加工价格_成交[scope.$index]"/>
+              <el-input v-model="加工价格_成交[scope.$index]" readonly/>
             </template>
           </el-table-column>
         </el-table-column>
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 0c822d1d..9ec492a1 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -297,12 +297,68 @@ export default {
         edit(row.工序流水号, this.InOut).then(response => {
           edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
             this.$message.success('工序外协状态更改成功')
+            this.loading2 = true
+            this.checkBox = []
+            this.tableData2 = []
+            searchTable2(this.num1).then(response => {
+              for (let i = 0; i < response.data.length; i++) {
+                console.log(response.data[i].工序顺序)
+              }
+              console.log(response.data, 1111111)
+              if (response.data.length === 0) {
+                this.loading0 = false
+              } else {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].工序间是否外协 === 1) {
+                    this.checkBox.push(false)
+                  } else {
+                    this.checkBox.push(true)
+                  }
+                }
+                for (let i = 0; i < response.data.length; i++) {
+                  response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
+                  response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
+                  response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
+                }
+                this.tableData2 = response.data
+              }
+            }).then(() => {
+              this.loading2 = false
+            })
           })
         })
       } else {
         this.InOut = 1
         edit(row.工序流水号, this.InOut).then(response => {
           this.$message.success('工序外协状态更改成功')
+          this.loading2 = true
+          this.checkBox = []
+          this.tableData2 = []
+          searchTable2(this.num1).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              console.log(response.data[i].工序顺序)
+            }
+            console.log(response.data, 1111111)
+            if (response.data.length === 0) {
+              this.loading0 = false
+            } else {
+              for (let i = 0; i < response.data.length; i++) {
+                if (response.data[i].工序间是否外协 === 1) {
+                  this.checkBox.push(false)
+                } else {
+                  this.checkBox.push(true)
+                }
+              }
+              for (let i = 0; i < response.data.length; i++) {
+                response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
+                response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
+                response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
+              }
+              this.tableData2 = response.data
+            }
+          }).then(() => {
+            this.loading2 = false
+          })
         })
       }
     },
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 45964b7c..e775f0c1 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -640,7 +640,7 @@ export default {
 
 <style>
   .el-table .warning-row {
-    background: oldlace;
+    background: yellowgreen;
   }
   .rgb196{
     background: palevioletred;
diff --git a/src/views/WorkshopProcurement/StockPreparation/index.vue b/src/views/WorkshopProcurement/StockPreparation/index.vue
index 443194a0..418a912b 100644
--- a/src/views/WorkshopProcurement/StockPreparation/index.vue
+++ b/src/views/WorkshopProcurement/StockPreparation/index.vue
@@ -379,7 +379,7 @@ export default {
           sums[index] = '总重量'
           return
         } else if (index === 7) {
-          const values = data.map(item => Number(item['重量1']))
+          const values = data.map(item => Number(item['重量1'] * item['批次数量']))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)