fix: 自测问题，彻底解决。
This commit is contained in:
tianyongbao
@@ -211,132 +211,123 @@ onLoad((option) => {
|
|||||||
childCategoryList.value =[res.data]
|
childCategoryList.value =[res.data]
|
||||||
})
|
})
|
||||||
|
|
||||||
// 如果有储蓄卡类型，先设置查询参数
|
// 如果没有ID（新增模式）
|
||||||
if (tempDebitType.value) {
|
if(form.value.id == null) {
|
||||||
queryAccountParams.value.debitType = tempDebitType.value
|
// 如果有储蓄卡类型，先设置查询参数
|
||||||
debitTypeShow.value = true
|
if (tempDebitType.value) {
|
||||||
}
|
queryAccountParams.value.debitType = tempDebitType.value
|
||||||
|
debitTypeShow.value = true
|
||||||
// 设置账户类型查询参数
|
|
||||||
if (form.value.type) {
|
|
||||||
queryAccountParams.value.type = form.value.type
|
|
||||||
}
|
|
||||||
|
|
||||||
listAccounts(queryAccountParams.value).then((response) => {
|
|
||||||
accountNameList.value = [response.rows]
|
|
||||||
|
|
||||||
// 如果有预设的accountId，自动填充账户名称
|
|
||||||
if (form.value.accountId && response.rows.length > 0) {
|
|
||||||
const selectedAccount = response.rows.find(item => item.id === form.value.accountId)
|
|
||||||
if (selectedAccount) {
|
|
||||||
form.value.accountName = selectedAccount.nameCodeAvailableLimit
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
|
||||||
|
// 设置账户类型查询参数
|
||||||
// 如果有储蓄卡类型，回填储蓄卡类型名称
|
if (form.value.type) {
|
||||||
if (tempDebitType.value) {
|
queryAccountParams.value.type = form.value.type
|
||||||
getDicts('debit_type').then(result => {
|
}
|
||||||
tempDebitTypeName.value = dictStr(tempDebitType.value, result.data)
|
|
||||||
|
listAccounts(queryAccountParams.value).then((response) => {
|
||||||
|
accountNameList.value = [response.rows]
|
||||||
|
|
||||||
|
// 如果有预设的accountId，自动填充账户名称
|
||||||
|
if (form.value.accountId && response.rows.length > 0) {
|
||||||
|
const selectedAccount = response.rows.find(item => item.id === form.value.accountId)
|
||||||
|
if (selectedAccount) {
|
||||||
|
form.value.accountName = selectedAccount.nameCodeAvailableLimit
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
// 如果有储蓄卡类型，回填储蓄卡类型名称
|
||||||
// 回填记账类型名称
|
if (tempDebitType.value) {
|
||||||
if (form.value.type) {
|
getDicts('debit_type').then(result => {
|
||||||
getDicts('account_type').then(result => {
|
tempDebitTypeName.value = dictStr(tempDebitType.value, result.data)
|
||||||
form.value.typeName = dictStr(form.value.type, result.data)
|
})
|
||||||
})
|
}
|
||||||
}
|
|
||||||
|
// 回填记账类型名称
|
||||||
// 交易类别
|
if (form.value.type) {
|
||||||
getDicts('daily_expenses').then(result => {
|
getDicts('account_type').then(result => {
|
||||||
form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
|
form.value.typeName = dictStr(form.value.type, result.data)
|
||||||
})
|
})
|
||||||
// 交易类别
|
}
|
||||||
getDicts('deal_category').then(result => {
|
} else {
|
||||||
form.value.dealCategoryName=dictStr(form.value.dealCategory, result.data)
|
// 编辑或复制模式 - 先加载数据，再处理账户列表
|
||||||
})
|
|
||||||
// 记账类型
|
|
||||||
getDicts('account_type').then(result => {
|
|
||||||
form.value.typeName=dictStr(form.value.type, result.data)
|
|
||||||
})
|
|
||||||
// 交易类型
|
|
||||||
getDicts('deal_type').then(result => {
|
|
||||||
form.value.dealTypeName=dictStr(form.value.dealType, result.data)
|
|
||||||
})
|
|
||||||
|
|
||||||
if(form.value.id!=null){
|
|
||||||
getAccountDealRecord(form.value.id).then(res => {
|
getAccountDealRecord(form.value.id).then(res => {
|
||||||
form.value = res.data
|
form.value = res.data
|
||||||
|
|
||||||
|
// 处理交易子类别显示
|
||||||
if (form.value.dealCategory === '1') {
|
if (form.value.dealCategory === '1') {
|
||||||
childCategoryShow.value = true
|
childCategoryShow.value = true
|
||||||
// 交易类别
|
getDicts('daily_expenses').then(result => {
|
||||||
getDicts('daily_expenses').then(result => {
|
form.value.childCategoryName = dictStr(form.value.childCategory, result.data)
|
||||||
form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
|
})
|
||||||
})
|
} else {
|
||||||
} else {
|
form.value.childCategoryName = form.value.dealCategory
|
||||||
form.value.childCategoryName = form.value.dealCategory
|
form.value.childCategory = form.value.dealCategory
|
||||||
form.value.childCategory = form.value.dealCategory
|
childCategoryShow.value = false
|
||||||
childCategoryShow.value = false
|
}
|
||||||
}
|
|
||||||
// 交易类别
|
// 回填各字典标签
|
||||||
getDicts('deal_category').then(result => {
|
getDicts('deal_category').then(result => {
|
||||||
form.value.dealCategoryName=dictStr(form.value.dealCategory, result.data)
|
form.value.dealCategoryName = dictStr(form.value.dealCategory, result.data)
|
||||||
})
|
})
|
||||||
|
getDicts('account_type').then(result => {
|
||||||
// 记账类型
|
form.value.typeName = dictStr(form.value.type, result.data)
|
||||||
getDicts('account_type').then(result => {
|
})
|
||||||
form.value.typeName=dictStr(form.value.type, result.data)
|
|
||||||
})
|
|
||||||
// 交易类型
|
|
||||||
getDicts('deal_type').then(result => {
|
getDicts('deal_type').then(result => {
|
||||||
form.value.dealTypeName=dictStr(form.value.dealType, result.data)
|
form.value.dealTypeName = dictStr(form.value.dealType, result.data)
|
||||||
})
|
})
|
||||||
if(form.value.type=='1'||form.value.type=='2'){
|
|
||||||
queryAccountParams.value.type = form.value.type
|
// 如果是复制模式，重置交易时间
|
||||||
}
|
if(flag.value != null) {
|
||||||
else {
|
form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
|
||||||
queryAccountParams.value.type = null
|
}
|
||||||
}
|
|
||||||
|
// 根据账户类型加载对应的账户列表
|
||||||
// 如果是复制模式，重置交易时间
|
if(form.value.type === '1') {
|
||||||
if(flag.value!=null){
|
// 储蓄账户 - 显示储蓄账户类型筛选
|
||||||
form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
|
debitTypeShow.value = true
|
||||||
}
|
queryAccountParams.value.type = '1'
|
||||||
|
|
||||||
// 编辑和复制时，如果是储蓄账户，自动回填储蓄账户类型并显示筛选框
|
// 从账户列表中查找当前账户的储蓄账户类型
|
||||||
if(form.value.type === '1' && form.value.accountId) {
|
listAccounts({pageNum: 1, pageSize: 1000, type: '1', status: '1'}).then((response) => {
|
||||||
debitTypeShow.value = true
|
const currentAccount = response.rows.find(item => item.id === form.value.accountId)
|
||||||
// 从账户列表中查找当前账户的储蓄账户类型
|
if(currentAccount && currentAccount.debitType) {
|
||||||
listAccounts({pageNum: 1, pageSize: 1000, type: '1', status: '1'}).then((response) => {
|
tempDebitType.value = currentAccount.debitType
|
||||||
const currentAccount = response.rows.find(item => item.id === form.value.accountId)
|
queryAccountParams.value.debitType = currentAccount.debitType
|
||||||
if(currentAccount && currentAccount.debitType) {
|
getDicts('debit_type').then(result => {
|
||||||
tempDebitType.value = currentAccount.debitType
|
tempDebitTypeName.value = dictStr(currentAccount.debitType, result.data)
|
||||||
getDicts('debit_type').then(result => {
|
})
|
||||||
tempDebitTypeName.value = dictStr(currentAccount.debitType, result.data)
|
// 只筛选匹配储蓄账户类型的账户
|
||||||
})
|
accountNameList.value = [response.rows.filter(item => item.debitType === tempDebitType.value)]
|
||||||
queryAccountParams.value.debitType = currentAccount.debitType
|
} else {
|
||||||
// 只筛选匹配储蓄账户类型的账户
|
// 如果没有找到储蓄账户类型，显示所有储蓄账户
|
||||||
accountNameList.value = [response.rows.filter(item => item.debitType === tempDebitType.value)]
|
accountNameList.value = [response.rows]
|
||||||
} else {
|
}
|
||||||
// 如果没有找到储蓄账户类型，显示所有储蓄账户
|
})
|
||||||
accountNameList.value = [response.rows]
|
} else if(form.value.type === '2') {
|
||||||
}
|
// 信用卡账户
|
||||||
})
|
debitTypeShow.value = false
|
||||||
} else {
|
tempDebitType.value = null
|
||||||
// 非储蓄账户（信用卡等），清除储蓄账户类型筛选条件
|
tempDebitTypeName.value = null
|
||||||
queryAccountParams.value.debitType = null
|
queryAccountParams.value.type = '2'
|
||||||
debitTypeShow.value = false
|
queryAccountParams.value.debitType = null
|
||||||
tempDebitType.value = null
|
listAccounts({pageNum: 1, pageSize: 1000, type: '2', status: '1'}).then((response) => {
|
||||||
tempDebitTypeName.value = null
|
accountNameList.value = [response.rows]
|
||||||
// 加载对应类型的账户列表
|
})
|
||||||
listAccounts(queryAccountParams.value).then((response) => {
|
} else {
|
||||||
accountNameList.value = [response.rows]
|
// 其他类型账户
|
||||||
})
|
debitTypeShow.value = false
|
||||||
}
|
tempDebitType.value = null
|
||||||
|
tempDebitTypeName.value = null
|
||||||
|
queryAccountParams.value.type = form.value.type
|
||||||
|
queryAccountParams.value.debitType = null
|
||||||
|
listAccounts({pageNum: 1, pageSize: 1000, type: form.value.type, status: '1'}).then((response) => {
|
||||||
|
accountNameList.value = [response.rows]
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(form.value)
|
console.log(form.value)
|
||||||
}
|
}
|
||||||
function dictStr(val, arr) {
|
function dictStr(val, arr) {
|
||||||
|
|||||||
Reference in New Issue
Block a user