ysy hai 1 ano
pai
achega
8c0fc64cdf

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

@@ -38,7 +38,7 @@
             :list="it.instanceList"
             :currentTaskDiagram="currentTaskDiagram"
             :equipmentList="it.equipmentList"
-            :workInfo="item"
+            :workInfo="it"
           ></instanceBom>
 
           <semiProductBom
@@ -47,7 +47,7 @@
             :list="it.semiProductList"
             :currentTaskDiagram="currentTaskDiagram"
             :equipmentList="it.equipmentList"
-            :workInfo="item"
+            :workInfo="it"
           ></semiProductBom>
 
           <turnoverBom

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

@@ -2,7 +2,7 @@
   <div>
     <div class="title_box rx-bc mt6">
  
-      <div class="name">报工信息({{ list.length || 0 }})个 </div>
+      <div class="name">报工信息({{ list.length || 0 }})个 {{ singleReport }} </div>
 
       <div class="rx-bc"> </div>
     </div>

+ 17 - 13
src/views/produce/components/jobBooking/components/semiProductJobBomPL.vue

@@ -17,24 +17,25 @@
       border
       :default-expand-all="true"
     >
-      <el-table-column type="expand"  label="批量"  width="80">
+      <el-table-column type="expand" label="批量" width="80">
         <template slot-scope="{ row, $index }">
-          <div class="material" :key="$index" >
+          <div class="material" :key="$index">
             <div class="btn_end">
               <el-button
-                v-if='!isDetails'
+                v-if="!isDetails"
                 type="primary"
                 size="mini"
                 @click="handAddListPL($index)"
                 style="margin-bottom: 4px"
                 >分批</el-button
               >
-    
 
               <div class="content_table2">
                 <div class="head row rx-sc">
                   <div class="item ww30">合格品数量</div>
-                  <div class="item ww30">报工总重量 /{{row.extInfo.weightUnit}} </div>
+                  <div class="item ww30"
+                    >报工总重量 /{{ row.extInfo.weightUnit }}
+                  </div>
                   <div class="item ww30">处置</div>
                   <div class="item ww10">操作</div>
                 </div>
@@ -108,8 +109,6 @@
         </template>
       </el-table-column>
 
-
-
       <el-table-column label="编码" prop="code" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.code }}
@@ -193,7 +192,7 @@
             >
             </el-option>
           </el-select> -->
-          {{   row.deviceName || row.extInfo.deviceName }}
+          {{ row.deviceName || row.extInfo.deviceName }}
         </template>
       </el-table-column>
 
@@ -226,7 +225,9 @@
 
       <el-table-column label="操作" width="60px">
         <template slot-scope="{ $index, row }">
-          <el-link v-if='!isDetails' type="danger" @click="getDelete($index)">删除</el-link>
+          <el-link v-if="!isDetails" type="danger" @click="getDelete($index)"
+            >删除</el-link
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -340,7 +341,7 @@
           );
           this.$forceUpdate();
 
-        this.$message.info('投料合格品数不能大于投料数量')
+          this.$message.info('投料合格品数不能大于投料数量');
         }
       },
 
@@ -348,12 +349,15 @@
         this.list[idx].extInfo.batchReportInfo.splice(yyIdx, 1);
       },
 
-      
       selectName(value, idx, yyIdx) {
         const taskObj = this.stepsList.find((item) => item.taskId === value);
-        this.$set(this.list[idx].extInfo.batchReportInfo[yyIdx], 'taskName', taskObj.taskTypeName);
+        this.$set(
+          this.list[idx].extInfo.batchReportInfo[yyIdx],
+          'taskName',
+          taskObj.taskTypeName
+        );
         this.$forceUpdate();
-      },
+      }
     },
 
     created() {

+ 2 - 0
src/views/produce/components/jobBooking/details.vue

@@ -79,6 +79,7 @@
             :list="objData.semiProductList"
             :item="objData"
             :isDetails="true"
+             :singleReport="objData.singleReport"
           >
           </semiProductJobBom>
 
@@ -91,6 +92,7 @@
             :list="objData.semiProductList"
             :item="objData"
             :isDetails="true"
+             :singleReport="objData.singleReport"
           >
           </semiProductJobBomPL>