From ba5cbadf7beae1c8d7f89f1f5131e35d9d115cfa Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 24 Feb 2020 16:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E8=89=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkshopProcessMaintenance/index.vue      | 184 +++++++-----------
 1 file changed, 68 insertions(+), 116 deletions(-)

diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 051f23e5..d9d50248 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -1,128 +1,85 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col :span="7">
+      <el-col style="width: 290px">
         <el-card>
-          <el-row style="margin-bottom: 10px">
-            <span>工艺分类：</span>
-          </el-row>
           <el-row>
-            <el-button type="distribution" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
-            <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
-            <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
+            <el-button type="distribution" style="margin: 10px 10px 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
+            <el-button size="small" style="margin: 10px 10px 3px 0" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
+            <el-button size="small" style="margin: 10px 0 3px 0" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
+            <el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" highlight-current-row stripe border tooltip-effect="dark" style="width: 100%" height="600">
+              <el-table-column align="center" label=" " width="50px">
+                <template slot-scope="scope">
+                  <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
+                    {{ a }}
+                  </el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="工艺分类">
+                <template slot-scope="scope">
+                  {{ scope.row.工艺分类名称 }}
+                </template>
+              </el-table-column>
+            </el-table>
           </el-row>
         </el-card>
       </el-col>
-      <el-col :span="17">
+      <el-col style="width: 350px;">
         <el-card>
-          <div style="height: 37px"/>
-          <el-button type="primary" plain style="margin-left: 10px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="7">
-        <el-card>
-          <el-table
-            v-loading="loading1"
-            ref="multipleTable"
-            :data="tableData1"
-            size="mini"
-            highlight-current-row
-            stripe
-            border
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="550">
-            <el-table-column align="center" label=" " width="50px">
-              <template slot-scope="scope">
-                <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
-                  {{ a }}
-                </el-radio>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="工艺分类">
-              <template slot-scope="scope">
-                {{ scope.row.工艺分类名称 }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </el-col>
-
-      <el-col :span="17">
-        <el-card >
-          <el-table
-            :data="tableData2"
-            :row-key="getRowKeys"
-            :row-style="abc"
-            :expand-row-keys="expands"
-            size="mini"
-            highlight-current-row
-            stripe
-            border
-            height="550"
-            width="100%"
-            @expand-change="searchTechnologicalRequirementsOfProcessNum">
-            <el-table-column type="expand" label="详情">
-              <template slot-scope="scope">
-                <el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">
-                  <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-tooltip effect="dark" content="编辑" placement="top">
-                        <div style="display: inline-block">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit-outline"
-                            @click="editTechnologicalRequirements(scope.row)"/>
-                        </div>
-                      </el-tooltip>
-                      <el-tooltip effect="dark" content="删除" placement="top">
-                        <div style="display: inline-block">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            style="margin-left: 20px"
-                            icon="el-icon-delete"
-                            @click="delTechnologicalRequirements(scope.row)"/>
-                        </div>
-                      </el-tooltip>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </el-table-column>
-            <el-table-column label="工艺名称" width="200">
+          <el-button type="primary" plain style="margin: 10px 0 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
+          <el-table :data="tableData2" :row-key="getRowKeys" size="mini" highlight-current-row stripe border height="600" width="100%">
+            <!--<el-table-column type="expand" label="详情">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">-->
+            <!--<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-tooltip effect="dark" content="编辑" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit-outline"-->
+            <!--@click="editTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--<el-tooltip effect="dark" content="删除" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--style="margin-left: 20px"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="delTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--</el-table>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column label="工艺名称" align="center" width="200">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="操作" >
+            <el-table-column align="center" label="操作">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="warning"
-                  icon="el-icon-edit-outline"
-                  plain
-                  @click="editProcess(scope.row)">编辑工艺</el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  @click="delProcess(scope.row)">删除工艺</el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  plain
-                  icon="el-icon-circle-plus-outline"
-                  @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-edit-outline" style="margin-left: 10px" @click="delProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="editProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <!--<el-button size="mini" type="primary" plain icon="el-icon-circle-plus-outline" @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>-->
               </template>
             </el-table-column>
           </el-table>
@@ -259,11 +216,6 @@ export default {
     this.searchProcessClassification()
   },
   methods: {
-    abc() {
-      return {
-        height: '35px'
-      }
-    },
     searchProcessClassification() {
       this.loading1 = true
       searchProcessClassification().then(response => {