车间设备管理

2020-02-05 11:29:58 +08:00
parent 8487abecf2 d828757fc0
commit fb3b32ff7d
5 changed files with 145 additions and 211 deletions
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -43,7 +43,11 @@
        <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
        </el-tooltip>
+<<<<<<< HEAD
        <!--        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
+=======
+        <!--<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
+>>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7
      </div>
    </el-card>
    <el-row>