c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
zhengziru
2024-07-26 13:45:13 +08:00
parent fc673e5e4e
commit eefb76c781
49 changed files with 140 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/mobile/member/union_Audit.html
+2 -2
View File
@@ -7,12 +7,12 @@ layout("/mobile/platform.html"){
@click-left="history.back()"></van-nav-bar>
<member-menber-info ref="info" :id="id" title="院级工会审核" :handle="handle">
<member-menber-info ref="info" :id="id" title="分工会审核" :handle="handle">
<template #handle>
<div class="van-cell-group__title mt20">
<div class="van-sidebar-item van-sidebar-item--select">
院级工会审核
分工会审核
</div>
</div>
<van-form>
src/main/resources/views/mobile/question/answer_ctgu.html
+11 -5
View File
@@ -209,18 +209,24 @@ layout("/mobile/platform.html"){
const radios = this.issueList.filter(v => v.itx === 1 && v.iisdx)
const checkBoxes = this.issueList.filter(v => v.itx === 1 && !v.iisdx)
const radioScore = radios ? radios[0].fraction : 0
const checkBoxesScore = checkBoxes ? checkBoxes[0].fraction : 0
const radioScore = radios && radios.length > 0 ? radios[0].fraction : 0
const checkBoxesScore = checkBoxes && checkBoxes.length > 0 ? checkBoxes[0].fraction : 0
const radioScoreSum = radios.map(v => v.fraction ? v.fraction : 0).reduce((a, b) => a + b, 0)
const checkBoxesScoreSum = checkBoxes.map(v => v.fraction ? v.fraction : 0).reduce((a, b) => a + b, 0)
const sumScore = radioScoreSum + checkBoxesScoreSum
const countNum = radios.length + checkBoxes.length
let radiosText = ''
let checkBoxesText = ''
// return "说明：单选题" + radios.length + "题，每题" + radioScore + "分，合计" + radioScoreSum + "分；多选题" + checkBoxes.length + "题，每题" + checkBoxesScore + "分，合计" + checkBoxesScoreSum + "分；总分" + sumScore + "分。"
return "说明：单选题" + radios.length + "题；多选题" + checkBoxes.length + "题；合计：" + countNum + "题。"
if (radios && radios.length > 0) {
radiosText = "单选题" + radios.length + "题，每题" + radioScore + "分，合计" + radioScoreSum + "分；"
}
if (checkBoxes && checkBoxes.length > 0) {
checkBoxesText = "多选题" + checkBoxes.length + "题，每题" + checkBoxesScore + "分，合计" + checkBoxesScoreSum + "分；总分" + sumScore + "分。"
}
return "说明：" + radiosText + checkBoxesText
},
src/main/resources/views/platform/healthCheckup/projectMange.html
+1 -1
View File
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
查看
</el-dropdown-item>
<el-dropdown-item v-if="row.isWithinChoiceTime && !row.isHasUserList"
:command="{type:'create',data:row}">
:command="{type:'created',data:row}">
生成名单
</el-dropdown-item>
<el-dropdown-item v-if="row.isWithinChoiceTime && row.isHasUserList"
src/main/resources/views/platform/jf/Funds/apply.html
+1 -1
View File
@@ -346,7 +346,7 @@ layout("/layouts/platform.html"){
address: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activity_card_name: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activity_card_number: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
}
},
src/main/resources/views/platform/jf/activitybx/apply.html
+2 -2
View File
@@ -327,7 +327,7 @@ layout("/layouts/platform.html"){
activity_type: [{required: true, message: '必填', trigger: ['blur', 'change']}],
time: [{required: true, message: '必填', trigger: ['blur', 'change']}],
projectTypeCode: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
billFiles: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
activity: []
@@ -337,7 +337,7 @@ layout("/layouts/platform.html"){
'search': httpVueLoader('/components/activityBx/ActivityBxSearch.vue'),
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue?v=' + new Date().getTime()),
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0')
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1')
},
methods: {
async remoteMethod(query) {
src/main/resources/views/platform/jf/bxFundsLayout/division.html
+1 -1
View File
@@ -123,7 +123,7 @@
</template>
<template #edit>
<activity-bx-info ref="act_info2" :handle="true" label="院级工会审核" :panes="[2]">
<activity-bx-info ref="act_info2" :handle="true" label="分工会审核" :panes="[2]">
<template #handle>
<el-form :model="formData" ref="form" :rules="formRules" label-position="right"
style="padding: 20px 0"
src/main/resources/views/platform/member/apply/audit/Layout.html
+1 -1
View File
@@ -176,7 +176,7 @@
<el-tab-pane label="个人信息" name="info">
<member ref="memberInfo" :id="info.userId" view></member>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="union">
<el-tab-pane label="分工会审核" name="union">
<el-form :model="formData" ref="form" :rules="formRules"
label-width="120px" label-suffix="：">
src/main/resources/views/platform/member/apply/index.html
+1 -1
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
label-position="right" label-suffix="："
label-width="120px">
<el-form>
<el-form-item label="院级工会审核信息&emsp;"
<el-form-item label="分工会审核信息&emsp;"
label-width="180px"
class="view-header">
</el-form-item>
src/main/resources/views/platform/member/change/audit/Layout.html
+1 -1
View File
@@ -200,7 +200,7 @@
<mem-change-records :userid="info.userId"></mem-change-records>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="union">
<el-tab-pane label="分工会审核" name="union">
<el-form :model="formData" ref="form" :rules="formRules"
label-width="120px" label-suffix="：">
src/main/resources/views/platform/member/check/school.html
+1 -1
View File
@@ -436,7 +436,7 @@ layout("/layouts/platform.html"){
components: {
'member': httpVueLoader('/components/member/MemberInfo.vue?v=' + new Date().getTime()),
'mem-change-records': httpVueLoader('/components/member/MemChangeRecords.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/userChangeHistory.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/UserChangeHistory.vue?v=' + new Date().getTime()),
},
data() {
return {
src/main/resources/views/platform/member/check/union.html
+1 -1
View File
@@ -310,7 +310,7 @@ layout("/layouts/platform.html"){
components: {
'mem-change-apply': httpVueLoader('/components/member/MemChangeApply.vue?v=' + new Date().getTime()),
'member-user-select': httpVueLoader('/components/plugins/MemberUserTableSelect.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/userChangeHistory.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/UserChangeHistory.vue?v=' + new Date().getTime()),
},
computed: {
allowOperationTask() {
src/main/resources/views/platform/memberCost/payment/summary.html
+1
View File
@@ -311,6 +311,7 @@ layout("/layouts/platform.html"){
'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0'),
},
methods: {
sendPaymentMsgAll(){},
async sendPaymentMsg(row){
const confirm = await this.$confirm("您确定对【"+ row.username +"】会员进行催缴吗?", '提示', {
confirmButtonText: '确定',
src/main/resources/views/platform/sys/login.html
+57 -32
View File
@@ -127,6 +127,18 @@
color: black;
}
.login-code{
display: inline-block;
float: right;
width: 38%;
height: 38px;
}
.login-code img{
vertical-align: middle;
cursor: pointer;
}
</style>
</head>
@@ -160,31 +172,49 @@
<h4 class="login-content-title ml15">
${AppName!}系统登录
</h4>
<el-tabs class="login-tabs">
<!--<el-tab-pane label="用户名登录" name="1">
<el-tabs class="login-tabs" v-model="activeName">
<el-tab-pane label="用户名登录" name="1">
<el-form v-if="activeName == '1'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
<el-form-item prop="username">
<el-input
placeholder="请输入用户名"
placeholder="账号或手机号码"
prefix-icon="el-icon-user"
type="text"
v-model="loginForm.username">
v-model="loginForm.username"
>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
@keyup.enter.native="doLogin"
placeholder="请输入密码"
placeholder="密码"
prefix-icon="el-icon-lock"
type="password"
v-model="loginForm.password">
v-model="loginForm.password"
>
</el-input>
</el-form-item>
<el-form-item prop="platformCaptcha">
<el-input
@keyup.enter.native="doLogin"
placeholder="验证码"
prefix-icon="el-icon-lock"
style="width: 60%"
type="password"
v-model="loginForm.platformCaptcha"
>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCodeUsername" alt="">
</div>
</el-form-item>
<el-form-item>
<el-button :disabled="disabled"
:loading="loading"
@click.native.prevent="handleLogin"
@click.native.prevent="doLogin"
class="login-button"
type="primary">
<span v-if="!loading">登 录</span>
@@ -192,9 +222,9 @@
</el-button>
</el-form-item>
</el-form>
</el-tab-pane>-->
<el-tab-pane label="短信快捷登陆">
<el-form :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
</el-tab-pane>
<el-tab-pane label="短信快捷登陆" name="2">
<el-form v-if="activeName == '2'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
<el-form-item prop="mobile">
<el-input
@@ -258,6 +288,7 @@
timer: null,
// 是否显示滑块验证
isShowSliderVerify: false,
activeName: '1',
loginForm: {
username: '',
password: '',
@@ -285,6 +316,7 @@
},
loading: false,
disabled: false,
codeUrl: "${base!}/platform/login/captcha",
}
},
components: {
@@ -389,7 +421,11 @@
async doLogin() {
const valid = await this.$refs['loginForm'].validate()
if (valid) {
this.loginForm.loginType = 'SMS_CODE'
if (this.activeName === '2'){
this.loginForm.loginType = 'SMS_CODE'
} else {
this.loginForm.loginType = null
}
const resp = await $.post('${base!}/platform/login/doLogin', this.loginForm)
if (resp.code === 0) {
this.$message.success(resp.msg)
@@ -408,26 +444,6 @@
this.isShowSliderVerify = false;
}
}
/*$.post(url, self.loginForm, function (d) {
if (d.code == 0) {
self.$refs.sliderVerify.verifySuccessEvent();
self.$message({
showClose: true,
type: 'success',
message: '登录成功，正在跳转首页...',
duration: 1000
});
setTimeout(() => {
window.location.href = "${base!}/platform/home"
}, 500);
} else {
self.$message({
message: d.msg,
type: 'error'
})
self.isShowSliderVerify = false;
}
}, "json");*/
},
getQueryString(name) {
const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
@@ -451,10 +467,19 @@
isMobile = true;
}
return isMobile;
},
async getCodeUsername() {
const {data} = await $.get('/platform/login/captcha')
this.codeUrl = data.codeUrl
this.loginForm.platformKey = data.key
}
},
created() {
async created() {
this.year = new Date().getFullYear()
if (this.activeName === '1'){
await this.getCodeUsername()
}
},
mounted() {
window.addEventListener('pageshow', (event) => {