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

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

@@ -90,11 +90,11 @@
           v-hasPermi="['mes:pro:workorder:add']">新增
         </el-button>
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['mes:pro:workorder:edit']">修改
         </el-button>
-      </el-col>
+      </el-col> -->
 
       <!-- <el-col :span="1.5">
         <el-button
@@ -304,15 +304,15 @@
 
       <el-table-column label="操作" width="220px" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 'PREPARE'"
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)" v-hasPermi="['mes:pro:workorder:edit']">修改
-          </el-button>
+          </el-button> -->
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleViewRecord(scope.row)">查看更新记录
           </el-button>
 
-          <el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.status == 'PREPARE'"
+          <!-- <el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.status == 'PREPARE'"
             @click="handleDelete(scope.row)" v-hasPermi="['mes:pro:workorder:remove']">删除
-          </el-button>
+          </el-button> -->
           <!-- <el-button
             size="mini"
             type="text"