55

src/views/produce/components/jobBooking/components/oneJobQualityBomPL.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">报工信息({{ list.length || 0 }})个 </div>
+
+      <div class="rx-bc"> </div>
+    </div>
+
+    <el-table
+      ref="oneJobQualityBom"
+      class="table_content"
+      :max-height="600"
+      :data="list"
+      tooltip-effect="dark"
+      style="width: 100%"
+      stripe
+      border
+    >
+      <el-table-column label="序号" type="index" width="55">
+        <template slot-scope="{ row, $index }">
+          {{ $index + 1 }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="编码" type="code" minWidth="110">
+        <template slot-scope="{ row, $index }">
+          {{ row.code }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="名称" type="name" minWidth="110">
+        <template slot-scope="{ row, $index }">
+          {{ row.name }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="型号" type="modelType">
+        <template slot-scope="{ row, $index }">
+          {{ row.modelType }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="规格" type="specification">
+        <template slot-scope="{ row, $index }">
+          {{ row.specification }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="牌号" type="brandNum">
+        <template slot-scope="{ row, $index }">
+          {{ row.brandNum }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="包装库存" type="brandNum">
+        <template slot-scope="{ row, $index }">
+          {{ row.packingCountBase }}/ {{ row.minUnit }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1"
+        :label="currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'"
+        type="weightUnit"
+      >
+        <template slot-scope="{ row, $index }">
+          <div v-if="currentTaskDiagram.isFirstTask == 1">
+            {{ row.extInfo.weight || 0 }} {{ row.extInfo.weightUnit }}</div
+          >
+          <div v-if="currentTaskDiagram.isFirstTask == 0">
+            {{ row.extInfo.newWeight || 0 }}
+            {{ row.extInfo.weightUnit }}</div
+          >
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="singleReport == 1" label="刻码" type="engrave">
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.engrave }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1"
+        label="物料代号"
+        type="materielCode"
+      >
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.materielCode }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1 && deviceList.length > 0"
+        width="140"
+        label="设备"
+        type="deviceId"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-select
+            class="content_num"
+            v-model="row.deviceId"
+            filterable
+            placeholder="请选择"
+            @change="(e) => selectVal(e, row, $index)"
+            size="mini"
+          >
+            <el-option
+              v-for="item in deviceList"
+              :label="item.name + '-' + item.codeNumber"
+              :value="item.id"
+              :key="item.id"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1 && deviceList.length > 0"
+        label="炉次号"
+        width="90"
+        type="heatNumber"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-input
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.heatNumber"
+            placeholder="请输入炉次号"
+          />
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1"
+        label="数量"
+        width="90"
+        type="feedQuantity"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-input
+            size="mini"
+            class="content_num"
+            v-model="row.feedQuantity"
+            placeholder="数量"
+          />
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="singleReport == 1"
+        label="位置"
+        width="110"
+        type="feedQuantity"
+      >
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.position }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" fixed="right" width="60px" v-if="!isDetails">
+        <template slot-scope="{ $index, row }">
+          <el-link type="danger" @click="getDelete($index)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'semiProductJobBom',
+
+    props: {
+      list: {
+        type: Array,
+        default: () => []
+      },
+      equipmentList: {
+        type: Array,
+        default: () => []
+      },
+
+      currentTaskDiagram: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      },
+      singleReport: {
+        default: null
+      }
+    },
+
+    data() {
+      return {};
+    },
+
+    methods: {
+      getDelete(index) {
+        this.list.splice(index, 1);
+      } 
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .materialBor {
+    border: 1px solid #157a2c;
+  }
+</style>

src/views/produce/components/jobBooking/index.vue

@@ -126,6 +126,23 @@
         >
         </oneJobQualityBom>
 
+          
+
+        <oneJobQualityBomPL
+          :singleReport="item.singleReport"
+          v-if="
+            item.semiProductList &&
+            item.semiProductList.length != 0 &&
+            taskObj.type == 6 &&
+            item.singleReport == 0
+          "
+          :item="item"
+          :list="item.semiProductList"
+        >
+        </oneJobQualityBomPL>
+
+
+
         <byProductBom
           v-if="item.productRecycleList.length != 0"
           :list="item.productRecycleList"
@@ -189,6 +206,8 @@
   import palletBom from './components/palletBom.vue';
   import revolvingDiskBom from '../feeding/components/revolvingDiskBom.vue';
   import oneJobQualityBom from './components/oneJobQualityBom.vue';
+  import oneJobQualityBomPL from './components/oneJobQualityBomPL.vue';
+
   import semiProductJobBom from './components/semiProductJobBom.vue';
   import semiProductJobBomPL from './components/semiProductJobBomPL.vue';
 
@@ -210,6 +229,8 @@
       palletBom,
       revolvingDiskBom,
       oneJobQualityBom,
+      oneJobQualityBomPL,
+
       semiProductJobBom,
       semiProductJobBomPL,
       byProductBom,
@@ -318,7 +339,7 @@
                 obj.semiProductList = obj.pickOutInList;
               }
 
-              if (this.clientEnvironmentId == 3 && obj.singleReport == 0) {
+              if (this.clientEnvironmentId == 3 && obj.singleReport == 0 && this.taskObj.type != 6 )  {
                 obj.semiProductList.map((a) => {
                   a.extInfo.batchReportInfo = [
                     {