From 16226e7f9e5fc297bdc86f23178310c128a14870 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 3 Aug 2019 14:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assembly/AssemblyExecution/index.vue      | 66 ++++++++++++++-----
 .../Assembly/ElectricalAssembly/index.vue     | 66 ++++++++++++++-----
 2 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 3a02d21f..c8bfaa40 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -47,6 +47,26 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="装配开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.装配开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.装配结束时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="调试开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.调试开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="调试结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.调试结束时间 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="460px" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
@@ -66,34 +86,44 @@
     <el-card>
       <h3 style="text-align: center;">部装</h3>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
-        <el-table-column label="项目名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床编号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组件名称" align="center">
+        <el-table-column label="任务名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center">
+        <el-table-column label="计划工时" align="center">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.计划工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="实际工时" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.实际工时" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="修补工时" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.修补工时" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.结束时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.备注" size="mini"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
diff --git a/src/views/Assembly/ElectricalAssembly/index.vue b/src/views/Assembly/ElectricalAssembly/index.vue
index 3a47b62b..4db23481 100644
--- a/src/views/Assembly/ElectricalAssembly/index.vue
+++ b/src/views/Assembly/ElectricalAssembly/index.vue
@@ -47,6 +47,26 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="装配开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.装配开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.装配结束时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="调试开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.调试开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="调试结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.调试结束时间 }}
+          </template>
+        </el-table-column>
         <!--<el-table-column label="操作" align="center" width="460px" fixed="right">-->
         <!--<template slot-scope="scope">-->
         <!--<el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>-->
@@ -66,34 +86,44 @@
     <el-card>
       <h3 style="text-align: center;">部装</h3>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
-        <el-table-column label="项目名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床编号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组件名称" align="center">
+        <el-table-column label="任务名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center">
+        <el-table-column label="计划工时" align="center">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.计划工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="实际工时" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.实际工时" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="修补工时" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.修补工时" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.结束时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.备注" size="mini"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">