From 0609ad2318e9d20dfa1d1eebe3c24242717cd112 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 13:06:46 +0800
Subject: [PATCH] 新增实体

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index dc89591..7e52bb9 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,23 +1,17 @@
 <template>
-  <a-modal
-    title="鏂板鐗╂枡淇℃伅"
-    :width="900"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
+  <a-modal title="鏂板鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+    @cancel="handleCancel">
     <a-spin :spinning="confirmLoading">
       <!-- tab @change="callback"-->
-      <a-tabs default-active-key="1" >
+      <a-tabs default-active-key="1">
         <a-tab-pane key="1" tab="鍩烘湰淇℃伅">
-         <add-form ref="addForm" @ok="handleOk" />
+          <add-form ref="addForm" @ok="handleOk" />
         </a-tab-pane>
         <a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
-          Content of Tab Pane 2
+          <add-control-rule ref="WmsControlRule" @ok="handleOk" />
         </a-tab-pane>
         <a-tab-pane key="3" tab="鎵规灞炴��">
-          Content of Tab Pane 3
+          闇�姹傚緟瀹�
         </a-tab-pane>
         <a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
           <add-form-sub ref="addFormWmsSubstituteGood" @ok="handleOk" />
@@ -38,16 +32,18 @@
 <script>
 import { WmsMaterialAdd, GetAreas, GetStations } from '@/api/modular/main/WmsMaterialManage'
 import addForm from './tabItem/addForm.vue'
-import addFormBaseCustomer from './tabItem/addFormBaseCustomer.vue'
-import addFormContainerPackaging from './tabItem/addFormContainerPackaging.vue'
-import addFormSub from './tabItem/addFormWmsSubstituteGood.vue'
+import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
+import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
+import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
+import addControlRule from './tabItem/WmsControlRule/index.vue'
 
 export default {
   components: {
     addForm,
     addFormBaseCustomer,
     addFormContainerPackaging,
-    addFormSub
+    addFormSub,
+    addControlRule
   },
   data() {
     return {
@@ -71,7 +67,7 @@
     }
   },
   methods: {
-    handleOk(){
+    handleOk() {
 
     },
     // 鍒濆鍖栨柟娉�
@@ -123,7 +119,27 @@
             })
             values.stationNameParameter = values.stationNameParameterArr.join(',')
           }
-          WmsMaterialAdd(values)
+          console.log(6666666666666)
+          console.log()
+          console.log(6666666666666 + '鎺у埗灞炴��')
+          console.log(this.$refs.WmsControlRule.selectedRows)
+          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id;
+
+          console.log(6666666666666 + '鏇夸唬鍝�')
+          console.log(this.$refs.addFormWmsSubstituteGood.list)
+
+          console.log(6666666666666 + '瀹㈡埛妗f闆嗗悎')
+          console.log(this.$refs.addFormBaseCustomer.list)
+
+          var param = {
+            value1: values,
+            ControlRuleld: ControlRuleld, //鎺у埗灞炴��
+            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗f闆嗗悎
+            SubstituteGoodLis: this.$refs.addFormWmsSubstituteGood.list, //鏇夸唬鍝�
+            value5: {},
+            value6: {},
+          }
+          WmsMaterialAdd(param)
             .then(res => {
               if (res.success) {
                 this.$message.success('鏂板鎴愬姛')

--
Gitblit v1.9.3