From f87590b44fe1c160f3ce8ecaaba57f44e0cf3858 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 17:38:30 +0800
Subject: [PATCH] 2222

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx |   81 ++++++++++++++++++++--------------------
 1 files changed, 41 insertions(+), 40 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 e2314b6..78d4406 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"
@@ -42,6 +42,10 @@
     )
   }
 
+  const sayHello = () => {
+    console.log("Hello from child!");
+  };
+
   const visible = computed({
     get() {
       return props.modelValue
@@ -183,19 +187,39 @@
 
   const onClose = (done: () => void) => {
     if (visible.value) {
-      if (checkIsEqualObject()) {
-        visible.value = false
-        done && done()
-      } else {
-        ConfirmBox('鏄惁淇濆瓨璁剧疆锛�')
-          .then(() => {
-            onConfirmQuery()
-          })
-          .catch(() => {
-            visible.value = false
-            done && done()
-          })
+      visible.value = false
+      const data = {
+        materialCode: formData.value.materialCode,
+        materialName: formData.value.materialName,
+        purchaseType: formData.value.purchaseType,
+        materialType: formData.value.materialType,
+        primaryUnit: formData.value.primaryUnit,
+        standard: formData.value.standard,
+        outerDiameter: formData.value.outerDiameter,
+        wallThickness: formData.value.wallThickness,
+        materialQuality: formData.value.materialQuality,
+        length: formData.value.length,
+        isMainBranch: formData.value.isMainBranch,
+        factory: formData.value.factory,
+        certification: formData.value.certification,
+        remark: formData.value.remark,
       }
+      ctx.emit('close', data)
+      //閫氱煡鐖剁粍浠�
+      //done && done()
+      // if (checkIsEqualObject()) {
+      //   visible.value = false
+      //   done && done()
+      // } else {
+      //   ConfirmBox('鏄惁淇濆瓨璁剧疆锛�')
+      //     .then(() => {
+      //       onConfirmQuery()
+      //     })
+      //     .catch(() => {
+      //       visible.value = false
+      //       done && done()
+      //     })
+      // }
     }
   }
   /**
@@ -242,6 +266,8 @@
     formData.value.factory = ''
     formData.value.certification = ''
     formData.value.remark = ''
+    //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
+    ctx.emit('restQuery');
   }
 
   const updateCheckData = () => {
@@ -284,34 +310,8 @@
    * 寮圭獥鎵撳紑鑾峰彇璇︽儏
    */
   const onOpen = async () => {
-    if (current.value) {
-      const res = await WmsMaterialDrawer.getWmsMaterialDetail(current.value)
-
-      formData.value = {
-        materialCode: res.materialCode,
-        materialName: res.materialName,
-        purchaseType: res.purchaseType,
-        materialType: res.materialType,
-        primaryUnit: res.primaryUnit,
-        standard: res.standard,
-        outerDiameter: res.outerDiameter,
-        wallThickness: res.wallThickness,
-        materialQuality: res.materialQuality,
-        length: res.length,
-        isMainBranch: res.isMainBranch,
-        factory: res.factory,
-        certification: res.certification,
-        remark: res.remark,
-        id: res.id,
-      }
-      disabled.value = true
-      updateCheckData()
-    } else {
-      formData.value = {}
-
-      disabled.value = false
-      updateCheckData()
-    }
+    disabled.value = false
+    updateCheckData()
   }
 
   watch(() => current.value, onOpen)
@@ -325,5 +325,6 @@
     onClose,
     onConfirmQuery,
     onReset,
+    sayHello
   }
 }

--
Gitblit v1.9.3