From 5334be033295f330b25dd4d77a39a1dbd82cf79c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 11:10:25 +0800
Subject: [PATCH] 22

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx"
index 9fa83da..6248a7e 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -9,14 +9,14 @@
   h,
 } from 'vue'
 import { injectModel } from '@/libs/Provider/Provider'
-import { WmsMaterialQueryDrawer } from '../Models/WmsMaterialQueryDrawer'
+import { WmsMaterialDrawer } from '../Models/WmsMaterialDrawer'
 import { ElMessage } from 'element-plus'
 import isEqual from 'lodash/isEqual'
 import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
 import { cloneDeep } from 'lodash'
 
 export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => {
-  const WmsMaterialQueryDrawer = injectModel<WmsMaterialQueryDrawer>('WmsMaterialQueryDrawer')
+  const WmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
   /**
    * 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
    */
@@ -192,7 +192,7 @@
       } else {
         ConfirmBox('鏄惁淇濆瓨璁剧疆锛�')
           .then(() => {
-            onConfirm()
+            onConfirmQuery()
           })
           .catch(() => {
             visible.value = false
@@ -202,10 +202,12 @@
     }
   }
   /**
-   * 淇濆瓨
+   * 纭鏌ヨ
    */
-  const onConfirm = async () => {
-    await formRef.value?.validate()
+  const onConfirmQuery = async () => {
+    alert('浣犳潵鍚婃垜鍐呴儴鏂规硶浜嗗晩');
+   
+    //await formRef.value?.validate()
     const data = {
       materialCode: formData.value.materialCode,
       materialName: formData.value.materialName,
@@ -223,13 +225,18 @@
       remark: formData.value.remark,
     }
     if (!current.value) {
-      await WmsMaterialQueryDrawer.addWmsMaterial(data)
+      //await WmsMaterialDrawer.addWmsMaterial(data)
     } else {
       const id = current.value.id
-      await WmsMaterialQueryDrawer.updateWmsMaterial(id, data)
+      //await WmsMaterialDrawer.updateWmsMaterial(id, data)
     }
     ElMessage.success('淇濆瓨鎴愬姛')
-    ctx.emit('confirm')
+    //ctx.emit('confirmQuery')
+    //澧炲姞浼犻�掑弬鏁� 銆怑ditby shaocx,2025-05-03銆�
+    debugger
+    console.log("鏂颁紶閫掑弬鏁版槸:"+data);
+    alert("鏂颁紶閫掑弬鏁版槸:"+data);
+    ctx.emit('confirmQuery',data)
   }
 
   const updateCheckData = () => {
@@ -249,26 +256,32 @@
     }
   }
   /**
-   * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+   * 閫氱敤鏌ヨ鏋氫妇
    */
-  const onOpen = async () => {
-    const materialTypeEnum = await WmsMaterialQueryDrawer.getWmsEnumData({
+  const commonQueryEnumForFrom=async()=>{
+    const materialTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
       EnumName: 'MaterialTypeEnum',
     })
     updateFormItemOptions('materialType', materialTypeEnum)
 
-    const purchaseTypeEnum = await WmsMaterialQueryDrawer.getWmsEnumData({
+    const purchaseTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
       EnumName: 'PurchaseTypeEnum',
     })
     updateFormItemOptions('purchaseType', purchaseTypeEnum)
 
-    const yesOrNoTypeEnum = await WmsMaterialQueryDrawer.getWmsEnumData({
+    const yesOrNoTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
       EnumName: 'YesNoEnum',
     })
     updateFormItemOptions('isMainBranch', yesOrNoTypeEnum)
+  }
+  commonQueryEnumForFrom();
+  /**
+   * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+   */
+  const onOpen = async () => {
 
     if (current.value) {
-      const res = await WmsMaterialQueryDrawer.getWmsMaterialDetail(current.value)
+      const res = await WmsMaterialDrawer.getWmsMaterialDetail(current.value)
 
       formData.value = {
         materialCode: res.materialCode,
@@ -306,6 +319,6 @@
     formRef,
     onOpen,
     onClose,
-    onConfirm,
+    onConfirmQuery,
   }
 }

--
Gitblit v1.9.3