From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 72 +++++++++--------------------------
1 files changed, 19 insertions(+), 53 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 78d4406..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"
@@ -16,7 +16,7 @@
import { cloneDeep } from 'lodash'
export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => {
- const WmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
+ const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
/**
* 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
*/
@@ -42,9 +42,6 @@
)
}
- const sayHello = () => {
- console.log("Hello from child!");
- };
const visible = computed({
get() {
@@ -184,48 +181,7 @@
const check = isEqual(initiateData.value, data)
return check
}
-
- const onClose = (done: () => void) => {
- if (visible.value) {
- 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()
- // })
- // }
- }
- }
- /**
- * 纭鏌ヨ
- */
- const onConfirmQuery = async () => {
+ const commonGetFormData=()=>{
const data = {
materialCode: formData.value.materialCode,
materialName: formData.value.materialName,
@@ -242,9 +198,20 @@
certification: formData.value.certification,
remark: formData.value.remark,
}
- //澧炲姞浼犻�掑弬鏁� 銆怑ditby shaocx,2025-05-03銆�
- //debugger
- //console.log("鏂颁紶閫掑弬鏁版槸:"+data);
+ return data;
+ }
+ const onClose = (done: () => void) => {
+ if (visible.value) {
+ visible.value = false
+ const data =commonGetFormData();
+ ctx.emit('close', data)
+ }
+ }
+ /**
+ * 纭鏌ヨ
+ */
+ const onConfirmQuery = async () => {
+ const data =commonGetFormData();
ctx.emit('confirmQuery', data)
}
/**
@@ -290,17 +257,17 @@
* 閫氱敤鏌ヨ鏋氫妇
*/
const commonQueryEnumForFrom = async () => {
- const materialTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
+ const materialTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'MaterialTypeEnum',
})
updateFormItemOptions('materialType', materialTypeEnum)
- const purchaseTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
+ const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
})
updateFormItemOptions('purchaseType', purchaseTypeEnum)
- const yesOrNoTypeEnum = await WmsMaterialDrawer.getWmsEnumData({
+ const yesOrNoTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'YesNoEnum',
})
updateFormItemOptions('isMainBranch', yesOrNoTypeEnum)
@@ -325,6 +292,5 @@
onClose,
onConfirmQuery,
onReset,
- sayHello
}
}
--
Gitblit v1.9.3