From 2283ba3ed830d5b11c6073d47a95709f9d139f65 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 09:21:28 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts                                           |    2 +-
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx                               |    8 +++++---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx |    2 +-
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx                              |   13 ++++++++++---
 4 files changed, 17 insertions(+), 8 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/WmsMaterial.ts" "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/WmsMaterial.ts"
index 49acc29..c29b58a 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/WmsMaterial.ts"
+++ "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/WmsMaterial.ts"
@@ -163,7 +163,7 @@
     dialogConfigForQuery.isAdd = true
     dialogConfigForQuery.title = '楂樼骇鏌ヨ'
   }
-
+ 
   const onConfirmWmsMaterial = async () => {
     dialogConfig.visible = false
     if (dialogConfig.isAdd) {
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 45f0d43..a8b09be 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"
@@ -224,13 +224,15 @@
       remark: formData.value.remark,
     }
     if (!current.value) {
-      await WmsMaterialDrawer.addWmsMaterial(data)
+      //await WmsMaterialDrawer.addWmsMaterial(data)
     } else {
       const id = current.value.id
-      await WmsMaterialDrawer.updateWmsMaterial(id, data)
+      //await WmsMaterialDrawer.updateWmsMaterial(id, data)
     }
     ElMessage.success('淇濆瓨鎴愬姛')
-    ctx.emit('confirmQuery')
+    //ctx.emit('confirmQuery')
+    //澧炲姞浼犻�掑弬鏁� 銆怑ditby shaocx,2025-05-03銆�
+    ctx.emit('confirmQuery',data)
   }
 
   const updateCheckData = () => {
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/Views/Pages/Dialog/WmsMaterialQueryDrawer/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/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
index 88f70eb..55b6068 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/Views/Pages/Dialog/WmsMaterialQueryDrawer/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/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
@@ -29,7 +29,7 @@
       default: 0,
     },
   },
-  emits: ['update:modelValue', 'close', 'submit', 'confirm'],
+  emits: ['update:modelValue', 'close', 'submit', 'confirmquery'],
   setup(props: Record<string, any>, ctx: SetupContext) {
     const {
       onClose,
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/Views/Pages/WmsMaterial/WmsMaterial.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/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index 455d508..899b9e7 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/Views/Pages/WmsMaterial/WmsMaterial.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/Views/Pages/WmsMaterial/WmsMaterial.tsx"
@@ -207,7 +207,7 @@
             title={dialogConfigForQuery.title}
             row={current.value}
             sort={sort.value}
-            onConfirm={onConfirmWmsMaterial}
+            onConfirmQuery={onConfirmWmsMaterial}
           />
 
           {/* 鏂板鐨勬煡璇㈣〃鍗� */}
@@ -341,12 +341,19 @@
                 瀵煎嚭
               </IconButton>
             </div>
-            {/* <Search
+            <Search
               placeholder="璇疯緭鍏ュ叧閿瓧"
               v-model={search.value}
               onConfirm={onSearch}
               style={{ marginTop: '-1px' }}
-            /> */}
+            />
+              <IconButton
+                style=""
+                icon="refresh"
+                onClick={resetQuery}
+              >
+                閲嶇疆
+              </IconButton>
           </div>
 
           <RenderBaseTable

--
Gitblit v1.9.3