diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..10b731c --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ diff --git a/.idea/intc-invest-vue-app.iml b/.idea/intc-invest-vue-app.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/intc-invest-vue-app.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..833d6b9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index fcb4aaf..fdb8623 100644 --- a/src/pages.json +++ b/src/pages.json @@ -146,9 +146,23 @@ } , { - "path": "pages/work/accounts/debitTransferRecord/addEdit", + "path": "pages/work/accounts/lendTransferRecord/list", "style": { - "navigationBarTitleText": "储蓄账户记账" + "navigationBarTitleText": "借贷账户记账" + } + } + , + { + "path": "pages/work/accounts/lendTransferRecord/details", + "style": { + "navigationBarTitleText": "借贷账户记账详情" + } + } + , + { + "path": "pages/work/accounts/lendTransferRecord/addEdit", + "style": { + "navigationBarTitleText": "借贷账户记账" } } , @@ -157,6 +171,13 @@ "style": { "navigationBarTitleText": "记账账户" } + } + , + { + "path": "pages/work/accounts/accounts/commonList", + "style": { + "navigationBarTitleText": "记账账户" + } }, { "path": "pages/work/accounts/accounts/details", @@ -189,6 +210,46 @@ "style": { "navigationBarTitleText": "心路历程" } + }, + { + "path": "pages/work/accounts/investTransferRecord/list", + "style": { + "navigationBarTitleText": "投资账户记账" + } + } + , + { + "path": "pages/work/accounts/investTransferRecord/details", + "style": { + "navigationBarTitleText": "信投资账户记账详情" + } + } + , + { + "path": "pages/work/accounts/investTransferRecord/addEdit", + "style": { + "navigationBarTitleText": "投资账户记账" + } + } , + { + "path": "pages/work/accounts/investAccountDeal/list", + "style": { + "navigationBarTitleText": "投资交易记录" + } + } + , + { + "path": "pages/work/accounts/investAccountDeal/details", + "style": { + "navigationBarTitleText": "投资交易记录详情" + } + } + , + { + "path": "pages/work/accounts/investAccountDeal/addEdit", + "style": { + "navigationBarTitleText": "投资交易记录" + } } ], "subPackages": [ diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue index a04f819..95b504e 100644 --- a/src/pages/work/accounts/accountDealRecord/addEdit.vue +++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue @@ -92,10 +92,10 @@ const data = reactive({ form: { id: null, name: null, - type: null, + type: '1', accountId: null, amount: 0, - dealType: null, + dealType: '2', createBy: null, createTime: null, updateBy: null, @@ -103,12 +103,12 @@ const data = reactive({ delFlag: null, remark: null, currentBalance: null, - dealCategory: null + dealCategory: '1' }, queryAccountParams: { pageNum: 1, state: '1', - type: '', + type: '1', pageSize: 1000 }, rules: { @@ -153,21 +153,35 @@ onLoad((option) => { listAccounts(queryAccountParams.value).then((response) => { accountNameList.value = [response.rows] }) + // 交易类别 + getDicts('deal_category').then(result => { + 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 => { form.value = res.data - // 记账类型 - getDicts('account_type').then(result => { +// 交易类别 +getDicts('deal_category').then(result => { + 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) }) - // 交易类别 - getDicts('deal_category').then(result => { - form.value.dealCategoryName=dictStr(form.value.dealCategory, result.data) - }) + queryAccountParams.value.type = "" listAccounts(queryAccountParams.value).then((response) => { accountNameList.value = [response.rows] diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue index ccd36cf..0b27423 100644 --- a/src/pages/work/accounts/accountDealRecord/list.vue +++ b/src/pages/work/accounts/accountDealRecord/list.vue @@ -80,7 +80,7 @@ + :text="item.accountName+'交易金额:'+item.amount" size="30rpx" color="#333333" :bold="true"> 记账类型: diff --git a/src/pages/work/accounts/accounts/commonList.vue b/src/pages/work/accounts/accounts/commonList.vue new file mode 100644 index 0000000..d3e8cab --- /dev/null +++ b/src/pages/work/accounts/accounts/commonList.vue @@ -0,0 +1,389 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/accounts/list.vue b/src/pages/work/accounts/accounts/list.vue index e28301b..9f76e43 100644 --- a/src/pages/work/accounts/accounts/list.vue +++ b/src/pages/work/accounts/accounts/list.vue @@ -39,16 +39,16 @@ + :text="item.name+'-'+item.code" size="30rpx" color="#333333" :bold="true"> 账户类型: {{ dictStr(item.type, accountType) }} - + 可用额度: {{ item.availableLimit }} diff --git a/src/pages/work/accounts/investAccountDeal/addEdit.vue b/src/pages/work/accounts/investAccountDeal/addEdit.vue new file mode 100644 index 0000000..2715fc9 --- /dev/null +++ b/src/pages/work/accounts/investAccountDeal/addEdit.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/investAccountDeal/details.vue b/src/pages/work/accounts/investAccountDeal/details.vue new file mode 100644 index 0000000..3e9b9eb --- /dev/null +++ b/src/pages/work/accounts/investAccountDeal/details.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/investAccountDeal/list.vue b/src/pages/work/accounts/investAccountDeal/list.vue new file mode 100644 index 0000000..cb70ed0 --- /dev/null +++ b/src/pages/work/accounts/investAccountDeal/list.vue @@ -0,0 +1,476 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/investTransferRecord/addEdit.vue b/src/pages/work/accounts/investTransferRecord/addEdit.vue new file mode 100644 index 0000000..768155d --- /dev/null +++ b/src/pages/work/accounts/investTransferRecord/addEdit.vue @@ -0,0 +1,238 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/investTransferRecord/details.vue b/src/pages/work/accounts/investTransferRecord/details.vue new file mode 100644 index 0000000..68ff305 --- /dev/null +++ b/src/pages/work/accounts/investTransferRecord/details.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/investTransferRecord/list.vue b/src/pages/work/accounts/investTransferRecord/list.vue new file mode 100644 index 0000000..45083b5 --- /dev/null +++ b/src/pages/work/accounts/investTransferRecord/list.vue @@ -0,0 +1,446 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/lendTransferRecord/addEdit.vue b/src/pages/work/accounts/lendTransferRecord/addEdit.vue new file mode 100644 index 0000000..51689f4 --- /dev/null +++ b/src/pages/work/accounts/lendTransferRecord/addEdit.vue @@ -0,0 +1,293 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/lendTransferRecord/details.vue b/src/pages/work/accounts/lendTransferRecord/details.vue new file mode 100644 index 0000000..56e78fd --- /dev/null +++ b/src/pages/work/accounts/lendTransferRecord/details.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/lendTransferRecord/list.vue b/src/pages/work/accounts/lendTransferRecord/list.vue new file mode 100644 index 0000000..7c2a4b2 --- /dev/null +++ b/src/pages/work/accounts/lendTransferRecord/list.vue @@ -0,0 +1,444 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue index 68c308e..e065d39 100644 --- a/src/pages/work/accounts/posTransferRecord/list.vue +++ b/src/pages/work/accounts/posTransferRecord/list.vue @@ -65,7 +65,7 @@ + :text="item.posName+'-'+item.outAccountName+'刷卡:'+item.amount" size="30rpx" color="#333333" :bold="true"> POS机名称: @@ -84,7 +84,7 @@ {{ item.createTime }} - 交易金额: + 刷卡金额: {{ item.amount }} diff --git a/src/pages/work/heartJourney/list.vue b/src/pages/work/heartJourney/list.vue index f448887..749c2a6 100644 --- a/src/pages/work/heartJourney/list.vue +++ b/src/pages/work/heartJourney/list.vue @@ -34,7 +34,7 @@ + :text="item.name" size="30rpx" color="#333333" :bold="true"> 类型: diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index b2505f9..cd7c6ef 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -78,7 +78,7 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作 { path: '/pages/work/accounts/posTransferRecord/list', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list' }, { path: '/pages/work/accounts/creditTransferRecord/list', text: '信用卡还款', icon: 'arrow-left', permission: 'invest:accountsTransferRecord:list' }, { path: '/pages/work/accounts/debitTransferRecord/list', text: '储蓄账户记账', icon: 'tune', permission: 'invest:accountsTransferRecord:list' }, - { path: '/pages/work/accounts/accounts/list', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list' }, + { path: '/pages/work/accounts/accounts/commonList', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list' }, { path: '/pages/page1/page1', text: '网贷账单', icon: 'settings', permission: 'invest:installmentHistory:list' }, { path: '/pages/page1/page1', text: '信用卡分期账单', icon: 'bars', permission: 'invest:installmentHistory:list' }, { path: '/pages/page1/page1', text: '征信查询记录', icon: 'search', permission: 'invest:creditQueryRecord:list' } @@ -104,10 +104,10 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作 { path: '/pages/work/accounts/accounts/list', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list' }, { path: '/pages/work/accounts/posTransferRecord/list', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list' }, { path: '/pages/work/accounts/creditTransferRecord/list', text: '信用卡还款', icon: 'arrow-left', permission: 'invest:accountsTransferRecord:list' }, - { path: '/pages/page1/page1', text: '投资账户记账', icon: 'auth-filled', permission: 'invest:accountsTransferRecord:list' }, - { path: '/pages/page1/page1', text: '投资交易记录', icon: 'chatboxes', permission: 'invest:accountDealRecord:list' }, + { path: '/pages/work/accounts/investTransferRecord/list', text: '投资账户记账', icon: 'auth-filled', permission: 'invest:accountsTransferRecord:list' }, + { path: '/pages/work/accounts/investAccountDeal/list', text: '投资交易记录', icon: 'chatboxes', permission: 'invest:accountDealRecord:list' }, { path: '/pages/work/accounts/debitTransferRecord/list', text: '储蓄账户记账', icon: 'tune', permission: 'invest:accountsTransferRecord:list' }, - { path: '/pages/page1/page1', text: '借贷账户记账', icon: 'link', permission: 'invest:accountsTransferRecord:list' }, + { path: '/pages/work/accounts/lendTransferRecord/list', text: '借贷账户记账', icon: 'link', permission: 'invest:accountsTransferRecord:list' }, { path: '/pages/work/accounts/accountDealRecord/list', text: '账户交易记录', icon: 'paperclip', permission: 'invest:accountDealRecord:list' } ]) const heartJourneyGridList=ref([