From f87590b44fe1c160f3ce8ecaaba57f44e0cf3858 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周六, 03 5月 2025 17:38:30 +0800 Subject: [PATCH] 2222 --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 124 ++++++++++++++++++++++------------------- 1 files changed, 67 insertions(+), 57 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 a8b09be..78d4406 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" @@ -42,6 +42,10 @@ ) } + const sayHello = () => { + console.log("Hello from child!"); + }; + const visible = computed({ get() { return props.modelValue @@ -66,7 +70,6 @@ prop: 'materialName', el: 'input', placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�', - rules: [{ required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }], }, { label: '閲囪喘绫诲瀷', @@ -74,7 +77,6 @@ el: 'select', placeholder: '璇烽�夋嫨閲囪喘绫诲瀷', options: [], - rules: [{ required: true, message: '璇烽�夋嫨閲囪喘绫诲瀷', trigger: 'change' }], }, { label: '鐗╂枡绫诲瀷', @@ -82,7 +84,6 @@ el: 'select', placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷', options: [], - rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }], }, { label: '涓诲崟浣�', @@ -186,27 +187,45 @@ const onClose = (done: () => void) => { if (visible.value) { - if (checkIsEqualObject()) { - visible.value = false - done && done() - } else { - ConfirmBox('鏄惁淇濆瓨璁剧疆锛�') - .then(() => { - onConfirmQuery() - }) - .catch(() => { - visible.value = false - done && done() - }) + 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 () => { - ElMessage.success('鐐瑰嚮浜嗘煡璇㈡寜閽�') - await formRef.value?.validate() const data = { materialCode: formData.value.materialCode, materialName: formData.value.materialName, @@ -223,16 +242,32 @@ 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銆� - 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 = '' + //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢 + ctx.emit('restQuery'); } const updateCheckData = () => { @@ -254,7 +289,7 @@ /** * 閫氱敤鏌ヨ鏋氫妇 */ - const commonQueryEnumForFrom=async()=>{ + const commonQueryEnumForFrom = async () => { const materialTypeEnum = await WmsMaterialDrawer.getWmsEnumData({ EnumName: 'MaterialTypeEnum', }) @@ -270,40 +305,13 @@ }) updateFormItemOptions('isMainBranch', yesOrNoTypeEnum) } - commonQueryEnumForFrom(); + commonQueryEnumForFrom() /** * 寮圭獥鎵撳紑鑾峰彇璇︽儏 */ const onOpen = async () => { - - if (current.value) { - const res = await WmsMaterialDrawer.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) @@ -316,5 +324,7 @@ onOpen, onClose, onConfirmQuery, + onReset, + sayHello } } -- Gitblit v1.9.3