update:修改刀模板具

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

@@ -494,7 +494,7 @@ export default {
         return
       }
       this.$refs.line.tmToolRequestItemList.forEach(item => {
-         sum+=Number(item.allQuantity)
+         sum+=Number(item.quantity)
       })
       this.form.requestNum = sum
     },

src/views/mes/tm/toolrequest/itemIndex.vue

@@ -15,13 +15,13 @@
       <el-table-column label="刀模版申请单id" align="center" prop="toolRequestId" /> -->
       <el-table-column label="刀模版物料名称" align="center" prop="itemName" />
 
-      <el-table-column width="80px" v-if="$attrs.optType === 'add'" label="数量" align="center" prop="allQuantity" >
+      <el-table-column width="120px" v-if="$attrs.optType === 'add'" label="数量" align="center" prop="quantity" >
          <template slot-scope="scope">
-            <el-input v-model="scope.row.allQuantity" @blur="$emit('sum')" placeholder="请输入数量" />
+            <el-input v-model="scope.row.quantity" @blur="$emit('sum')" placeholder="请输入数量" />
          </template>
       </el-table-column>
-      <el-table-column  width="120px" v-else label="数量" align="center" prop="allQuantity" />
-      <el-table-column  width="120px" label="预计使用寿命" align="center" prop="nextMaintenPeriod" />
+      <el-table-column  width="120px" v-else label="数量" align="center" prop="quantity" />
+      <el-table-column  width="120px" label="预计使用寿命" align="center" prop="estimatedLifeTime" />
       <el-table-column width="100px" v-if="$attrs.optType === 'add'" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,8 +133,8 @@ export default {
         return {
           itemId:item.itemId,
           itemName:item.itemName,
-          allQuantity: 1,
-          nextMaintenPeriod: Number(this.$attrs.quantity)
+          quantity: 1,
+          estimatedLifeTime: Number(this.$attrs.quantity) || 0
         }
       })
       this.tmToolRequestItemList = this.detailList.concat(this.addList)

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

@@ -208,6 +208,7 @@
               </el-input>
             </el-form-item>
             <ToolRequestSelect
+              v-if="open"
               ref="ToolRequestSelectRef"
               @onSelected="onToolRequestSelected"
             ></ToolRequestSelect>
@@ -306,8 +307,8 @@
       <el-divider content-position="left">申请单刀模版具数据</el-divider>
       <el-table :data="tmToolRequestList">
         <el-table-column label="物料" prop="itemName" />
-        <el-table-column label="数量" prop="allQuantity" />
-        <el-table-column label="预计使用寿命" prop="nextMaintenPeriod" />
+        <el-table-column label="数量" prop="quantity" />
+        <el-table-column label="预计使用寿命" prop="estimatedLifeTime" />
         <el-table-column label="SN码">
           <template slot-scope="scope">
             <el-input v-model="scope.row.toolCode"  placeholder="请选择关联台账信息"

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

@@ -182,6 +182,9 @@ export default {
     },
      // 单选选中数据
     handleRowDbClick(row) {
+      if (row.disabled) {
+        return
+      }
       if (row) {
         this.selectedRows = row;
         this.selectedItemId = row.taskId