BOM展示

klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue

@@ -32,6 +32,11 @@
               <RawMaterialSelect v-model="scope.row.rawMaterialId" placeholder="请选择原材料" />
             </template>
           </el-table-column>
+          <el-table-column label="BOM" align="center">
+            <template #default="scope">
+              <BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
+            </template>
+          </el-table-column>
           <el-table-column prop="unit" label="单位" />
           <el-table-column prop="onTheWay" label="在途" />
           <el-table-column prop="inventory" label="在库" />
@@ -65,10 +70,11 @@ import { createPurchasePlan } from '@/api/wms/purchasePlan'
 import { listRawMaterial } from '@/api/wms/rawMaterial'
 import UserSelect from '@/components/KLPService/UserSelect'
 import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect'
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: 'CreatePurchasePanel',
-  components: { UserSelect, RawMaterialSelect },
+  components: { UserSelect, RawMaterialSelect, BomInfoMini },
   props: {
     orderId: {
       type: [String, Number],

klp-ui/src/views/wms/purchasePlan/panels/RecommendPurchasePanel.vue

@@ -24,6 +24,13 @@ export default {
       loading: false
     }
   },
+  watch: {
+    orderId: {
+      handler(newVal) {
+        this.handleRecommend()
+      }
+    }
+  },
   mounted() {
     if (!this.showButton) {
       this.handleRecommend();

klp-ui/src/views/wms/purchasePlan/panels/clac.vue

@@ -15,8 +15,8 @@
 <script>
 import RecommendPurchasePanel from './RecommendPurchasePanel.vue'
 import CreatePurchasePanel from './CreatePurchasePanel.vue'
-import { updatePurchasePlan } from '@/api/wms/purchasePlan'
-import { EOrderStatus } from '@/api/wms/order'
+import { updateOrder } from '@/api/wms/order'
+import { EOrderStatus } from '@/utils/enums'
 
 export default {
   name: 'PurchasePlanClac',
@@ -32,18 +32,22 @@ export default {
   },
   data() {
     return {
-      recommendData: {}
+      recommendData: {},
+      EOrderStatus: EOrderStatus
     }
   },
   methods: {
     onRecommend(data) {
+      console.log('获取推荐数据', data)
       this.recommendData = data
     },
     onConfirm(submitData) {
-      updatePurchasePlan({
+      console.log('calc层', submitData)
+      updateOrder({
         orderId: this.orderId,
-        orderStatus: EOrderStatus.PRODUCTIONING,
+        orderStatus: this.EOrderStatus.PRODUCTIONING,
       }).then(response => {
+        console.log("状态变更成功")
         this.$emit('confirm', submitData)
       })
       

klp-ui/src/views/wms/purchasePlan/panels/detail.vue

@@ -65,6 +65,11 @@
           </RawMaterialInfo>
         </template>
       </el-table-column>
+      <el-table-column label="BOM" align="center">
+        <template slot-scope="scope">
+          <BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
+        </template>
+      </el-table-column>
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="计划采购数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
@@ -180,6 +185,7 @@ import StockInDialog from "./stockin.vue";
 import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect';
 import UserSelect from '@/components/KLPService/UserSelect'
 import { RawMaterialInfo } from '@/components/KLPService';
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "PurchasePlanDetail",
@@ -187,7 +193,8 @@ export default {
     StockInDialog,
     RawMaterialSelect,
     UserSelect,
-    RawMaterialInfo
+    RawMaterialInfo,
+    BomInfoMini
   },
   props: {
     planId: {

klp-ui/src/views/wms/purchasePlan/panels/stockin.vue

@@ -64,6 +64,11 @@
             style="width: 100%"
           >
             <el-table-column label="原材料" align="center" prop="rawMaterialName" />
+            <el-table-column label="BOM" align="center">
+              <template slot-scope="scope">
+                <BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
+              </template>
+            </el-table-column>
             <el-table-column label="计划数量" align="center" prop="planQuantity" />
             <el-table-column label="入库数量" align="center" prop="quantity">
               <template slot-scope="scope">
@@ -121,11 +126,13 @@ import { updatePurchasePlanDetail } from "@/api/wms/purchasePlanDetail";
 import { getRawMaterial } from "@/api/wms/rawMaterial";
 import { EPurchaseDetailStatus } from "@/utils/enums";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "StockInDialog",
   components: {
-    WarehouseSelect
+    WarehouseSelect,
+    BomInfoMini
   },
   props: {
     visible: {

klp-ui/src/views/wms/purchasePlan/panels/transfer.vue

@@ -26,6 +26,11 @@
                 <RawMaterialInfo :materialId="scope.row.rawMaterialId" />
               </template>
             </el-table-column>
+            <el-table-column label="BOM" align="center">
+              <template #default="scope">
+                <BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
+              </template>
+            </el-table-column>
             <el-table-column prop="unit" label="单位" align="center" />
             <el-table-column prop="onTheWay" label="在途" align="center" />
             <el-table-column prop="inventory" label="在库" align="center" />
@@ -65,6 +70,11 @@
               <RawMaterialInfo :materialId="scope.row.rawMaterialId" />
             </template>
           </el-table-column>
+          <el-table-column label="BOM" align="center">
+            <template #default="scope">
+              <BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
+            </template>
+          </el-table-column>
           <el-table-column prop="unit" label="单位" />
           <el-table-column prop="onTheWay" label="在途" />
           <el-table-column prop="inventory" label="在库" />
@@ -100,11 +110,11 @@ import { listRawMaterial, listRawMaterialWithDemand } from '@/api/wms/rawMateria
 import UserSelect from '@/components/KLPService/UserSelect'
 import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect'
 import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo.vue'
-
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: 'CreatePurchasePanel',
-  components: { UserSelect, RawMaterialSelect, RawMaterialInfo },
+  components: { UserSelect, RawMaterialSelect, RawMaterialInfo, BomInfoMini },
   props: {
     orderId: {
       type: [String, Number],