longfenglin 1 рік тому
батько
коміт
9958ec9c3c

+ 22 - 5
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -150,7 +150,7 @@
             <el-row>
               <el-col :span="16" label-width="100px">
                 <el-form-item label="节拍生产数量" prop="beatNum">
-                  <el-input v-if="!isView" placeholder="" v-model="beatParam.beatNum"></el-input>
+                  <el-input v-if="!isView" placeholder="" v-model="beatParam.beatNum" maxlength="9"></el-input>
                   <div v-else>{{ beatParam.beatNum }}</div>
                 </el-form-item>
               </el-col>
@@ -175,7 +175,7 @@
 
 
                   <el-input v-if="!isView" placeholder="" v-model="beatParam.newBeatTime"
-                    @blur="convertVal(beatParam.newBeatTime, 'beatTime')"
+                    @blur="convertVal(beatParam.newBeatTime, 'beatTime')" maxlength="9"
                     oninput="value = value.replace(/[^\d.]/g, '')"></el-input>
 
                   <div v-else>{{ beatParam.newBeatTime }}</div>
@@ -192,7 +192,7 @@
               <el-col :span="16" label-width="100px">
                 <el-form-item label="准备时长" prop="newBeatPrepareTime">
                   <el-input v-if="!isView" placeholder="" v-model="beatParam.newBeatPrepareTime"
-                    @blur="convertVal(beatParam.newBeatPrepareTime, 'beatPrepareTime')"
+                    @blur="convertVal(beatParam.newBeatPrepareTime, 'beatPrepareTime')" maxlength="9"
                     oninput="value = value.replace(/[^\d.]/g, '')"></el-input>
                   <div v-else>{{ beatParam.newBeatPrepareTime }}</div>
                 </el-form-item>
@@ -208,7 +208,7 @@
               <el-col :span="16" label-width="140px">
                 <el-form-item label="下道工序间隔时长" prop="newBeatRestTime">
                   <el-input v-if="!isView" placeholder="" v-model="beatParam.newBeatRestTime"
-                    @blur="convertVal(beatParam.newBeatRestTime, 'beatRestTime')"
+                    @blur="convertVal(beatParam.newBeatRestTime, 'beatRestTime')" maxlength="9"
                     oninput="value = value.replace(/[^\d.]/g, '')"></el-input>
                   <div v-else>{{ beatParam.newBeatRestTime }}</div>
                 </el-form-item>
@@ -225,7 +225,7 @@
               <el-col :span="16" label-width="100px">
                 <el-form-item label="标准时长" prop="newTime">
                   <el-input v-if="!isView" placeholder="标准时长" v-model="beatParam.newTime"
-                    @blur="convertVal(beatParam.newTime, 'time')"
+                    @blur="convertVal(beatParam.newTime, 'time')" maxlength="9"
                     oninput="value = value.replace(/[^\d.]/g, '')"></el-input>
                   <div v-else>{{ beatParam.newTime }}</div>
                 </el-form-item>
@@ -237,6 +237,21 @@
               </el-col>
             </el-row>
 
+            <el-row>
+              <el-col :span="16" label-width="100px">
+                <el-form-item label="工时单价" prop="taskPrice">
+                  <el-input v-if="!isView" placeholder="" v-model="beatParam.taskPrice"
+                    oninput="value = value.replace(/[^\d.]/g, '')" maxlength="7"></el-input>
+                  <div v-else>{{ beatParam.taskPrice }}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" label-width="100px">
+                <el-form-item label="单位:" prop="">
+                  <div>元</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
             <el-row>
               <el-col :span="24" label-width="100px">
                 <el-form-item label="备注" prop="remark">
@@ -849,6 +864,7 @@ export default {
         beatTime: '',
         newBeatRestTime: '',
         beatRestTime: '',
+        taskPrice:''
       },
 
       qualityParam: [],
@@ -1434,6 +1450,7 @@ export default {
       this.beatParam.beatTime = '';
       this.beatParam.newBeatRestTime = '';
       this.beatParam.beatRestTime = '';
+      this.beatParam.taskPrice = '';
 
     },
 

+ 2 - 1
src/views/material/BOMmanage/detailsPop.vue

@@ -356,7 +356,8 @@ export default {
     handleNodeClick(data) {
 
       this.treeId = data.id;
-      this.resourceBomId = data.resourceBomId||data.id;
+
+      this.resourceBomId = data.id!==0 ? data.resourceBomId || data.id : data.id;
       this.handBomDetails(this.treeId);
     },