From 0c525ecf57809add2b988f331e22a74022ad1070 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 20:25:56 +0800
Subject: [PATCH] 物料

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 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 b8f8f15..2e2fd21 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -6,7 +6,6 @@
       <a-tabs default-active-key="1" @change="callbacktab">
         <a-tab-pane key="1" tab="鍩烘湰淇℃伅">
           <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
-
           <!-- 鍩烘湰淇℃伅 -->
           <a-form :form="form">
             <a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -89,16 +88,16 @@
           </a-form>
         </a-tab-pane>
         <a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
-          <add-control-rule ref="WmsControlRule" />
+          <add-control-rule v-if="visible" ref="WmsControlRule" />
         </a-tab-pane>
         <a-tab-pane key="3" tab="鎵规灞炴��">
           闇�姹傚緟瀹�
         </a-tab-pane>
         <a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
-          <add-form-sub ref="addFormWmsSubstituteGoodRef"  />
+          <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
         </a-tab-pane>
         <a-tab-pane key="5" tab="瀹㈡埛">
-          <add-form-base-customer ref="addFormBaseCustomer"  />
+          <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
         </a-tab-pane>
 
         <!-- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
@@ -160,19 +159,18 @@
     callbacktab(e) {
 
       //鍖呰鍏崇郴
-      if (e == 6) {
-        this.$nextTick(() => {
-          let materialType = this.form.getFieldValue('materialType');
-          // 璋冩帴鍙� 浼犵墿鏂欑被鍨�
-          this.$refs.addFormContainerPackagingRef.initShow(materialType)
-
-        })
-      }
+      // if (e == 6) {
+      //   this.$nextTick(() => {
+      //     let materialType = this.form.getFieldValue('materialType');
+      //     // 璋冩帴鍙� 浼犵墿鏂欑被鍨�
+      //     this.$refs.addFormContainerPackagingRef.initShow(materialType)
+      //   })
+      // }
       // 鏇夸唬鍝�
       if (e == 4) {
-        let materialCode = this.form.getFieldValue('materialCode');
-        let materialName = this.form.getFieldValue('materialName');
-        this.$refs.addFormWmsSubstituteGoodRef.initShow(materialCode, materialName)
+        // let materialCode = this.form.getFieldValue('materialCode');
+        // let materialName = this.form.getFieldValue('materialName');
+        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
       }
     },
     handleOk() { },
@@ -208,7 +206,7 @@
       const {
         form: { validateFields }
       } = this
-    
+
       validateFields((errors, values) => {
         if (!errors) {
           // if (this.$getObjectType(values.areas) === 'array') {
@@ -227,18 +225,17 @@
           // }
 
           console.log(6666666666666 + '鎺у埗灞炴��')
-         
           var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
 
           let SubstituteGoodList = []
-          if(this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length>0){
+          if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {
             SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
           }
           console.log(6666666666666 + '鏇夸唬鍝�')
 
 
           let BaseCustomerList = [];
-          if(this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length>0){
+          if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
             BaseCustomerList = this.$refs.addFormWmsSubstituteGoodRef.list
           }
           console.log(6666666666666 + '瀹㈡埛妗f闆嗗悎')
@@ -286,6 +283,10 @@
     handleCancel() {
       this.form.resetFields()
       this.visible = false
+      // this.$refs.WmsControlRule.form.resetFields()
+      // this.$refs.addFormWmsSubstituteGoodRef.list =[]
+      // this.$refs.addFormWmsSubstituteGoodRef.list =[]
+
     }
   }
 }

--
Gitblit v1.9.3