From fb4915c13885cfca728f5b4c7624cf20bdb1d968 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 14:39:38 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx | 13 ++++++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 47 +++++++++++++----------
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 | 17 +-------
4 files changed, 43 insertions(+), 36 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 1594dae..9d144bb 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', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
+ emits: ['close','reset', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
setup(props: any, { emit, slots, attrs }: any) {
// const size = computed(() => {
// if (attrs.size.includes('px')) {
@@ -71,6 +71,17 @@
鍏抽棴
</el-button>
<el-button
+ onClick={() => emit('reset')}
+ type="info"
+ plain
+ class={{
+ [styles.dialogBtn]: true,
+ [styles.csBaseBtn]: true,
+ }}
+ >
+ 閲嶇疆
+ </el-button>
+ <el-button
onClick={() => emit('confirmQueryForBase')}
type="primary"
class={{
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 6248a7e..e2314b6 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"
@@ -66,7 +66,6 @@
prop: 'materialName',
el: 'input',
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
- rules: [{ required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
label: '閲囪喘绫诲瀷',
@@ -74,7 +73,6 @@
el: 'select',
placeholder: '璇烽�夋嫨閲囪喘绫诲瀷',
options: [],
- rules: [{ required: true, message: '璇烽�夋嫨閲囪喘绫诲瀷', trigger: 'change' }],
},
{
label: '鐗╂枡绫诲瀷',
@@ -82,7 +80,6 @@
el: 'select',
placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
options: [],
- rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
},
{
label: '涓诲崟浣�',
@@ -205,9 +202,6 @@
* 纭鏌ヨ
*/
const onConfirmQuery = async () => {
- alert('浣犳潵鍚婃垜鍐呴儴鏂规硶浜嗗晩');
-
- //await formRef.value?.validate()
const data = {
materialCode: formData.value.materialCode,
materialName: formData.value.materialName,
@@ -224,19 +218,30 @@
certification: formData.value.certification,
remark: formData.value.remark,
}
- if (!current.value) {
- //await WmsMaterialDrawer.addWmsMaterial(data)
- } else {
- const id = current.value.id
- //await WmsMaterialDrawer.updateWmsMaterial(id, data)
- }
- ElMessage.success('淇濆瓨鎴愬姛')
- //ctx.emit('confirmQuery')
//澧炲姞浼犻�掑弬鏁� 銆怑ditby shaocx,2025-05-03銆�
- debugger
- console.log("鏂颁紶閫掑弬鏁版槸:"+data);
- alert("鏂颁紶閫掑弬鏁版槸:"+data);
- ctx.emit('confirmQuery',data)
+ //debugger
+ //console.log("鏂颁紶閫掑弬鏁版槸:"+data);
+ 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 = ''
}
const updateCheckData = () => {
@@ -258,7 +263,7 @@
/**
* 閫氱敤鏌ヨ鏋氫妇
*/
- const commonQueryEnumForFrom=async()=>{
+ const commonQueryEnumForFrom = async () => {
const materialTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
EnumName: 'MaterialTypeEnum',
})
@@ -274,12 +279,11 @@
})
updateFormItemOptions('isMainBranch', yesOrNoTypeEnum)
}
- commonQueryEnumForFrom();
+ commonQueryEnumForFrom()
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
const onOpen = async () => {
-
if (current.value) {
const res = await WmsMaterialDrawer.getWmsMaterialDetail(current.value)
@@ -320,5 +324,6 @@
onOpen,
onClose,
onConfirmQuery,
+ onReset,
}
}
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 921bb25..639c7e2 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"
@@ -35,6 +35,7 @@
onClose,
onConfirmQuery,
onOpen,
+ onReset,
formRef,
visible,
formItems,
@@ -47,6 +48,7 @@
title={props.title || '楂樼骇鏌ヨ'}
v-model={visible.value}
close-on-click-modal={true}
+ onReset={onReset}
onConfirmQueryForBase={onConfirmQuery}
onOpen={onOpen}
before-close={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 b879231..83fb3fa 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"
@@ -117,23 +117,12 @@
// 鏂板鐨勬煡璇㈡柟娉�
const handleQuery = async (extraParams = {}) => {
- //console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
- //debugger
- alert('璋冪敤handleQuery鏂规硶');
- console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
- // 杩囨护鎺� undefined 鐨勫��
-const filteredData = Object.assign(
+ // 杩囨护鎺� undefined 鐨勫��
+let filteredData = Object.assign(
{},
- ...Object.entries(extraParams).map(([key, value]) => (value !== undefined ? { [key]: value } : {}))
+ ...Object.entries(extraParams).map(([key, value]) => ((value !== undefined) ? { [key]: value } : {}))
);
-
tableRef.value.getList(filteredData)
- // debugger
- // console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
- // tableRef.value.getList(extraParams)
- // console.log('鏌ヨ鏉′欢:', queryParams.value)
- // // tableRef.value.getTableList()
- // tableRef.value.getList(queryParams.value)
}
// 閲嶇疆鏌ヨ鏉′欢
--
Gitblit v1.9.3