Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/workorder/indexApply.vue

@@ -143,7 +143,7 @@
         >
       </el-col>
 
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -155,7 +155,7 @@
         >删除
         </el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -233,7 +233,7 @@
         >
       </el-col>
 
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -245,10 +245,10 @@
         >生成任务单
         </el-button>
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>-->
+      ></right-toolbar> -->
     </el-row>
 
     <!-- 用户导入对话框 -->