diff --git a/src/components/MoneyManage/ProductSelect.vue b/src/components/MoneyManage/ProductSelect.vue index c3804d5..345e2c9 100644 --- a/src/components/MoneyManage/ProductSelect.vue +++ b/src/components/MoneyManage/ProductSelect.vue @@ -189,11 +189,8 @@ const confirmSelection = () => { } const cancelSelection = () => { - emit('update:modelValue', ''); - emit('change', ''); - console.log('点击了取消', ''); - selectedItem.value = ''; - selectedValue.value = ''; + selectedValue.value = props.modelValue + selectedItem.value = props.modelValue || '' isOpen.value = false showPanel.value = false } @@ -773,4 +770,4 @@ defineExpose({ resetSelect }); color: #c0c4cc; } } - \ No newline at end of file + diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index e922274..eeb30ee 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -1038,11 +1038,15 @@ const handleEditForm = async () => { ElMessage.error(t('elmessage.productNumError')); return; } + }else{ + addFormData.value.goodNum = addFormData.value.permanentGold || 0 } if (!isGold.value && addFormData.value.numUnit == '') { ElMessage.error(t('elmessage.checkNumUnit')); return; + }else{ + addFormData.value.numUnit = t('cash.unit') } // 时间格式 if (addFormData.value.payTime) {