22

src/views/produce/components/feeding/components/turnoverBom.vue

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">周转车 </div>
+
+      <div class="rx-bc"> </div>
+    </div>
+
+    <div class="material">
+      <div class="content_table" v-for="(item, index) in list" :key="index">
+        <div class="item rx-sc">
+          <div class="rx ww50">
+            <div class="lable rx-cc">编号</div>
+            <div class="content">
+              {{ item.code }}
+            </div>
+          </div>
+
+          <div class="rx ww50">
+            <div class="lable rx-cc">名称</div>
+            <div class="content">{{ item.name }}</div>
+          </div>
+        </div>
+
+        <div class="del_box">
+          <el-link
+            type="danger"
+            icon="el-icon-delete"
+            @click="getDelete(index)"
+          ></el-link>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      list: {
+        type: Array,
+        default: () => []
+      },
+      pattern: {
+        type: String,
+        default: ''
+      },
+
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
+    methods: {
+      getDelete(index) {
+        this.list.splice(index, 1);
+      }
+    }
+  };
+</script>

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

@@ -59,6 +59,12 @@
           :equipmentList="item.equipmentList"
           :currentTaskDiagram="item.currentTaskDiagram"
         ></semiProductBom>
+
+        <turnoverBom
+          v-if="item.turnover.length != 0"
+          :list="item.turnover"
+          pattern="feed"
+        ></turnoverBom>
       </div>
     </div>
 
@@ -82,6 +88,7 @@
   import modelBom from './components/modelBom.vue';
   import instanceBom from './components/instanceBom.vue';
   import semiProductBom from './components/semiProductBom.vue';
+  import turnoverBom from './components/turnoverBom.vue';
   export default {
     name: 'feeding',
     components: {
@@ -93,7 +100,8 @@
       productsBom,
       modelBom,
       instanceBom,
-      semiProductBom
+      semiProductBom,
+      turnoverBom
     },
     props: {
       workListIds: {

src/views/produce/components/picking/pickingList.vue

@@ -143,7 +143,7 @@
 <script>
   import AssetTree from '../../components/assetTree.vue';
   import pickingListSearch from './pickingListSearch.vue';
-  import { pageeLedgerMain, assetPage } from '@/api/produce/workOrder';
+  import { pageeLedgerMain, assetPage, listInProduct  } from '@/api/produce/workOrder';
 
   export default {
     components: { AssetTree, pickingListSearch },