From 4102840f00f1fb9bf54b51f4d53ecbae6cf813ad Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 22 May 2020 11:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/GroupMatching/index.vue   | 15 ++++++++++-----
 .../ScheduleCompletionDetails/index.vue           |  7 ++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 0d3eb2ee..d830f3c5 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -594,7 +594,8 @@ export default {
         this.tableData5 = response.data
       })
     },
-    SearchMachine() { // 查询机床
+    // 查询机床
+    SearchMachine() {
       searchmachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Machines.push({
@@ -605,7 +606,8 @@ export default {
         }
       })
     },
-    searchGroupList() { // 查询组号
+    // 查询组号
+    searchGroupList() {
       this.Group = ''
       this.Groups = []
       searchgroup(this.Machine).then(response => {
@@ -627,7 +629,8 @@ export default {
         this.searchTable2()
       }
     },
-    searchTable0() { // 查询标准件
+    // 查询标准件
+    searchTable0() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
@@ -636,7 +639,8 @@ export default {
         this.total00 = response.data.total
       })
     },
-    searchTable1() { // 查询外购件
+    // 查询外购件
+    searchTable1() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
@@ -645,7 +649,8 @@ export default {
         this.total01 = response.data.total
       })
     },
-    searchTable2() { // 查询基本件
+    // 查询基本件
+    searchTable2() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 8d141b31..030c2f59 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -116,6 +116,11 @@
                 {{ scope.row.修改时间 ? scope.row.修改时间.split(' ')[0] : '-' }}
               </template>
             </el-table-column>
+            <el-table-column label="备注" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" fixed="right" width="90px">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -159,7 +164,7 @@
         <el-form-item label="加工工时(分)：" prop="加工时间">
           <span style="font-size: 20px">{{ 加工时间 }}</span>
         </el-form-item>
-        <el-form-item v-show="false" label="备注：" prop="备注">
+        <el-form-item label="备注：" prop="备注">
           <el-input v-model="form1.备注" :rows="4" type="textarea" placeholder="备注" clearable size="small" style="width:200px;"/>
         </el-form-item>
       </el-form>