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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-09-18 10:01:59 +08:00
parent d377676758
commit b05de4830c
113 changed files with 2305 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+1 -1
View File
@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
return age >= 0 ? age : '未出生';
},
openEdit(row) {
window.location.href = '/platform/childManage/write/index?bizId=' + row.id + '&manage=1'
commonUtil.pjaxPush('/platform/childManage/write/index?bizId=' + row.id + '&manage=1')
},
doDelete(id) {
this.$confirm("您确定要删除吗？", "提示", {
src/main/resources/views/platform/zhgh/staffmanage/childManage/mine/index.html
+1 -1
View File
@@ -119,7 +119,7 @@ layout("/layouts/platform.html"){
return age >= 0 ? age : '未出生';
},
openEdit(row) {
window.location.href = '/platform/childManage/write/index?bizId=' + row.id
commonUtil.pjaxPush('/platform/childManage/write/index?bizId=' + row.id)
},
doDelete(id) {
this.$confirm("您确定要删除吗？", "提示", {
src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
+2 -2
View File
@@ -309,9 +309,9 @@ layout("/layouts/platform.html"){
if (res.code === 0) {
this.$message.success(res.msg)
if (GetQueryString('manage') === '1') {
window.location.href = '/platform/childManage/manage/index'
commonUtil.pjaxPush('/platform/childManage/manage/index')
}else {
window.location.href = '/platform/childManage/mine/index'
commonUtil.pjaxPush('/platform/childManage/mine/index')
}
}
})
src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+7 -7
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<common-query ref="commonQueryRef" @search="search"></common-query>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="申请列表">
<el-button size="small" type="primary" @click="onApply">申请入会</el-button>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
<el-image v-if="row.sign" :src="row.sign" style="height: 60px"></el-image>
<el-tag type="warning" v-else>暂无</el-tag>
</template>
<template scope="{row}" v-else-if="column.prop=='instanceState'">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
@@ -64,7 +64,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<info ref="info"></info>
</template>
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
<!--#include("../common/commonQuery.js"){}#-->
new Vue({
el: "#app",
store,
@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
},
methods: {
onApply() {
window.location.href = '/platform/member/apply/submit'
commonUtil.pjaxPush('/platform/member/apply/submit')
},
openView(row) {
this.$refs.guava.view(() => {
@@ -111,8 +111,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+18 -18
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="民族">
<el-form-item prop="nation">
<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
@@ -45,8 +45,8 @@ layout("/layouts/platform.html"){
code="USER_POLITICAL"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="学历">
<el-form-item prop="education">
<dict-select style="width: 100%" placeholder="请选择学历" v-model="formData.education"
@@ -65,7 +65,7 @@ layout("/layouts/platform.html"){
maxlength="50"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="工作单位">
<el-form-item prop="unitId">
<el-select clearable filterable placeholder="请选择工作单位" style="width: 100%"
@@ -87,8 +87,8 @@ layout("/layouts/platform.html"){
code="USER_CAMPUS"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="在职状态">
<el-form-item prop="userState">
<dict-select v-model="formData.userState" code="USER_STATE"
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="身份证号码">
<el-form-item prop="idCard">
<el-input v-model="formData.idCard" disabled placeholder="请输入身份证号码" maxlength="18"></el-input>
@@ -118,8 +118,8 @@ layout("/layouts/platform.html"){
<el-input v-model="formData.email" placeholder="请输入电子邮箱" maxlength="50"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
<el-form-item prop="families">
<el-table :data="formData.families" border size="small">
@@ -164,13 +164,13 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<el-form-item prop="personalData">
<text-editor v-model="formData.personalData"></text-editor>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="入会意愿" :span="3">
<el-form-item prop="isVoluntary">
<el-checkbox
@@ -190,7 +190,7 @@ layout("/layouts/platform.html"){
</el-checkbox>
</el-form-item>
</el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">-->
<!-- <el-form-item prop="sign">-->
<!-- <pc-signature v-model="formData.sign"></pc-signature>-->
@@ -297,7 +297,7 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/member/apply/mine'
commonUtil.pjaxPush('/platform/member/apply/mine')
}
})
})
@@ -315,7 +315,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/member/apply/mine'
commonUtil.pjaxPush('/platform/member/apply/mine')
}
})
})
@@ -334,7 +334,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/member/apply/mine'
commonUtil.pjaxPush('/platform/member/apply/mine')
}
})
})
@@ -351,7 +351,7 @@ layout("/layouts/platform.html"){
} else {
user = this.$store.state.user
}
if (this.id) {
const res = await this.$axios.post("/platform/member/apply/submit/findApplyById", { id: this.id })
debugger
@@ -385,7 +385,7 @@ layout("/layouts/platform.html"){
families,
personalData
} = user
this.$set(this.formData, "userId", id)
this.$set(this.formData, "username", username)
this.$set(this.formData, "loginname", loginname)
@@ -404,7 +404,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "unitId", unit ? unit.id : unitId)
this.$set(this.formData, "unionName", union ? union.name : unionName)
this.$set(this.formData, "unionId", union ? union.id : unionId)
this.$set(this.formData, "mobile", mobile)
this.$set(this.formData, "email", email)
this.$set(this.formData, "families", families ? families : [])
src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html
+2 -2
View File
@@ -90,8 +90,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/member/change/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/member/change/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+25 -25
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="民族">
<el-form-item prop="nation">
<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
@@ -48,8 +48,8 @@ layout("/layouts/platform.html"){
:disabled="allowFields('political')" code="USER_POLITICAL"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="学历">
<el-form-item prop="education">
<dict-select style="width: 100%" placeholder="请选择学历" v-model="formData.education"
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
:disabled="allowFields('position')" maxlength="50"></el-input>
</el-form-item>
</el-descriptions-item>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, SCHOOL_UNION_MEMBER_ADMIN')">
<el-descriptions-item label="工作单位">
<el-form-item prop="unitId">
@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
:disabled="allowFields('campus')" code="USER_CAMPUS"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="身份证号码">
<el-form-item prop="idCard">
<el-input v-model="formData.idCard" :disabled="allowFields('idCard')" placeholder="请输入身份证号码" maxlength="18"></el-input>
@@ -128,8 +128,8 @@ layout("/layouts/platform.html"){
<el-input v-model="formData.email" :disabled="allowFields('email')" placeholder="请输入电子邮箱" maxlength="50"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="在职状态">
<el-form-item prop="userState">
<dict-select v-model="formData.userState" code="USER_STATE"
@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<template v-if="formData.userState == '退休'">
<el-descriptions-item label="退休日期">
<el-form-item prop="retireDate">
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</template>
<el-descriptions-item label="会员状态" :span="1.5">
<el-form-item prop="member">
<el-radio-group v-model="formData.member" size="small">
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="福利会员状态" :span="1.5">
<el-form-item prop="welfareMember">
<el-radio-group v-model="formData.welfareMember" size="small">
@@ -186,7 +186,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<!--<template v-if="formData.member == 1">
<el-descriptions-item label="是否加入会员组别">
<el-form-item prop="member">
@@ -207,12 +207,12 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
</template>
<template v-if="formData.member != null && !formData.welfareMember">
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</template>
<template v-if="formData.welfareMember == true">
<el-descriptions-item label="是否加入福利项目">
<el-form-item prop="isJoinWelfareProject">
@@ -222,7 +222,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.isJoinWelfareProject">
<el-descriptions-item label="选择福利项目">
<el-form-item prop="welfareProjectId">
@@ -238,7 +238,7 @@ layout("/layouts/platform.html"){
<el-descriptions-item></el-descriptions-item>
</template>
</template>-->
<template v-if="formData.loginname == $store.state.user.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-form-item prop="families">
@@ -284,7 +284,7 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="个人简历" :span="3">
<el-form-item prop="personalData">
<text-editor v-model="formData.personalData"></text-editor>
@@ -293,7 +293,7 @@ layout("/layouts/platform.html"){
</template>
</el-descriptions>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
@@ -393,12 +393,12 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/member/change/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success("保存成功")
window.location.href = '/platform/member/change/mine'
commonUtil.pjaxPush('/platform/member/change/mine')
}
})
})
},
// 提交
onSubmit() {
this.$confirm("您确定要提交吗？", "提示", {
@@ -411,12 +411,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/member/change/mine'
commonUtil.pjaxPush('/platform/member/change/mine')
}
})
})
},
onFinishTask() {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -429,12 +429,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/member/change/mine'
commonUtil.pjaxPush('/platform/member/change/mine')
}
})
})
},
// 获取表单工会名称
getUnionName(val){
const data = this.units.find(v => v.id === val)
@@ -508,7 +508,7 @@ layout("/layouts/platform.html"){
families,
personalData
} = this.user
this.$set(this.formData, "userId", id)
this.$set(this.formData, "username", username)
this.$set(this.formData, "loginname", loginname)
@@ -530,7 +530,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "unitId", unit ? unit.id : null)
this.$set(this.formData, "unionName", union ? union.name : null)
this.$set(this.formData, "unionId", union ? union.id : null)
this.$set(this.formData, "mobile", mobile)
this.$set(this.formData, "email", email)
this.$set(this.formData, "families", families ? families : [])