Merge remote-tracking branch 'origin/dev' into dev

src/views/mes/tm/toolrequestlist/index.vue

@@ -73,12 +73,12 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="物料编码" width="130" align="center" prop="itemCode" />
       <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
-      <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />
       <el-table-column label="任务编码" width="120" align="center" prop="taskCode" />
       <el-table-column label="任务名称" show-overflow-tooltip min-width="180" align="center" prop="taskName" />
       <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
       <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
       <el-table-column label="数量" width="80" align="center" prop="allQuantity" />
+      <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button