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

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

@@ -232,7 +232,7 @@
         >
       </el-col>
 
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -243,7 +243,7 @@
           v-hasPermi="['mes:pro:workorder:dofinish']"
         >生成任务单
         </el-button>
-      </el-col> -->
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"