From 645b0896be7ec9c13050a40f3eb60e985d238fd0 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 8 Feb 2020 09:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkshopEquipmentManagement/index.vue                 | 1 +
 .../ContractInformationManagement/index.vue               | 8 ++++----
 src/views/MarketingCenter/CreateProject/index.vue         | 8 --------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 9f2e46c1..8f194d1d 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -198,6 +198,7 @@
 
 <script>
 import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
+import { getNowTime } from '@/utils/tool'
 export default {
   data() {
     return {
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index dceca54c..ecab7e45 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -177,10 +177,10 @@
         <el-table-column label="操作" align="center" width="170">
           <template slot-scope="scope">
             <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-circle-plus-outline"
-            @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-circle-plus-outline"
+              @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 0ef7b892..259c9ab2 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -85,14 +85,6 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope">
-                <!--<el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">-->
-                  <!--<el-button-->
-                    <!--size="mini"-->
-                    <!--type="warning"-->
-                    <!--plain-->
-                    <!--icon="el-icon-plus"-->
-                    <!--@click.stop="addMachine(scope.row);flag = 1">机床</el-button>-->
-                <!--</el-tooltip>-->
                 <el-button
                   size="mini"
                   type="text"