diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 287d27156..bfc7f984a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -932,6 +932,12 @@ "navigationBarTitleText": "缴费详情" } }, + { + "path": "pages/EducationalAdministration/StuInfoFresh/PayFee/payInvioce", + "style": { + "navigationBarTitleText": "发票查看" + } + }, //扫码报到 { "path": "pages/WelcomNewStudents/ConfirmStudentsCheckIn/list", @@ -1047,7 +1053,7 @@ "path" : "pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/list", "style" : { - "navigationBarTitleText": "老生缴费", + "navigationBarTitleText": "老生缴费管理", "enablePullDownRefresh": false } @@ -1056,7 +1062,7 @@ "path" : "pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single", "style" : { - "navigationBarTitleText": "老生缴费", + "navigationBarTitleText": "缴费详情", "enablePullDownRefresh": false } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/payInvioce.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/payInvioce.vue index 61b806f75..72fb2501f 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/payInvioce.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/payInvioce.vue @@ -44,6 +44,7 @@ setTimeout(()=>{ this.TOAST("暂无发票信息") },100) + return } this.menuOptions = success this.activeId = this.menuOptions[0].Id diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue index 90d332d81..db777e1ae 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue @@ -16,14 +16,6 @@ - @@ -40,7 +32,7 @@ --> - + 生成二维码 @@ -110,6 +102,7 @@ export default{ fieldsData:[ {type:'label',field:'ChargeItemName',name:'缴费项目'}, {type:'label',field:'Standard',name:'收费标准'}, + // {type:'label',field:'copy_SJAmount',name:'本次应缴'}, {type:'input',field:'SJAmount',name:'本次实缴',edit:true}, ] }, @@ -156,13 +149,18 @@ export default{ this.TOAST("未查询到该学生收费标准！请先维护收费标准。"); return; } - this.FinaChargesStandardList = res.FinaChargesStandardList + this.FinaChargesStandardList = res.FinaChargesStandardList.map((item)=>{ + item.copy_SJAmount = item.SJAmount + return item + }) this.StuInfoFreshData = res.StuInfoFreshData this.PayFeeTotal = res.PayFeeTotal - if(Number(this.PayFeeTotal)>0){ + this.getpayfeetotal() + if(Number(this.payfeetotal)>0){ this.canPay = true }else{ - this.TOAST("缴费已经完成") + this.changeIpnutEdit(false) + this.TOAST("缴费已完成") } this.YJAmount = res.YJAmount this.ready = true @@ -212,9 +210,9 @@ export default{ let list = [],detail="",isNull=false; this.FinaChargesStandardList.forEach(item=>{ let value = 0 - if(/^-?\d+(,\d{3})*(\.\d{1,2})?$/.test(item.SJAmount)){ + if(/^-?\d+(,\d{3})*(\.\d{1,2})?$/.test(item.SJAmount)&&Number(item.SJAmount)<=Number(item.copy_SJAmount)&&Number(item.SJAmount)>=0){ value = Number(item.SJAmount) - }else{ + }else{ isNull=true } detail += item.ChargeItemCode + "!" + value + '&'; @@ -228,23 +226,27 @@ export default{ list.push(entity) }) if (isNull) { - this.TOAST("收费项目金额为空或错误！请检查并填写。"); + this.TOAST("[本次实缴]金额为空或错误！请检查并填写。"); return; } + if(Number(this.payfeetotal) == 0){ + this.TOAST("[实缴合计]不能为0！缴费失败。"); + return; + } detail = detail.substring(0, detail.length - 1); var param = {}; - //param.LoanMoney = $('#LoanMoney').val(); param.PayFeeDetail = detail; param.PayMoney = this.payfeetotal; - this.LOADING('正在生成付款信息请稍等…'); + let postData = { strEntity: JSON.stringify(param), detailList: JSON.stringify(list) } console.log({ strEntity: param, detailList: list }); - this.HTTP_POST('/learun/payfee/generateqrcode?keyValue=' + this.pageInfo.Id, { strEntity: JSON.stringify(param), detailList: JSON.stringify(list) }).then((res)=> { + this.changeIpnutEdit(false) + this.LOADING('正在生成付款信息请稍等…'); + this.HTTP_POST('/learun/payfee/generateqrcode?keyValue=' + this.pageInfo.Id, postData ).then((res)=> { this.HIDE_LOADING(); if(!res){ return } this.qrCodeUrl = this.CONFIG("webHost")+res.imgUrl - // $('#qrcodeImg').attr('src', res.info); }); } if(action == "getPayRes"){ @@ -260,7 +262,6 @@ export default{ this.NAV_TO("./payInvioce?keyValue="+this.pageInfo.Id) }, getpayfeetotal(){ - this.qrCodeUrl = "" let value = 0 this.FinaChargesStandardList.map(item=>{ if(/^-?\d+(,\d{3})*(\.\d{1,2})?$/.test(item.SJAmount)){ @@ -268,7 +269,17 @@ export default{ } }) this.payfeetotal = value - } + }, + changeIpnutEdit(edit){ + let item = JSON.parse(JSON.stringify(this.item)) + item.fieldsData = item.fieldsData.map((item1)=>{ + if(["SJAmount"].includes(item1.field)){ + item1.edit = edit + } + return item1 + }) + this.item = item + }, }, created() { this.init() diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue index 7e8f1dfb6..22c57f0b1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue @@ -3,7 +3,7 @@ - {{ tips }} + {{ tips }} @@ -20,31 +20,30 @@ {{ item.StuName }} - + - - + --> + - 线上缴费状态： - {{ item.PayFeeStatus == "1" ? "已缴费" : "未缴费" }} + 性别： + {{ displayListItem(item, 'GenderNo') }} - 贷款回执码： - {{ item.StudentLoan }} + 缴费状态： + {{ displayListItem(item, 'PayFeeStatus') }} - + - 助学贷款状态： - {{ item.StudentLoanStatus == "1" ? "已审核" : "未审核" }} - - - - 现场缴费状态： - {{ displayListItem(item, 'OnsitePayFeeStatus') }} + 开票状态： + {{ displayListItem(item, 'IsInvoice') }} + + @@ -101,10 +100,17 @@ export default { dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, - OnsitePayFeeStatus: { - type: 'select', - itemCode: 'MeasureTime', - dataSource: '0' + GenderNo:{ + type: 'dataItem', + dataType: 'dataDictionary' + }, + PayFeeStatus:{ + type: 'dataItem', + dataType: 'dataDictionary' + }, + IsInvoice:{ + type: 'dataItem', + dataType: 'dataDictionary' } }, @@ -113,11 +119,15 @@ export default { StuNo: '', StuName: '' }, + + user:null, // 数据源 dataSource: { ClassNo: [], - OnsitePayFeeStatus: Object.values(this.GET_GLOBAL('dataDictionary').OnsitePayStatus).map(t => ({ value: t.value, text: t.text })) + GenderNo: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })), + PayFeeStatus:Object.values(this.GET_GLOBAL('dataDictionary').PayStatus).map(t => ({ value: t.value, text: t.text })), + IsInvoice:Object.values(this.GET_GLOBAL('dataDictionary').InvoiceStatus).map(t => ({ value: t.value, text: t.text })), }, // 页面相关参数 @@ -145,6 +155,8 @@ export default { // 页面初始化 async init() { this.ON('stuInfoFreshPayFee', this.refreshList); + this.user = this.GET_GLOBAL('loginUser'); + this.queryData.StuNo = this.user.account // 拉取加载列表和数据源 await Promise.all([ @@ -162,11 +174,11 @@ export default { this.defaultQueryData = this.COPY(this.queryData); this.ready = true; }, - tapLi(data) { - this.NAV_TO('./single', data, true); + tapLi({ID}) { + this.NAV_TO('./single', {ID}, true); }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return; } @@ -180,12 +192,11 @@ export default { queryJson: JSON.stringify(this.queryData) }; this.LOADING('加载数据中…'); - await this.HTTP_GET('StuInfoFresh/pageList', _postParam,'加载数据时出错').then(res => { + await this.HTTP_GET('/learun/freshpayfee/getpayfeelist', _postParam,'加载数据时出错').then(res => { this.HIDE_LOADING(); - // console.log(res) this.total = res.total; this.page = res.page + 1; - this.list = this.list.concat(res.rows); + this.list = isConcat?this.list.concat(res.rows):res.rows; this.tips = `已加载 ${Math.min(res.page, res.total)} / ${res.total} 页，共 ${res.records} 项`; this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多'; @@ -193,12 +204,12 @@ export default { }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1; this.total = 2; this.list = []; - await this.fetchList(); + await this.fetchList(isConcat); }, // 列表下拉 @@ -211,7 +222,7 @@ export default { // 设置搜索条件 async searchChange() { this.sideOpen = false - await this.refreshList(); + await this.refreshList(false); }, // 显示列表中的标题项 @@ -228,6 +239,10 @@ export default { case 'select': const selectItem = this.dataSource[field].find(t => t.value === String(value)); return get(selectItem, 'text', ''); + + case 'dataItem': + const sex = this.dataSource[field].find(t => t.value === String(value)); + return get(sex, 'text', ''); case 'checkbox': if (!value || value.split(',').length <= 0) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/payInvioce.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/payInvioce.vue new file mode 100644 index 000000000..97815abb2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/payInvioce.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue index 972c5ea0f..22d70c75e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue @@ -1,6 +1,29 @@