diff --git a/src/pages.json b/src/pages.json
index 46348a8..fcb4aaf 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -112,7 +112,60 @@
}
,
{
- "path": "pages/work/accounts/accounts/index",
+ "path": "pages/work/accounts/creditTransferRecord/list",
+ "style": {
+ "navigationBarTitleText": "信用卡还款"
+ }
+ }
+ ,
+ {
+ "path": "pages/work/accounts/creditTransferRecord/details",
+ "style": {
+ "navigationBarTitleText": "信用卡还款详情"
+ }
+ }
+ ,
+ {
+ "path": "pages/work/accounts/creditTransferRecord/addEdit",
+ "style": {
+ "navigationBarTitleText": "信用卡还款"
+ }
+ },
+ {
+ "path": "pages/work/accounts/debitTransferRecord/list",
+ "style": {
+ "navigationBarTitleText": "储蓄账户记账"
+ }
+ }
+ ,
+ {
+ "path": "pages/work/accounts/debitTransferRecord/details",
+ "style": {
+ "navigationBarTitleText": "储蓄账户记账详情"
+ }
+ }
+ ,
+ {
+ "path": "pages/work/accounts/debitTransferRecord/addEdit",
+ "style": {
+ "navigationBarTitleText": "储蓄账户记账"
+ }
+ }
+ ,
+ {
+ "path": "pages/work/accounts/accounts/list",
+ "style": {
+ "navigationBarTitleText": "记账账户"
+ }
+ },
+ {
+ "path": "pages/work/accounts/accounts/details",
+ "style": {
+ "navigationBarTitleText": "记账账户详情"
+ }
+ },
+ {
+ "path": "pages/work/accounts/accounts/addEdit",
"style": {
"navigationBarTitleText": "记账账户"
}
diff --git a/src/pages/work/accounts/accounts/addEdit.vue b/src/pages/work/accounts/accounts/addEdit.vue
new file mode 100644
index 0000000..62cf02d
--- /dev/null
+++ b/src/pages/work/accounts/accounts/addEdit.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+ {{ title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/accounts/details.vue b/src/pages/work/accounts/accounts/details.vue
new file mode 100644
index 0000000..d1b7ea9
--- /dev/null
+++ b/src/pages/work/accounts/accounts/details.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/accounts/index.vue b/src/pages/work/accounts/accounts/index.vue
deleted file mode 100644
index 22e453a..0000000
--- a/src/pages/work/accounts/accounts/index.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-记账账户
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/work/accounts/accounts/list.vue b/src/pages/work/accounts/accounts/list.vue
new file mode 100644
index 0000000..e28301b
--- /dev/null
+++ b/src/pages/work/accounts/accounts/list.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 账户类型
+
+ {{ item.dictLabel }}
+
+ 账户状态
+
+ {{ item.dictLabel }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 账户类型:
+ {{ dictStr(item.type, accountType) }}
+
+
+ 账号:
+ {{ item.code }}
+
+
+ 可用额度:
+ {{ item.availableLimit }}
+
+
+
+ 余额:
+ {{ item.balance }}
+
+
+ 信用卡额度:
+ {{ item.creditLimit }}
+
+
+ 账单日:
+ {{ item.billDateName }}
+
+
+ 还款日:
+ {{ item.payDateName }}
+
+
+ 储蓄卡类型:
+ {{ dictStr(item.debitType, debitType) }}
+
+
+ 账户状态:
+ {{ dictStr(item.state, accountState) }}
+
+
+ 备注:
+ {{ item.remark }}
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/creditTransferRecord/addEdit.vue b/src/pages/work/accounts/creditTransferRecord/addEdit.vue
new file mode 100644
index 0000000..6656b58
--- /dev/null
+++ b/src/pages/work/accounts/creditTransferRecord/addEdit.vue
@@ -0,0 +1,275 @@
+
+
+
+
+
+ {{ title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/creditTransferRecord/details.vue b/src/pages/work/accounts/creditTransferRecord/details.vue
new file mode 100644
index 0000000..652ac53
--- /dev/null
+++ b/src/pages/work/accounts/creditTransferRecord/details.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/creditTransferRecord/list.vue b/src/pages/work/accounts/creditTransferRecord/list.vue
new file mode 100644
index 0000000..4461bf2
--- /dev/null
+++ b/src/pages/work/accounts/creditTransferRecord/list.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 还款方式
+
+ {{ item.dictLabel }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 储蓄卡:
+ {{ item.outAccountName }}
+
+
+ 信用卡:
+ {{ item.inAccountName }}
+
+
+ 还款时间:
+ {{ item.createTime }}
+
+
+ 还款金额:
+ {{ item.amount }}
+
+
+ 还款方式:
+ {{ dictStr(item.dealType, dealTypeList) }}
+
+
+
+ 查看
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/debitTransferRecord/addEdit.vue b/src/pages/work/accounts/debitTransferRecord/addEdit.vue
new file mode 100644
index 0000000..c919376
--- /dev/null
+++ b/src/pages/work/accounts/debitTransferRecord/addEdit.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+ {{ title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/debitTransferRecord/details.vue b/src/pages/work/accounts/debitTransferRecord/details.vue
new file mode 100644
index 0000000..fe0055f
--- /dev/null
+++ b/src/pages/work/accounts/debitTransferRecord/details.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/debitTransferRecord/list.vue b/src/pages/work/accounts/debitTransferRecord/list.vue
new file mode 100644
index 0000000..697b2dc
--- /dev/null
+++ b/src/pages/work/accounts/debitTransferRecord/list.vue
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 转出账户:
+ {{ item.outAccountName }}
+
+
+ 转入账户:
+ {{ item.inAccountName }}
+
+
+ 转账时间:
+ {{ item.createTime }}
+
+
+ 转账金额:
+ {{ item.amount }}
+
+
+ 查看
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/work/accounts/posTransferRecord/addEdit.vue b/src/pages/work/accounts/posTransferRecord/addEdit.vue
index 9cac467..412c064 100644
--- a/src/pages/work/accounts/posTransferRecord/addEdit.vue
+++ b/src/pages/work/accounts/posTransferRecord/addEdit.vue
@@ -79,7 +79,26 @@ const title = ref("POS机刷卡记账")
const bankCardLendList = ref([])
const posMachineList = ref([])
const data = reactive({
- form: {},
+ form: {
+ id: null,
+ name: null,
+ type: '1',
+ outAccountId: null,
+ inAccountId: null,
+ posId: null,
+ commission: null,
+ amount: null,
+ actualAmount: null,
+ dealType: '3',
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ delFlag: null,
+ rate: null,
+ ratePlus: 0,
+ remark: null
+ },
queryPosMachineParams: {
pageNum: 1,
pageSize: 1000
diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue
index 7208f81..68c308e 100644
--- a/src/pages/work/accounts/posTransferRecord/list.vue
+++ b/src/pages/work/accounts/posTransferRecord/list.vue
@@ -128,9 +128,6 @@ const pageNum = ref(1)
const listData = ref([])
const isShow = ref(false)
const status = ref('loadmore')
-const accountTypeList = ref([])
-const dealTypeList = ref([])
-const dealCategoryList = ref([])
const settingPickShow = ref(false)
const settingColumns = ref([])
const timeShow= ref(false)
@@ -153,7 +150,6 @@ const windowHeight = computed(() => {
uni.getSystemInfoSync().windowHeight - 50
})
onLoad(() => {
- getDict()
getList()
});
@@ -195,20 +191,6 @@ function getList() {
}
timeShow.value = false
}
-function getDict() {
- // 记账类型类型
- getDicts('account_type').then(res => {
- accountTypeList.value = res.data
- })
- // 交易类型
- getDicts('deal_type').then(res => {
- dealTypeList.value = res.data
- })
- // 交易类别
- getDicts('deal_category').then(res => {
- dealCategoryList.value = res.data
- })
- }
function settingConfirm(e) {
queryParams.value.settingId = e.value[0].settingId
queryParams.value.settingName = e.value[0].settingName
@@ -217,48 +199,6 @@ function settingConfirm(e) {
function settingCancel() {
settingPickShow.value = false
}
-function dictStr(val, arr) {
- let str = ''
- arr.map(item => {
- if (item.dictValue === val) {
- str = item.dictLabel
- }
- })
- return str
- }
-function selectAccountType(item) {
- queryParams.value.type = item.dictValue
- accountTypeList.value.map(ele => {
- if (ele.dictValue == item.dictValue) {
- ele.selected = true
- Reflect.set(ele, 'selected', true)
- } else {
- Reflect.set(ele, 'selected', false)
- }
- })
- }
- function selectDealType(item) {
- queryParams.value.dealType = item.dictValue
- dealTypeList.value.map(ele => {
- if (ele.dictValue == item.dictValue) {
- ele.selected = true
- Reflect.set(ele, 'selected', true)
- } else {
- Reflect.set(ele, 'selected', false)
- }
- })
- }
- function selectDealCategory(item) {
- queryParams.value.dealCategory = item.dictValue
- dealCategoryList.value.map(ele => {
- if (ele.dictValue == item.dictValue) {
- ele.selected = true
- Reflect.set(ele, 'selected', true)
- } else {
- Reflect.set(ele, 'selected', false)
- }
- })
- }
function searchSubmit() {
pageNum.value = 1
listData.value = []
diff --git a/src/pages/work/heartJourney/details.vue b/src/pages/work/heartJourney/details.vue
index 50a7b8f..d66166f 100644
--- a/src/pages/work/heartJourney/details.vue
+++ b/src/pages/work/heartJourney/details.vue
@@ -9,6 +9,7 @@
+
@@ -19,6 +20,7 @@