fix: 新功能增加,原有bug修复。

This commit is contained in:
tianyongbao
2024-06-21 20:30:02 +08:00
parent 7ce6161b01
commit c8b5697264
36 changed files with 5178 additions and 516 deletions

View File

@@ -0,0 +1,269 @@
<template>
<view class="container" style="paddingBottom:1rpx;">
<u-navbar
leftIconSize="40rpx"
leftIconColor="#333333"
title="人情账单"
>
</u-navbar>
<view class="section">
<view class="section-title">{{ title}}</view>
<view class="form-view">
<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
:labelStyle="{ color: '#333333', fontSize: '30rpx' }">
<u-form-item label="人情借贷" prop="onlineLendName" required @click="handleOnlineLend">
<u--input v-model="form.onlineLendName" disabled disabledColor="#ffffff" placeholder="请选择人情借贷"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="借款金额" prop="installmentAmount" required >
<u--input v-model="form.installmentAmount" placeholder="请填写借款金额"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="借款日期" prop="installmentDate" required @click="selectDate()">
<u--input v-model="form.installmentDate" disabled disabledColor="#ffffff" placeholder="请选择借款日期" inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="还款日期" prop="closeDate" >
<u--input v-model="form.closeDate" placeholder="请填写还款日期"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="结清状态" prop="settleStateName" required @click="handleShowTeam">
<u--input v-model="form.settleStateName" disabled disabledColor="#ffffff" placeholder="请选择结清状态"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="备注" prop="remark" labelPosition="top">
<u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
maxlength="20000" style="padding:18rpx 0;"></u--textarea>
</u-form-item>
</u--form>
<view class="form-btn">
<u-button type="primary" text="提交" @click="submit"></u-button>
</view>
</view>
</view>
<u-toast ref="uToast"></u-toast>
<u-picker itemHeight="88" :show="showTeam" :columns="settleStateList" keyName="dictLabel" @cancel="handleCancel"
@confirm="handleConfirm"></u-picker>
<u-datetime-picker
:show="datePickShow"
mode="date"
ref="createTimeRef"
@cancel="datePickShow=false"
@confirm="datePickConfirm"
itemHeight="88"
></u-datetime-picker>
<u-datetime-picker
:show="closeDatePickShow"
mode="date"
ref="closeTimeRef"
@cancel="closeDatePickShow=false"
@confirm="closeDatePickConfirm"
itemHeight="88"
></u-datetime-picker>
<u-picker itemHeight="88" :show="showOnlineLend" :columns="bankCardLendList" keyName="nameCode" @cancel="handleOnlineLendCancel"
@confirm="handleOnlineLendConfirm"></u-picker>
</view>
</template>
<script setup>
import {
getInstallmentHistory,
addInstallmentHistory,
updateInstallmentHistory
} from '@/api/invest/installmentHistory'
import { getDicts } from '@/api/system/dict/data.js'
import { listBankcardLend } from '@/api/invest/bankcardlend'
const { proxy } = getCurrentInstance()
import dayjs from 'dayjs'
import {onLoad,onReady} from "@dcloudio/uni-app";
// 计算属性与监听属性是在vue中而非uniap中 需要注意!!!
import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
const datePickShow = ref(false)
const showTeam = ref(false)
const showOnlineLend = ref(false)
const title = ref("人情账单")
const bankCardLendList = ref([])
const settleStateList = ref([])
const data = reactive({
form: {
id: null,
name: null,
type: '4',
code: null,
balance: null,
bankCardLendId: null,
installmentAmount: null,
installmentDate: null,
period: null,
repaidPeriod: null,
totalInterest: null,
interestRate: null,
dueDate: null,
closeDate: null,
state: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
delFlag: null,
remark: null
},
queryBankCardLendParams: {
pageNum: 1,
type: '3',
lendType: '2',
pageSize: 1000
},
rules: {
onlineLendName: [{ type: 'string', required: true, message: '人情借贷不能为空', trigger: ['change', 'blur'] }],
billDate: [{ type: 'string', required: true, message: '借款日期不能为空', trigger: ['change', 'blur'] }],
settleStateName: [{ type: 'string', required: true, message: '结清状态不能为空', trigger: ['change', 'blur'] }],
installmentAmount: [{ type: 'float', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }]
}
})
const { form, queryBankCardLendParams, rules} = toRefs(data)
onLoad((option) => {
form.value.id = option.id
if(form.value.id!=null){
title.value="人情账单-修改"
}else{
title.value="人情账单-新增"
}
getDict()
})
onReady(() => {
form.value.installmentDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
})
function getDict() {
// 账单状态
getDicts('settle_state').then(res => {
settleStateList.value =[res.data]
})
listBankcardLend(queryBankCardLendParams.value).then((response) => {
bankCardLendList.value = [response.rows]
})
if(form.value.id!=null){
getInstallmentHistory(form.value.id).then(res => {
form.value = res.data
form.value.onlineLendName = res.data.bankName
// 类型
getDicts('settle_state').then(result => {
form.value.settleStateName=dictStr(form.value.state, result.data)
})
})
}
}
function dictStr(val, arr) {
let str = ''
arr.map(item => {
if (item.dictValue === val) {
str = item.dictLabel
}
})
return str
}
function handleShowTeam() {
if (settleStateList.value[0].length === 0) {
proxy.$refs['uToast'].show({
message: '结清状态为空 ', type: 'warning'
})
} else {
showTeam.value = true
}
}
function handleConfirm(e) {
form.value.settleStateName = e.value[0].dictLabel
form.value.state = e.value[0].dictValue
showTeam.value = false
}
function handleCancel() {
showTeam.value = false
}
function handleOnlineLend() {
if (bankCardLendList.value[0].length === 0) {
proxy.$refs['uToast'].show({
message: '人情借贷为空 ', type: 'warning'
})
} else {
showOnlineLend.value = true
}
}
function handleOnlineLendConfirm(e) {
form.value.onlineLendName = e.value[0].nameCode
form.value.bankCardLendId= e.value[0].id
showOnlineLend.value = false
}
function handleOnlineLendCancel() {
showOnlineLend.value = false
}
function selectDate() {
datePickShow.value = true
proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
}
function datePickConfirm(e) {
form.value.installmentDate = dayjs(e.value).format("YYYY-MM-DD")
datePickShow.value = false
}
function selectCloseDate() {
closeDatePickShow.value = true
proxy.$refs['closeTimeRef'].innerValue = new Date().getTime()
}
function closeDatePickConfirm(e) {
form.value.closeDate = dayjs(e.value).format("YYYY-MM-DD")
closeDatePickShow.value = false
}
function submit() {
proxy.$refs['uForm'].validate().then(() => {
if (form.value.id != null) {
updateInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '修改成功', complete() {
uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
}
})
})
}else {
addInstallmentHistory(form.value).then(res => {
proxy.$refs['uToast'].show({
message: '新增成功', complete() {
uni.navigateTo({ url: `/pages/work/bill/onlineLendHistory//list` })
}
})
})
}
})
}
</script>
<style lang="scss" scoped>
.section {
margin: 24rpx;
padding: 16rpx 24rpx;
background-color: #fff;
border-radius: 8rpx;
.section-title {
width: 360rpx;
color: #333333;
line-height: 44rpx;
font-size: 30rpx;
border-left: 6rpx solid #2681FF;
padding-left: 26rpx;
}
.form-view {
padding: 20rpx 0rpx 0 10rpx;
.form-btn {
padding-top: 20rpx;
}
}
}
</style>

View File

@@ -0,0 +1,419 @@
<template>
<view class="container">
<u-sticky offsetTop="8rpx" customNavHeight="8rpx">
<view class="search-view">
<u-input v-model="queryParams.onlineLendName" border="false" type="select" @click="handleOnlineLend" placeholder="请选择人情借贷" suffixIcon="search"
suffixIconStyle="color: #909399" class="search-input">
</u-input>
<u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
<u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
<u-transition :show="filterPanel" mode="fade">
<view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
<view class="filter-panel-content">
<view class="filter-title">结清状态</view>
<view class="state-list">
<view v-for="item in settleStateList" :key="item.id" class="state-item"
:class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
</view>
</view>
<view class="btn-box">
<u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
<u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
</view>
</view>
</u-transition>
</view>
</u-sticky>
<u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
<u-list-item v-for="(item, index) in listData" :key="index">
<view class="list-item">
<view class="item-header" @click="enterDetails(item)">
<u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
:text="item.bankNameCode" size="30rpx" color="#333333" :bold="true"></u--text>
</view>
<view class="item-row">
<text class="row-label">借款金额</text>
<text class="row-value">{{ item.installmentAmount }}</text>
</view>
<view class="item-row">
<text class="row-label">结清状态</text>
<text class="row-value">{{ dictStr(item.state, settleStateList) }}</text>
</view>
<view class="item-row">
<text class="row-label">借款日期</text>
<text class="row-value">{{ item.installmentDate }}</text>
</view>
<view class="item-row">
<text class="row-label">还款日期</text>
<text class="row-value">{{ item.closeDate }}</text>
</view>
<view class="item-row">
<text class="row-label">备注</text>
<text class="row-value">{{ item.remark }}</text>
</view>
<view class="operate" >
<view class="btn filling" @click="handleEdit(item)">修改</view>
<view class="btn filling" @click="handleDelete(item)">删除</view>
</view>
</view>
</u-list-item>
<view>
</view>
<u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
</u-list>
<u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
@confirm="settingConfirm" @cancel="settingCancel"></u-picker>
<u-picker itemHeight="88" :show="showOnlineLend" :columns="bankCardLendList" keyName="nameCode" @cancel="handleOnlineLendCancel"
@confirm="handleOnlineLendConfirm"></u-picker>
</view>
</template>
<script setup>
import {
listInstallmentHistory,
delInstallmentHistory
} from '@/api/invest/installmentHistory'
import { getDicts } from '@/api/system/dict/data.js'
import { listBankcardLend } from '@/api/invest/bankcardlend'
import {onLoad,onShow} from "@dcloudio/uni-app";
// 计算属性与监听属性是在vue中而非uniap中 需要注意!!!
import {reactive ,toRefs,ref,computed }from "vue";
const pageNum = ref(1)
const listData = ref([])
const isShow = ref(false)
const status = ref('loadmore')
const settleStateList = ref([])
const settingPickShow = ref(false)
const settingColumns = ref([])
const showOnlineLend = ref(false)
const bankCardLendList = ref([])
const data = reactive({
filterPanel: false,
queryBankCardLendParams: {
pageNum: 1,
type: '3',
lendType: '2',
pageSize: 100
},
queryParams: {
name: null,
type: '4',
bankCardLendId: null,
state: '0'
}
})
const { filterPanel, queryBankCardLendParams, queryParams} = toRefs(data)
const windowHeight = computed(() => {
uni.getSystemInfoSync().windowHeight - 50
})
onLoad(() => {
getDict()
getList()
});
onShow(() => {
if (isShow.value) {
getList()
isShow.value = false
}
});
function loadmore() {
pageNum.value += 1
if (status.value == 'loadmore') {
getList()
}
}
function getList() {
status.value = 'loading'
listInstallmentHistory({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
listData.value = listData.value.concat(res.rows)
if (listData.value.length < res.total) {
status.value = 'loadmore'
} else {
status.value = 'nomore'
}
}).catch(() => {
status.value = 'nomore'
})
}
function getDict() {
listBankcardLend(queryBankCardLendParams.value).then((response) => {
bankCardLendList.value = [response.rows]
})
// 账单状态
getDicts('settle_state').then(res => {
settleStateList.value = res.data
})
}
function settingConfirm(e) {
queryParams.value.settingId = e.value[0].settingId
queryParams.value.settingName = e.value[0].settingName
settingPickShow.value = false
}
function settingCancel() {
settingPickShow.value = false
}
function dictStr(val, arr) {
let str = ''
arr.map(item => {
if (item.dictValue === val) {
str = item.dictLabel
}
})
return str
}
function selectStatus(item) {
queryParams.value.state = item.dictValue
settleStateList.value.map(ele => {
if (ele.dictValue == item.dictValue) {
ele.selected = true
Reflect.set(ele, 'selected', true)
} else {
Reflect.set(ele, 'selected', false)
}
})
}
function handleOnlineLend() {
if (bankCardLendList.value[0].length === 0) {
proxy.$refs['uToast'].show({
message: '人情借贷为空 ', type: 'warning'
})
} else {
showOnlineLend.value = true
}
}
function handleOnlineLendConfirm(e) {
queryParams.value.onlineLendName = e.value[0].nameCode
queryParams.value.bankCardLendId= e.value[0].id
showOnlineLend.value = false
pageNum.value = 1
listData.value = []
getList()
}
function handleOnlineLendCancel() {
showOnlineLend.value = false
}
function searchSubmit() {
pageNum.value = 1
listData.value = []
getList()
filterPanel.value = false
}
function searchBlur() {
pageNum.value = 1
listData.value = []
getList()
}
function resetQuery() {
queryParams.value.bankCardLendId = '',
queryParams.value.state= '0',
queryParams.value.type = '4'
settleStateList.value.map(ele => {
Reflect.set(ele, 'selected', false)
})
}
function enterDetails(item) {
uni.navigateTo({ url: `/pages/work/bill/peopleLendHistory/addEdit?id=${item.id}` })
}
function handleEdit(item) {
uni.navigateTo({ url: `/pages/work/bill/peopleLendHistory/addEdit?id=${item.id}` })
isShow.value = true
}
function handleAdd() {
uni.navigateTo({ url: `/pages/work/bill/peopleLendHistory/addEdit` })
isShow.value = true
}
function handleDelete(item) {
uni.showModal({
title: '提示',
content: '你确定要删除吗',
success: function (res) {
if (res.confirm) {
delInstallmentHistory(item.id)
uni.navigateTo({ url: `/pages/work/bill/peopleLendHistory/list` })
} else if (res.cancel) {
console.log('取消');
}
}
});
}
</script>
<style lang="scss" scoped>
.btnAdd {
width: 146rpx;
height: 56rpx;
line-height: 56rpx;
border-radius: 8rpx;
display:float;
text-align: center;
}
.search-view {
padding: 12rpx 32rpx;
background-color: #ffffff;
display: flex;
justify-content: space-between;
align-items: center;
position: relative;
margin-bottom: 24rpx;
.search-input {
background: #F5F5F5;
color: #333333;
margin-right: 36rpx;
}
.filter-panel {
width: 100%;
position: absolute;
left: 0;
top: 96rpx;
background-color: rgba(0, 0, 0, 0.5);
.filter-panel-content {
background-color: #ffff;
padding: 0 30rpx 30rpx;
.filter-title {
color: #000000;
font-size: 30rpx;
font-weight: 500;
padding: 30rpx 0;
}
.state-list {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
.state-item {
width: 210rpx;
height: 72rpx;
border: 1rpx solid rgba(0, 0, 0, 0.25);
border-radius: 72rpx;
text-align: center;
line-height: 72rpx;
margin: 0 20rpx 20rpx 0;
font-size: 28rpx;
color: #000000;
}
.active {
background-color: rgba(222, 241, 255, 1);
border: 1rpx solid rgba(22, 119, 255, 1);
}
}
}
.btn-box {
display: flex;
padding: 24rpx 30rpx;
background-color: #fff;
box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
}
}
}
.list-item {
margin: 0 24rpx 24rpx;
padding: 32rpx;
background-color: #fff;
.item-header {
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 16rpx;
.status {
.status-item {
width: 120rpx;
height: 44rpx;
text-align: center;
line-height: 44rpx;
border-radius: 4rpx;
font-size: 24rpx;
}
.status1 {
background: #F0F0F0;
color: #8C8C8C;
}
.status2 {
background: rgba(38, 129, 255, 0.2);
color: #2681FF;
}
.status3 {
background: #F7F7F7;
color: #2681FF;
}
.status4 {
background: rgba(255, 85, 51, 0.2);
color: #FF5533;
}
.status5 {
background: #F7F7F7;
color: rgba(0, 0, 0, 0.85);
}
.status7 {
background: rgba(255, 129, 51, 0.2);
color: #FF8133;
}
.status8 {
background: rgba(65, 217, 165, 0.2);
color: #41D9A5;
}
}
}
.item-row {
padding: 16rpx 0;
.row-label {
color: rgba(0, 0, 0, 0.55);
}
.row-value {
color: rgba(0, 0, 0, 0.85)
}
}
.operate {
display: flex;
justify-content: flex-end;
.btn {
width: 146rpx;
height: 56rpx;
line-height: 56rpx;
border-radius: 8rpx;
margin-left: 5rpx;
text-align: center;
}
.circulation {
background: rgba(0, 0, 0, 0.04);
margin-right: 24rpx;
color: rgba(0, 0, 0, 0.85);
}
.filling {
background: #2681FF;
border-radius: 8rpx;
color: #FFFFFF;
}
}
}
</style>