Explorar el Código

报工修改问题a

longfenglin hace 1 año
padre
commit
a67a30daa8

+ 2 - 2
src/views/produce/components/feeding/components/semiProductBom.vue

@@ -161,7 +161,7 @@
         type="feedQuantity"
       >
         <template slot-scope="{ row, $index }">
-          <el-input size="mini"  class="content_num" v-model="row.feedQuantity" placeholder="数量" />
+          <el-input size="mini"  class="content_num" v-model="row.feedQuantity" placeholder="数量" :disabled="isDetails"/>
         </template>
       </el-table-column>
 
@@ -184,7 +184,7 @@
         type="feedQuantity"
       >
         <template slot-scope="{ row, $index }">
-          <el-input size="mini" v-model="row.extInfo.position" placeholder="位置" />
+          <el-input size="mini" v-model="row.extInfo.position" placeholder="位置" :disabled="isDetails"/>
         </template>
       </el-table-column>
 

+ 1 - 0
src/views/produce/components/feeding/details.vue

@@ -19,6 +19,7 @@
           <deviceBom
             v-if="it.equipmentList.length != 0"
             :list="it.equipmentList"
+            :isDetails="true"
           ></deviceBom>
 
           <productsBom

+ 12 - 0
src/views/produce/components/jobBooking/components/jobBom.vue

@@ -196,6 +196,18 @@ export default {
         };
       });
     }
+    
+    if(item.semiProductList){
+      let allReportWeight=0
+       item.semiProductList.map(sitem=>{
+        if(sitem.extInfo.batchReportInfo){
+          sitem.extInfo.batchReportInfo.map(bitem=>{
+            allReportWeight=allReportWeight+bitem.allReportWeight
+          })
+          this.item.workReportInfo.formedWeight=allReportWeight
+        }
+       })
+    }
   },
 
   methods: {

+ 1 - 1
src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -106,7 +106,7 @@
                         </div>
                     </div>
 
-                    <div class="rx ww43" v-if="item.currentTaskDiagram.isFirstTask">
+                    <div class="rx ww43" v-if="item.currentTaskDiagram.isFirstTask&&item.semiProductList.length<0">
                         <div class="lable lable100 rx-cc"></div>
                         <el-button class="" @click="singleQuery" type="primary">
                             创建在制品

+ 2 - 2
src/views/produce/components/jobBooking/components/oneJobQualityBomPL.vue

@@ -181,7 +181,7 @@
           <div
             class="material"
             :key="$index"
-            v-if="row.extInfo.batchReportInfo.length > 0"
+            v-if="row.extInfo.batchReportInfo?row.extInfo.batchReportInfo.length > 0:false"
           >
             <div class="btn_end">
               <div class="content_table2">
@@ -251,7 +251,7 @@
           <div
             class="material"
             :key="$index"
-            v-if="row.extInfo.batchReportInfo.length == 0"
+            v-if="row.extInfo.batchReportInfo?row.extInfo.batchReportInfo.length == 0:false"
           >
             <div style="display: flex; align-items: center">
               质检结果: &nbsp;&nbsp;&nbsp;

+ 1 - 1
src/views/produceOrder/index.vue

@@ -58,7 +58,7 @@
         </template>
 
         <template v-slot:formingNum="{ row }">
-          <span> {{ row.formingNum }} {{ row.unit }} </span>
+          <span> {{ row.formingNum }} </span>
         </template>
 
         <template v-slot:formingWeight="{ row }">