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

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

@@ -141,7 +141,7 @@
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请数量" align="center" prop="requestNum" />
+      <el-table-column label="总数量" align="center" prop="requestNum" />
       <!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -233,8 +233,8 @@
         </el-form-item>
         </el-col>
 <el-col :span="8">
-        <el-form-item label="申请数量" prop="requestNum">
-          <el-input v-model="form.requestNum" placeholder="请输入申请数量" />
+        <el-form-item label="总数量" prop="requestNum">
+          <el-input v-model="form.requestNum" placeholder="请输入总数量" />
         </el-form-item>
                 </el-col>
         </el-row>

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

@@ -4,8 +4,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="toolRequestItemId" />
       <el-table-column label="刀模板申请单id" align="center" prop="toolRequestId" /> -->
-      <el-table-column label="物料名称" align="center" prop="itemName" />
-      <el-table-column label="总数量" align="center" prop="allQuantity" />
+      <el-table-column label="刀模板物料名称" align="center" prop="itemName" />
+      <el-table-column label="数量" align="center" prop="allQuantity" />
       <el-table-column label="预计使用寿命" align="center" prop="nextMaintenPeriod" />
     </el-table>
     
@@ -26,7 +26,7 @@
         <el-form-item label="物料id" prop="itemId">
           <el-input v-model="form.itemId" placeholder="请输入物料id" />
         </el-form-item>
-        <el-form-item label="总数量" prop="allQuantity">
+        <el-form-item label="数量" prop="allQuantity">
           <el-input v-model="form.allQuantity" placeholder="请输入总数量" />
         </el-form-item>
         <el-form-item label="预计使用寿命" prop="nextMaintenPeriod">