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

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

@@ -182,6 +182,7 @@
       :title="title"
       :visible.sync="open"
       width="1080px"
+      :close-on-click-modal="false"
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -306,7 +307,7 @@
       <el-table :data="tmToolRequestList">
         <el-table-column label="物料" prop="itemName" />
         <el-table-column label="数量" prop="allQuantity" />
-        <el-table-column label="预计使用寿命" prop="requestNum" />
+        <el-table-column label="预计使用寿命" prop="nextMaintenPeriod" />
         <el-table-column label="SN码">
           <template slot-scope="scope">
             <el-input v-model="scope.row.toolCode"  placeholder="请选择关联台账信息"
@@ -579,8 +580,7 @@ export default {
       getTmToolRequestList(toolRequestId).then((res) => {
         this.tmToolRequestList = res.data.map(item => {
           return {
-            ...item,
-            requestNum: this.form.requestNum
+            ...item
           }
         })
         cb && cb();