diff --git a/src/pages/work/base/posmachine/addEdit.vue b/src/pages/work/base/posmachine/addEdit.vue
index cec58b4..1edfa20 100644
--- a/src/pages/work/base/posmachine/addEdit.vue
+++ b/src/pages/work/base/posmachine/addEdit.vue
@@ -34,6 +34,10 @@
inputAlign="right" border="none">
+
+
+
@@ -51,10 +55,7 @@
inputAlign="right" border="none">
-
-
-
+
@@ -154,6 +155,7 @@ const data = reactive({
typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
merchantName: [{ type: 'string', required: true, message: '商户名称不能为空', trigger: ['change', 'blur'] }],
statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],
+ code: [{ type: 'string', required: true, message: '编号不能为空', trigger: ['change', 'blur'] }],
rate: [{ type: 'number', required: true, message: '刷卡费率不能为空', trigger: ['change', 'blur'] }],
ratePlus: [{ type: 'number', required: true, message: '费率+不能为空', trigger: ['change', 'blur'] }],
debitCard: [{ type: 'string', required: true, message: '结算卡不能为空', trigger: ['change', 'blur'] }],
diff --git a/src/pages/work/bill/onlineLendHistory/addEdit.vue b/src/pages/work/bill/onlineLendHistory/addEdit.vue
index b06a067..759d761 100644
--- a/src/pages/work/bill/onlineLendHistory/addEdit.vue
+++ b/src/pages/work/bill/onlineLendHistory/addEdit.vue
@@ -134,7 +134,8 @@ const data = reactive({
queryBankCardLendParams: {
pageNum: 1,
type: '3',
- status: '1',
+ status: '1',
+ lendType: '1',
pageSize: 1000
},
rules: {
diff --git a/src/pages/work/bill/onlineLendHistory/list.vue b/src/pages/work/bill/onlineLendHistory/list.vue
index 2b646b2..2400520 100644
--- a/src/pages/work/bill/onlineLendHistory/list.vue
+++ b/src/pages/work/bill/onlineLendHistory/list.vue
@@ -109,7 +109,7 @@ import {
delInstallmentHistory
} from '@/api/invest/installmentHistory'
import { getDicts } from '@/api/system/dict/data.js'
-import { listAccounts } from '@/api/invest/accounts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
import {onLoad,onShow} from "@dcloudio/uni-app";
// 计算属性与监听属性是在vue中而非uniap中 需要注意!!!
import {reactive ,toRefs,ref,computed }from "vue";
@@ -127,7 +127,8 @@ const data = reactive({
queryBankCardLendParams: {
pageNum: 1,
type: '3',
- status: '1',
+ status: '1',
+ lendType: '1',
pageSize: 100
},
queryParams: {
@@ -174,7 +175,7 @@ function getList() {
})
}
function getDict() {
- listAccounts(queryBankCardLendParams.value).then((response) => {
+ listBankcardLend(queryBankCardLendParams.value).then((response) => {
bankCardLendList.value = [response.rows]
})
// 账单状态
diff --git a/src/pages/work/bill/peopleLendHistory/addEdit.vue b/src/pages/work/bill/peopleLendHistory/addEdit.vue
index 67c0b1c..7bebdb0 100644
--- a/src/pages/work/bill/peopleLendHistory/addEdit.vue
+++ b/src/pages/work/bill/peopleLendHistory/addEdit.vue
@@ -98,7 +98,7 @@ const data = reactive({
installmentDate: null,
period: null,
repaidPeriod: null,
- totalInterest: null,
+ totalInterest: 0,
interestRate: null,
dueDate: null,
closeDate: null,
diff --git a/src/pages/work/bill/peopleLendHistory/list.vue b/src/pages/work/bill/peopleLendHistory/list.vue
index c654a7b..4d6ff45 100644
--- a/src/pages/work/bill/peopleLendHistory/list.vue
+++ b/src/pages/work/bill/peopleLendHistory/list.vue
@@ -101,8 +101,7 @@ const data = reactive({
queryParams: {
name: null,
type: '4',
- bankCardLendId: null,
- state: '0'
+ bankCardLendId: null
}
})
const { filterPanel, queryBankCardLendParams, queryParams} = toRefs(data)