From bdc6a6c9ac65dfad871ea65de4836f8e27b72427 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 06:25:07 +0800
Subject: [PATCH] 22

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx |  118 ++++++++++++++++++++++++-----------------------------------
 1 files changed, 48 insertions(+), 70 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 1f118bc..8d9a9bd 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')
   /**
    * 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
    */
@@ -42,6 +42,7 @@
     )
   }
 
+
   const visible = computed({
     get() {
       return props.modelValue
@@ -66,7 +67,6 @@
       prop: 'materialName',
       el: 'input',
       placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
-      rules: [{ required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
     },
     {
       label: '閲囪喘绫诲瀷',
@@ -74,7 +74,6 @@
       el: 'select',
       placeholder: '璇烽�夋嫨閲囪喘绫诲瀷',
       options: [],
-      rules: [{ required: true, message: '璇烽�夋嫨閲囪喘绫诲瀷', trigger: 'change' }],
     },
     {
       label: '鐗╂枡绫诲瀷',
@@ -82,7 +81,6 @@
       el: 'select',
       placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
       options: [],
-      rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
     },
     {
       label: '涓诲崟浣�',
@@ -183,30 +181,7 @@
     const check = isEqual(initiateData.value, data)
     return check
   }
-
-  const onClose = (done: () => void) => {
-    if (visible.value) {
-      if (checkIsEqualObject()) {
-        visible.value = false
-        done && done()
-      } else {
-        ConfirmBox('鏄惁淇濆瓨璁剧疆锛�')
-          .then(() => {
-            onConfirmQuery()
-          })
-          .catch(() => {
-            visible.value = false
-            done && done()
-          })
-      }
-    }
-  }
-  /**
-   * 纭鏌ヨ
-   */
-  const onConfirmQuery = async () => {
-    ElMessage.success('鐐瑰嚮浜嗘煡璇㈡寜閽�')
-    await formRef.value?.validate()
+  const commonGetFormData=()=>{
     const data = {
       materialCode: formData.value.materialCode,
       materialName: formData.value.materialName,
@@ -223,14 +198,43 @@
       certification: formData.value.certification,
       remark: formData.value.remark,
     }
-    if (!current.value) {
-      await WmsMaterialQueryDrawer.addWmsMaterial(data)
-    } else {
-      const id = current.value.id
-      await WmsMaterialQueryDrawer.updateWmsMaterial(id, data)
+    return data;
+  }
+  const onClose = (done: () => void) => {
+    if (visible.value) {
+      visible.value = false
+      const data =commonGetFormData();
+      ctx.emit('close', data)
     }
-    ElMessage.success('淇濆瓨鎴愬姛')
-    ctx.emit('confirmQuery')
+  }
+  /**
+   * 纭鏌ヨ
+   */
+  const onConfirmQuery = async () => {
+    const data =commonGetFormData();
+    ctx.emit('confirmQuery', data)
+  }
+  /**
+   * 閲嶇疆鏌ヨ
+   */
+  const onReset = async () => {
+    formData.value = {}
+    formData.value.materialCode = ''
+    formData.value.materialName = ''
+    formData.value.purchaseType = ''
+    formData.value.materialType = ''
+    formData.value.primaryUnit = ''
+    formData.value.standard = ''
+    formData.value.outerDiameter = ''
+    formData.value.wallThickness = ''
+    formData.value.materialQuality = ''
+    formData.value.length = ''
+    formData.value.isMainBranch = ''
+    formData.value.factory = ''
+    formData.value.certification = ''
+    formData.value.remark = ''
+    //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
+    ctx.emit('restQuery');
   }
 
   const updateCheckData = () => {
@@ -252,56 +256,29 @@
   /**
    * 閫氱敤鏌ヨ鏋氫妇
    */
-  const commonQueryEnumForFrom=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();
+  commonQueryEnumForFrom()
   /**
    * 寮圭獥鎵撳紑鑾峰彇璇︽儏
    */
   const onOpen = async () => {
-
-    if (current.value) {
-      const res = await WmsMaterialQueryDrawer.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)
@@ -314,5 +291,6 @@
     onOpen,
     onClose,
     onConfirmQuery,
+    onReset,
   }
 }

--
Gitblit v1.9.3