diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index 007a203..ccb0f8b 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -39,6 +39,11 @@
inputAlign="right" border="none">
+
+
+
+
@@ -56,6 +61,10 @@
@confirm="handleAccountNameConfirm">
+
+
+
{
getDicts('deal_category').then(res => {
dealCategoryList.value =[res.data]
})
+ // 子类型
+ getDicts('daily_expenses').then(res => {
+ childCategoryList.value =[res.data]
+ })
+
listAccounts(queryAccountParams.value).then((response) => {
accountNameList.value = [response.rows]
})
// 交易类别
+ getDicts('daily_expenses').then(result => {
+ form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
+ })
+ // 交易类别
getDicts('deal_category').then(result => {
form.value.dealCategoryName=dictStr(form.value.dealCategory, result.data)
})
@@ -172,6 +196,10 @@ onLoad((option) => {
// 交易类别
getDicts('deal_category').then(result => {
form.value.dealCategoryName=dictStr(form.value.dealCategory, result.data)
+ })
+ // 交易类别
+getDicts('daily_expenses').then(result => {
+ form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
})
// 记账类型
getDicts('account_type').then(result => {
@@ -241,7 +269,7 @@ getDicts('deal_category').then(result => {
showAccountName.value = false
}
function handleDealCategory() {
- if (accountTypeList.value[0].length === 0) {
+ if (dealCategoryList.value[0].length === 0) {
proxy.$refs['uToast'].show({
message: '交易类别为空 ', type: 'warning'
})
@@ -252,11 +280,38 @@ getDicts('deal_category').then(result => {
function handleDealCategoryConfirm(e) {
form.value.dealCategoryName = e.value[0].dictLabel
form.value.dealCategory = e.value[0].dictValue
+ //1表示日常支出,如果是日常支出,选择子类别,否则不显示子类别,且子类别与类别相同
+ if (form.value.dealCategory === '1') {
+ form.value.childCategory = null
+ childCategoryShow.value = true
+ } else {
+ childCategoryShow.value = false
+ form.value.childCategory = form.value.dealCategory
+ }
showDealCategory.value = false
}
function handleDealCategoryCancel() {
showDealCategory.value = false
}
+
+ function handleChildCategory() {
+ if (childCategoryList.value[0].length === 0) {
+ proxy.$refs['uToast'].show({
+ message: '交易子类别为空 ', type: 'warning'
+ })
+ } else {
+ showChildCategory.value = true
+ }
+ }
+ function handleChildCategoryConfirm(e) {
+ form.value.childCategoryName = e.value[0].dictLabel
+ form.value.childCategory = e.value[0].dictValue
+ showChildCategory.value = false
+ }
+ function handleChildCategoryCancel() {
+ showChildCategory.value = false
+ }
+
function handleDealType() {
if (dealTypeList.value[0].length === 0) {
proxy.$refs['uToast'].show({
diff --git a/src/pages/work/accounts/accountDealRecord/details.vue b/src/pages/work/accounts/accountDealRecord/details.vue
index 4684844..946baa9 100644
--- a/src/pages/work/accounts/accountDealRecord/details.vue
+++ b/src/pages/work/accounts/accountDealRecord/details.vue
@@ -13,6 +13,7 @@
+
diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue
index 51ed7ae..baa1184 100644
--- a/src/pages/work/accounts/accountDealRecord/list.vue
+++ b/src/pages/work/accounts/accountDealRecord/list.vue
@@ -111,6 +111,10 @@
交易类别:
{{ dictStr(item.dealCategory, dealCategoryList) }}
+
+ 交易子类别:
+ {{ item.childCategoryName }}
+
备注:
{{ item.remark }}
diff --git a/src/pages/work/bill/creditCardBill/addEdit.vue b/src/pages/work/bill/creditCardBill/addEdit.vue
index bd29922..6dbf0b1 100644
--- a/src/pages/work/bill/creditCardBill/addEdit.vue
+++ b/src/pages/work/bill/creditCardBill/addEdit.vue
@@ -192,7 +192,7 @@ onLoad((option) => {
updateCreditCardBill(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '修改成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/creditCardBill//list` })
+ uni.navigateTo({ url: `/pages/work/bill/creditCardBill/list` })
}
})
})
@@ -200,7 +200,7 @@ onLoad((option) => {
addCreditCardBill(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '新增成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/creditCardBill//list` })
+ uni.navigateTo({ url: `/pages/work/bill/creditCardBill/list` })
}
})
})
diff --git a/src/pages/work/bill/creditInstallmentHistory/addEdit.vue b/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
index c566c66..45cdeb2 100644
--- a/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
+++ b/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
@@ -250,7 +250,7 @@ onLoad((option) => {
updateInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '修改成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})
@@ -258,7 +258,7 @@ onLoad((option) => {
addInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '新增成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})
diff --git a/src/pages/work/bill/onlineLendHistory/addEdit.vue b/src/pages/work/bill/onlineLendHistory/addEdit.vue
index 3fde4ff..3bc3680 100644
--- a/src/pages/work/bill/onlineLendHistory/addEdit.vue
+++ b/src/pages/work/bill/onlineLendHistory/addEdit.vue
@@ -250,7 +250,7 @@ onLoad((option) => {
updateInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '修改成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})
@@ -258,7 +258,7 @@ onLoad((option) => {
addInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '新增成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})
diff --git a/src/pages/work/bill/peopleLendHistory/addEdit.vue b/src/pages/work/bill/peopleLendHistory/addEdit.vue
index 23f666b..d666d0f 100644
--- a/src/pages/work/bill/peopleLendHistory/addEdit.vue
+++ b/src/pages/work/bill/peopleLendHistory/addEdit.vue
@@ -225,7 +225,7 @@ onLoad((option) => {
updateInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '修改成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})
@@ -233,7 +233,7 @@ onLoad((option) => {
addInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '新增成功', complete() {
- uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
+ uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory/list` })
}
})
})