diff --git a/src/pages/statistic/accounts/sleepAccounts/index.vue b/src/pages/statistic/accounts/sleepAccounts/index.vue
index 888b8d8..afbadc3 100644
--- a/src/pages/statistic/accounts/sleepAccounts/index.vue
+++ b/src/pages/statistic/accounts/sleepAccounts/index.vue
@@ -39,6 +39,13 @@
{{ item.recentDealTime || '--' }}
+
+
+
+
+ 交易
+
+
@@ -246,6 +253,19 @@ function selectType(item) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 构建URL参数:账户ID、账户类型、储蓄卡类型(如果有)
+ let url = `/pages/work/accounts/accountDealRecord/addEdit?accountId=${item.id}&accountType=${item.type}`
+
+ // 如果是储蓄账户(type=1)且有储蓄卡类型,传递储蓄卡类型参数
+ if (item.type === '1' && item.debitType) {
+ url += `&debitType=${item.debitType}`
+ }
+
+ uni.navigateTo({ url })
+ isShow.value = true
+ }
@@ -516,6 +536,38 @@ page {
padding: 24rpx;
background: #fff;
}
+
+ .action-buttons {
+ margin-top: 20rpx;
+ padding-top: 20rpx;
+ border-top: 2rpx solid #f0f0f0;
+ display: flex;
+ justify-content: flex-end;
+ gap: 16rpx;
+
+ .action-btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8rpx;
+ padding: 12rpx 32rpx;
+ background: rgba(24, 144, 255, 0.1);
+ border-radius: 12rpx;
+ border: 2rpx solid #1890ff;
+ transition: all 0.3s ease;
+
+ &:active {
+ transform: scale(0.95);
+ background: rgba(24, 144, 255, 0.15);
+ }
+
+ text {
+ color: #1890ff;
+ font-size: 26rpx;
+ font-weight: 600;
+ }
+ }
+ }
.info-row {
display: flex;
diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index 115da6c..31fd4ed 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -156,6 +156,18 @@ const { form, queryAccountParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
flag.value = option.flag
+
+ // 接收从沉睡账户列表传递的参数
+ if (option.accountId) {
+ form.value.accountId = option.accountId
+ }
+ if (option.accountType) {
+ form.value.type = option.accountType
+ }
+ if (option.debitType) {
+ tempDebitType.value = option.debitType
+ }
+
if(flag.value==null){
if(form.value.id!=null){
title.value="账户交易记录-修改"
@@ -170,7 +182,8 @@ onLoad((option) => {
onReady(() => {
form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
// 新增时默认显示储蓄账户类型筛选(因为默认就是储蓄卡)
- if(form.value.id == null && flag.value == null) {
+ // 但如果是从其他页面跳转过来且指定了非储蓄账户类型,则不显示
+ if(form.value.id == null && flag.value == null && form.value.type === '1') {
debitTypeShow.value = true
}
getData()
@@ -198,9 +211,43 @@ onLoad((option) => {
childCategoryList.value =[res.data]
})
+ // 如果有储蓄卡类型,先设置查询参数
+ 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]
- })
+ 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) {
+ getDicts('debit_type').then(result => {
+ tempDebitTypeName.value = dictStr(tempDebitType.value, result.data)
+ })
+ }
+
+ // 回填记账类型名称
+ if (form.value.type) {
+ getDicts('account_type').then(result => {
+ form.value.typeName = dictStr(form.value.type, result.data)
+ })
+ }
+
// 交易类别
getDicts('daily_expenses').then(result => {
form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
diff --git a/src/pages/work/accounts/accounts/list.vue b/src/pages/work/accounts/accounts/list.vue
index 8d093d8..c20c0be 100644
--- a/src/pages/work/accounts/accounts/list.vue
+++ b/src/pages/work/accounts/accounts/list.vue
@@ -92,17 +92,6 @@
-
-
-
-
- 修改
-
-
-
- 删除
-
-
diff --git a/src/pages/work/accounts/creditTransferRecord/addEdit.vue b/src/pages/work/accounts/creditTransferRecord/addEdit.vue
index 8c92a4a..ecbfc43 100644
--- a/src/pages/work/accounts/creditTransferRecord/addEdit.vue
+++ b/src/pages/work/accounts/creditTransferRecord/addEdit.vue
@@ -159,6 +159,12 @@ const { form, queryDebitCardParams, queryBankCardLendParams, rules} = toRefs(dat
onLoad((option) => {
form.value.id = option.id
+
+ // 接收从信用卡列表传递的参数
+ if (option.creditCardId) {
+ form.value.inAccountId = option.creditCardId
+ }
+
if(form.value.id!=null){
title.value="信用卡还款-修改"
}else{
@@ -171,7 +177,15 @@ onLoad((option) => {
})
function getData() {
listAccounts(queryBankCardLendParams.value).then((response) => {
- bankCardLendList.value = [response.rows]
+ bankCardLendList.value = [response.rows]
+
+ // 如果有传递creditCardId参数,自动选中对应信用卡
+ if (form.value.inAccountId && response.rows.length > 0) {
+ const selectedCard = response.rows.find(item => item.id === form.value.inAccountId)
+ if (selectedCard) {
+ form.value.inAccountName = selectedCard.nameCodeAvailableLimit
+ }
+ }
})
listAccounts(queryDebitCardParams.value).then((response) => {
debitCardList.value = [response.rows]
diff --git a/src/pages/work/accounts/debitTransferRecord/addEdit.vue b/src/pages/work/accounts/debitTransferRecord/addEdit.vue
index 90aa534..97cbf2b 100644
--- a/src/pages/work/accounts/debitTransferRecord/addEdit.vue
+++ b/src/pages/work/accounts/debitTransferRecord/addEdit.vue
@@ -135,6 +135,12 @@ const { form, queryOutAccountParams, queryInAccountParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
+
+ // 接收从储蓄卡列表传递的参数
+ if (option.debitAccountId) {
+ form.value.outAccountId = option.debitAccountId
+ }
+
if(form.value.id!=null){
title.value="储蓄账户转账-修改"
}else{
@@ -150,7 +156,15 @@ onLoad((option) => {
inAccountList.value = [response.rows]
})
listAccounts(queryOutAccountParams.value).then((response) => {
- outAccountList.value = [response.rows]
+ outAccountList.value = [response.rows]
+
+ // 如果有传递debitAccountId参数,自动选中对应储蓄账户
+ if (form.value.outAccountId && response.rows.length > 0) {
+ const selectedAccount = response.rows.find(item => item.id === form.value.outAccountId)
+ if (selectedAccount) {
+ form.value.outAccountName = selectedAccount.nameCodeAvailableLimit
+ }
+ }
})
if(form.value.id!=null){
getAccountsTransferRecord(form.value.id).then(res => {
diff --git a/src/pages/work/accounts/investAccountDeal/addEdit.vue b/src/pages/work/accounts/investAccountDeal/addEdit.vue
index fd6404b..cc2488d 100644
--- a/src/pages/work/accounts/investAccountDeal/addEdit.vue
+++ b/src/pages/work/accounts/investAccountDeal/addEdit.vue
@@ -122,6 +122,12 @@ const { form, queryAccountParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
+
+ // 接收从理财账户列表传递的参数
+ if (option.accountId) {
+ form.value.accountId = option.accountId
+ }
+
if(form.value.id!=null){
title.value="投资交易记录-修改"
}else{
@@ -139,8 +145,32 @@ onLoad((option) => {
dealTypeList.value =[res.data]
})
listAccounts(queryAccountParams.value).then((response) => {
- accountNameList.value = [response.rows]
- })
+ 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
+ // 触发账户选择逻辑
+ getFutureStocks(selectedAccount.id).then((accountRes) => {
+ const account = accountRes.data
+ accountType.value = account.type
+ if (account.type == '1') {
+ futuresShow.value = true
+ form.value.amount = 0
+ form.value.closedPosition = null
+ form.value.commission = null
+ } else {
+ futuresShow.value = false
+ form.value.amount = null
+ form.value.closedPosition = 0
+ form.value.commission = 0
+ }
+ })
+ }
+ }
+ })
if(form.value.id!=null){
getAccountDealRecord(form.value.id).then(res => {
form.value = res.data
diff --git a/src/pages/work/accounts/investAccountDeal/list.vue b/src/pages/work/accounts/investAccountDeal/list.vue
index b7eb75a..b1ec3ec 100644
--- a/src/pages/work/accounts/investAccountDeal/list.vue
+++ b/src/pages/work/accounts/investAccountDeal/list.vue
@@ -103,13 +103,10 @@
余额
{{ item.currentBalance || 0 }}元
-
-
-
-
-
-
- 删除
+
+
+ 删除
+
@@ -680,19 +677,19 @@ page {
.info-row {
display: flex;
flex-wrap: wrap;
- gap: 24rpx;
+ justify-content: space-between;
+ align-items: center;
+ gap: 12rpx;
margin-bottom: 0;
.info-item {
- flex: 0 0 calc(50% - 12rpx);
display: flex;
flex-direction: column;
gap: 4rpx;
min-width: 0;
- margin-bottom: -5rpx;
&.info-item-balance {
- flex: 0 0 auto;
+ flex: 1;
}
.info-label {
@@ -711,26 +708,15 @@ page {
font-weight: 700;
flex: 1;
line-height: 1.5;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
}
}
- }
-
- .operate {
- display: flex;
- gap: 16rpx;
- padding: 16rpx 24rpx 24rpx;
- background: #fff;
- justify-content: flex-end;
-
+
.btn-delete {
display: flex;
align-items: center;
justify-content: center;
gap: 6rpx;
- padding: 0 24rpx;
+ padding: 0 20rpx;
height: 64rpx;
border-radius: 12rpx;
font-size: 26rpx;
@@ -739,6 +725,7 @@ page {
background: rgba(245, 87, 108, 0.1);
color: #f5576c;
border: 1rpx solid rgba(245, 87, 108, 0.3);
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
diff --git a/src/pages/work/accounts/investTransferRecord/addEdit.vue b/src/pages/work/accounts/investTransferRecord/addEdit.vue
index 94c8154..7fb7f7a 100644
--- a/src/pages/work/accounts/investTransferRecord/addEdit.vue
+++ b/src/pages/work/accounts/investTransferRecord/addEdit.vue
@@ -115,6 +115,12 @@ const { form, queryFutruesStocksParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
flag.value = option.flag
+
+ // 接收从理财账户列表传递的参数
+ if (option.investAccountId) {
+ form.value.inAccountId = option.investAccountId
+ }
+
if(flag.value==null){
if(form.value.id!=null){
title.value="投资账户记账-修改"
@@ -131,7 +137,15 @@ onLoad((option) => {
})
function getData() {
listFutureStocks(queryFutruesStocksParams.value).then((response) => {
- futruesStocksList.value = [response.rows]
+ futruesStocksList.value = [response.rows]
+
+ // 如果有传递investAccountId参数,自动选中对应投资账户
+ if (form.value.inAccountId && response.rows.length > 0) {
+ const selectedAccount = response.rows.find(item => item.id === form.value.inAccountId)
+ if (selectedAccount) {
+ form.value.inAccountName = selectedAccount.nameDebitNameCode
+ }
+ }
})
// 类型
getDicts('in_out').then(res => {
diff --git a/src/pages/work/accounts/lendTransferRecord/addEdit.vue b/src/pages/work/accounts/lendTransferRecord/addEdit.vue
index 9428de6..33d54e9 100644
--- a/src/pages/work/accounts/lendTransferRecord/addEdit.vue
+++ b/src/pages/work/accounts/lendTransferRecord/addEdit.vue
@@ -163,6 +163,12 @@ const { form, queryOutAccountParams, queryInAccountParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
+
+ // 接收从借贷账户列表传递的参数
+ if (option.lendAccountId) {
+ form.value.outAccountId = option.lendAccountId
+ }
+
if(form.value.id!=null){
title.value="借贷账户记账-修改"
}else{
@@ -178,7 +184,15 @@ onLoad((option) => {
inAccountList.value = [response.rows]
})
listAccounts(queryOutAccountParams.value).then((response) => {
- outAccountList.value = [response.rows]
+ outAccountList.value = [response.rows]
+
+ // 如果有传递lendAccountId参数,自动选中对应借贷账户
+ if (form.value.outAccountId && response.rows.length > 0) {
+ const selectedAccount = response.rows.find(item => item.id === form.value.outAccountId)
+ if (selectedAccount) {
+ form.value.outAccountName = selectedAccount.nameCodeAvailableLimit
+ }
+ }
})
// 类型
getDicts('record_lend_type').then(res => {
diff --git a/src/pages/work/base/creditCard/list.vue b/src/pages/work/base/creditCard/list.vue
index e9691e0..d382497 100644
--- a/src/pages/work/base/creditCard/list.vue
+++ b/src/pages/work/base/creditCard/list.vue
@@ -84,6 +84,14 @@
调额记录
+
+
+ 还款
+
+
+
+ 交易
+
修改
@@ -279,6 +287,22 @@ function formatCardCode(code) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 构建URL参数:账户ID(信用卡ID)、账户类型(信用卡type=2)
+ let url = `/pages/work/accounts/accountDealRecord/addEdit?accountId=${item.id}&accountType=2`
+
+ uni.navigateTo({ url })
+ isShow.value = true
+ }
+
+ function handleRepay(item) {
+ // 跳转到信用卡还款页面,传递信用卡ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/creditTransferRecord/addEdit?creditCardId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -558,28 +582,48 @@ page {
.operate {
display: flex;
justify-content: flex-end;
- gap: 16rpx;
+ gap: 8rpx;
padding: 16rpx 24rpx 24rpx;
+ flex-wrap: nowrap;
+ .btn-deal,
+ .btn-repay,
.btn-limit,
.btn-edit,
.btn-delete {
display: flex;
align-items: center;
- gap: 6rpx;
- padding: 0 24rpx;
- height: 64rpx;
- border-radius: 12rpx;
- font-size: 26rpx;
+ justify-content: center;
+ gap: 4rpx;
+ padding: 0 14rpx;
+ height: 60rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
font-weight: 500;
border: 1rpx solid;
transition: all 0.3s ease;
+ white-space: nowrap;
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
}
}
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
+ .btn-repay {
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 2rpx solid #52c41a;
+ font-weight: 600;
+ }
+
.btn-limit {
background: rgba(250, 140, 22, 0.1);
color: #fa8c16;
diff --git a/src/pages/work/base/debitCard/list.vue b/src/pages/work/base/debitCard/list.vue
index 7d67728..8d1206e 100644
--- a/src/pages/work/base/debitCard/list.vue
+++ b/src/pages/work/base/debitCard/list.vue
@@ -84,10 +84,18 @@
-
+
调额记录
+
+
+ 转账
+
+
+
+ 交易
+
修改
@@ -285,6 +293,27 @@ function selectStatus(item) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 构建URL参数:账户ID、账户类型(储蓄卡type=1)、储蓄卡类型
+ let url = `/pages/work/accounts/accountDealRecord/addEdit?accountId=${item.id}&accountType=1`
+
+ // 传递储蓄卡类型参数
+ if (item.debitType) {
+ url += `&debitType=${item.debitType}`
+ }
+
+ uni.navigateTo({ url })
+ isShow.value = true
+ }
+
+ function handleTransfer(item) {
+ // 跳转到储蓄账户转账页面,传递储蓄账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/debitTransferRecord/addEdit?debitAccountId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -645,27 +674,46 @@ page {
display: flex;
justify-content: flex-end;
padding: 16rpx 24rpx 24rpx;
- gap: 16rpx;
+ gap: 8rpx;
+ flex-wrap: nowrap;
+ .btn-deal,
+ .btn-transfer,
.btn-edit,
.btn-limit,
.btn-delete {
display: flex;
align-items: center;
justify-content: center;
- gap: 6rpx;
- padding: 0 24rpx;
- height: 64rpx;
- border-radius: 12rpx;
- font-size: 26rpx;
+ gap: 4rpx;
+ padding: 0 14rpx;
+ height: 60rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
font-weight: 500;
transition: all 0.3s ease;
+ white-space: nowrap;
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
}
}
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
+ .btn-transfer {
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 2rpx solid #52c41a;
+ font-weight: 600;
+ }
+
.btn-edit {
background: rgba(102, 126, 234, 0.1);
color: #667eea;
diff --git a/src/pages/work/base/financials/list.vue b/src/pages/work/base/financials/list.vue
index 9758ae4..2d002e8 100644
--- a/src/pages/work/base/financials/list.vue
+++ b/src/pages/work/base/financials/list.vue
@@ -56,6 +56,14 @@
+
+
+ 账户记账
+
+
+
+ 投资交易
+
修改
@@ -220,6 +228,22 @@ function dictStr(val, arr) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 跳转到投资交易记录页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investAccountDeal/addEdit?accountId=${item.id}`
+ })
+ isShow.value = true
+ }
+
+ function handleRecord(item) {
+ // 跳转到投资账户记账页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investTransferRecord/addEdit?investAccountId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -415,26 +439,45 @@ page {
.operate {
display: flex;
justify-content: flex-end;
- gap: 16rpx;
+ gap: 8rpx;
padding: 16rpx 24rpx 24rpx;
+ flex-wrap: nowrap;
+ .btn-deal,
+ .btn-record,
.btn-edit,
.btn-delete {
display: flex;
align-items: center;
justify-content: center;
- gap: 6rpx;
- padding: 0 24rpx;
- height: 64rpx;
- border-radius: 12rpx;
- font-size: 26rpx;
+ gap: 4rpx;
+ padding: 0 14rpx;
+ height: 60rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
font-weight: 500;
transition: all 0.3s ease;
+ white-space: nowrap;
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
}
}
+
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
+ .btn-record {
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 2rpx solid #52c41a;
+ font-weight: 600;
+ }
.btn-edit {
background: rgba(102, 126, 234, 0.1);
diff --git a/src/pages/work/base/futures/list.vue b/src/pages/work/base/futures/list.vue
index a363f85..1d3b2d6 100644
--- a/src/pages/work/base/futures/list.vue
+++ b/src/pages/work/base/futures/list.vue
@@ -66,6 +66,14 @@
+
+
+ 账户记账
+
+
+
+ 投资交易
+
修改
@@ -220,6 +228,22 @@ function dictStr(val, arr) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 跳转到投资交易记录页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investAccountDeal/addEdit?accountId=${item.id}`
+ })
+ isShow.value = true
+ }
+
+ function handleRecord(item) {
+ // 跳转到投资账户记账页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investTransferRecord/addEdit?investAccountId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -422,26 +446,45 @@ page {
.operate {
display: flex;
justify-content: flex-end;
- gap: 16rpx;
+ gap: 8rpx;
padding: 16rpx 24rpx 24rpx;
+ flex-wrap: nowrap;
+ .btn-deal,
+ .btn-record,
.btn-edit,
.btn-delete {
display: flex;
align-items: center;
justify-content: center;
- gap: 6rpx;
- padding: 0 24rpx;
- height: 64rpx;
- border-radius: 12rpx;
- font-size: 26rpx;
+ gap: 4rpx;
+ padding: 0 14rpx;
+ height: 60rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
font-weight: 500;
transition: all 0.3s ease;
+ white-space: nowrap;
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
}
}
+
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
+ .btn-record {
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 2rpx solid #52c41a;
+ font-weight: 600;
+ }
.btn-edit {
background: rgba(102, 126, 234, 0.1);
diff --git a/src/pages/work/base/lend/list.vue b/src/pages/work/base/lend/list.vue
index eb4dcf5..7adca1f 100644
--- a/src/pages/work/base/lend/list.vue
+++ b/src/pages/work/base/lend/list.vue
@@ -63,6 +63,10 @@
+
+
+ 借贷记账
+
修改
@@ -244,6 +248,14 @@ function selectType(value) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 跳转到借贷账户记账页面,传递借贷账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/lendTransferRecord/addEdit?lendAccountId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -504,14 +516,16 @@ page {
display: flex;
justify-content: flex-end;
padding: 0 24rpx 24rpx;
- gap: 16rpx;
+ gap: 12rpx;
+ flex-wrap: wrap;
+ .btn-deal,
.btn-edit,
.btn-delete {
display: flex;
align-items: center;
gap: 6rpx;
- padding: 12rpx 24rpx;
+ padding: 12rpx 20rpx;
border-radius: 8rpx;
font-size: 26rpx;
transition: all 0.3s ease;
@@ -521,6 +535,13 @@ page {
}
}
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
.btn-edit {
background: rgba(102, 126, 234, 0.1);
color: #667eea;
diff --git a/src/pages/work/base/stocks/list.vue b/src/pages/work/base/stocks/list.vue
index 08fcee9..3f9601e 100644
--- a/src/pages/work/base/stocks/list.vue
+++ b/src/pages/work/base/stocks/list.vue
@@ -55,6 +55,14 @@
+
+
+ 账户记账
+
+
+
+ 投资交易
+
修改
@@ -209,6 +217,22 @@ function dictStr(val, arr) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 跳转到投资交易记录页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investAccountDeal/addEdit?accountId=${item.id}`
+ })
+ isShow.value = true
+ }
+
+ function handleRecord(item) {
+ // 跳转到投资账户记账页面,传递账户ID
+ uni.navigateTo({
+ url: `/pages/work/accounts/investTransferRecord/addEdit?investAccountId=${item.id}`
+ })
+ isShow.value = true
+ }
@@ -412,26 +436,45 @@ page {
.operate {
display: flex;
justify-content: flex-end;
- gap: 16rpx;
+ gap: 8rpx;
padding: 16rpx 24rpx 24rpx;
+ flex-wrap: nowrap;
+ .btn-deal,
+ .btn-record,
.btn-edit,
.btn-delete {
display: flex;
align-items: center;
justify-content: center;
- gap: 6rpx;
- padding: 0 24rpx;
- height: 64rpx;
- border-radius: 12rpx;
- font-size: 26rpx;
+ gap: 4rpx;
+ padding: 0 14rpx;
+ height: 60rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
font-weight: 500;
transition: all 0.3s ease;
+ white-space: nowrap;
+ flex-shrink: 0;
&:active {
transform: scale(0.95);
}
}
+
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
+ .btn-record {
+ background: rgba(82, 196, 26, 0.1);
+ color: #52c41a;
+ border: 2rpx solid #52c41a;
+ font-weight: 600;
+ }
.btn-edit {
background: rgba(102, 126, 234, 0.1);
diff --git a/src/pages/work/bill/creditCardBill/list.vue b/src/pages/work/bill/creditCardBill/list.vue
index 20d7417..aba719e 100644
--- a/src/pages/work/bill/creditCardBill/list.vue
+++ b/src/pages/work/bill/creditCardBill/list.vue
@@ -86,9 +86,14 @@
+
账单明细
+
+
+
+ 交易
@@ -290,6 +295,14 @@ function selectStatus(value) {
}
});
}
+
+ function handleAddDeal(item) {
+ // 构建URL参数:账户ID(信用卡ID)、账户类型(信用卡type=2)
+ let url = `/pages/work/accounts/accountDealRecord/addEdit?accountId=${item.creditCardId}&accountType=2`
+
+ uni.navigateTo({ url })
+ isShow.value = true
+ }
@@ -656,8 +669,10 @@ page {
display: flex;
justify-content: flex-end;
padding: 16rpx 24rpx 24rpx;
- gap: 16rpx;
+ gap: 12rpx;
+ flex-wrap: wrap;
+ .btn-deal,
.btn-detail,
.btn-edit,
.btn-delete {
@@ -665,7 +680,7 @@ page {
align-items: center;
justify-content: center;
gap: 6rpx;
- padding: 0 24rpx;
+ padding: 0 20rpx;
height: 64rpx;
border-radius: 12rpx;
font-size: 26rpx;
@@ -677,6 +692,13 @@ page {
}
}
+ .btn-deal {
+ background: rgba(24, 144, 255, 0.1);
+ color: #1890ff;
+ border: 2rpx solid #1890ff;
+ font-weight: 600;
+ }
+
.btn-detail {
background: rgba(82, 196, 26, 0.1);
color: #52c41a;