From a6559eef55971f61fd63c8111769cf3032e2be59 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 07:13:15 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx | 4 ++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterial.ts | 1 -
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 21 ++++++++++++++-------
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx | 10 +++++-----
4 files changed, 21 insertions(+), 15 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/components/BaseQueryDrawer/BaseQueryDrawer.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/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
index 29201fd..83ace70 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/components/BaseQueryDrawer/BaseQueryDrawer.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/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
@@ -26,7 +26,7 @@
// default: false,
// },
},
- emits: ['close', 'confirm', 'update:modelValue', 'open', 'beforeClose'],
+ emits: ['close', 'confirmQuery', 'update:modelValue', 'open', 'beforeClose'],
setup(props: any, { emit, slots, attrs }: any) {
// const size = computed(() => {
// if (attrs.size.includes('px')) {
@@ -71,7 +71,7 @@
鍏抽棴
</el-button>
<el-button
- onClick={() => emit('confirm')}
+ onClick={() => emit('confirmQuery')}
type="primary"
class={{
[styles.csBaseBtn]: true,
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 1279e69..49acc29 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"
@@ -162,7 +162,6 @@
dialogConfigForQuery.visible = true
dialogConfigForQuery.isAdd = true
dialogConfigForQuery.title = '楂樼骇鏌ヨ'
- sort.value = params.totalCount + 1
}
const onConfirmWmsMaterial = async () => {
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..1f118bc 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"
@@ -192,7 +192,7 @@
} else {
ConfirmBox('鏄惁淇濆瓨璁剧疆锛�')
.then(() => {
- onConfirm()
+ onConfirmQuery()
})
.catch(() => {
visible.value = false
@@ -202,9 +202,10 @@
}
}
/**
- * 淇濆瓨
+ * 纭鏌ヨ
*/
- const onConfirm = async () => {
+ const onConfirmQuery = async () => {
+ ElMessage.success('鐐瑰嚮浜嗘煡璇㈡寜閽�')
await formRef.value?.validate()
const data = {
materialCode: formData.value.materialCode,
@@ -229,7 +230,7 @@
await WmsMaterialQueryDrawer.updateWmsMaterial(id, data)
}
ElMessage.success('淇濆瓨鎴愬姛')
- ctx.emit('confirm')
+ ctx.emit('confirmQuery')
}
const updateCheckData = () => {
@@ -249,9 +250,9 @@
}
}
/**
- * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+ * 閫氱敤鏌ヨ鏋氫妇
*/
- const onOpen = async () => {
+ const commonQueryEnumForFrom=async()=>{
const materialTypeEnum = await WmsMaterialQueryDrawer.getWmsEnumData({
EnumName: 'MaterialTypeEnum',
})
@@ -266,6 +267,12 @@
EnumName: 'YesNoEnum',
})
updateFormItemOptions('isMainBranch', yesOrNoTypeEnum)
+ }
+ commonQueryEnumForFrom();
+ /**
+ * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+ */
+ const onOpen = async () => {
if (current.value) {
const res = await WmsMaterialQueryDrawer.getWmsMaterialDetail(current.value)
@@ -306,6 +313,6 @@
formRef,
onOpen,
onClose,
- onConfirm,
+ onConfirmQuery,
}
}
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 14fba7a..88f70eb 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"
@@ -2,7 +2,7 @@
* 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗�
*/
import { SetupContext, defineComponent } from 'vue'
-import BaseDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
+import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsMaterialQueryDrawer.module.scss'
import { useWmsMaterialQueryDrawer } from '../../../../Controllers/WmsMaterialQueryDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
@@ -33,7 +33,7 @@
setup(props: Record<string, any>, ctx: SetupContext) {
const {
onClose,
- onConfirm,
+ onConfirmQuery,
onOpen,
formRef,
visible,
@@ -41,13 +41,13 @@
formData,
} = useWmsMaterialQueryDrawer(props, ctx)
return () => (
- <BaseDrawer
+ <BaseQueryDrawer
class={styles.drawer}
size="800px"
title={props.title || '楂樼骇鏌ヨ'}
v-model={visible.value}
close-on-click-modal={true}
- onConfirm={onConfirm}
+ confirmQuery={onConfirmQuery}
onOpen={onOpen}
before-close={onClose}
onClose={onClose}
@@ -58,7 +58,7 @@
labelWidth="106px"
formItemProps={formItems}
></DyForm>
- </BaseDrawer>
+ </BaseQueryDrawer>
)
},
})
--
Gitblit v1.9.3