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

..

Browse Source
This commit is contained in:
server
2025-09-15 17:00:22 +08:00
parent c2c6769f21
commit fbc87a40c6
24 changed files with 646 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/layouts/platform_h5.html
+3
View File
@@ -270,6 +270,9 @@
Vue.component("svg-icon", httpVueLoader("/components/plugins/sysSvgIcon/index.vue?v=" + new Date().getTime()))
Vue.component("year-van-dropdown-item", httpVueLoader("/components/plugins/vantMore/yearVanDropDownItem.vue?v=" + new Date().getTime()))
Vue.component("van-text-dialog", httpVueLoader("/components/plugins/vantMore/vantTextDialog.vue?v=" + new Date().getTime()))
Vue.component("enum-tag", httpVueLoader("/components/plugins/sysEnum/EnumTag.vue?v=" + new Date().getTime()))
Vue.component("table-list", httpVueLoader("/components/plugins/h5/TableList.vue?v=" + new Date().getTime()))
Vue.component("table-column", httpVueLoader("/components/plugins/h5/TableColumn.vue?v=" + new Date().getTime()))
</script>
</head>
<body>
src/main/resources/views/platform/sys/data/user/update.html
+11 -2
View File
@@ -85,6 +85,10 @@ layout("/layouts/platform.html"){
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #public>
<member-audit-change-info ref="memberAuditChangeInfoRef" is_default_url></member-audit-change-info>
</template>
</guava>
<el-dialog title="选择数据源" :visible.sync="updateDialog" width="70%">
<el-timeline>
@@ -125,10 +129,15 @@ layout("/layouts/platform.html"){
</div>
<script>
<!--#include("../../../zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js"){}#-->
new Vue({
el: "#app",
dicts: ["MEMBER_CHANGE_TYPE"],
mixins: [initTableMixins],
components: {
"member-audit-change-info": MEMBER_AUDIT_CHANGE_INFO
},
data() {
return {
updateDialog: false,
@@ -167,8 +176,8 @@ layout("/layouts/platform.html"){
},
methods: {
openCurrentUserChangeInfo(row) {
this.$refs.guava.view(() => {
this.$refs.memberAuditChangeInfoRef.onOpen({ userId: row.id, recordId: row.userHistoryId })
this.$refs.guava.public(() => {
this.$refs.memberAuditChangeInfoRef.onOpen({recordId: row.userHistoryId, userId: row.id})
})
},
getChangeTypes(changeTypes) {
src/main/resources/views/platform/zhgh/activity/family/apply/index.html
+49 -25
View File
@@ -3,35 +3,59 @@ layout("/layouts/platform.html"){
#-->
<style>
.el-statistic {
width: 100%;
box-sizing: border-box;
margin: 0;
padding: 0;
color: #000;
font-variant: tabular-nums;
list-style: none;
font-feature-settings: "tnum";
text-align: center;
}
.el-statistic .head {
margin-bottom: 4px;
color: #606266;
font-size: 13px;
}
.el-statistic .con {
font-family: Sans-serif;
display: flex;
justify-content: center;
align-items: center;
color: #303133;
}
.el-statistic .con .number {
font-size: 20px;
padding: 0 4px;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="活动状态：">
<el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
placeholder="请选择活动状态" filterable>
<el-option :value="1" label="全部"></el-option>
<el-option :value="4" label="即将开始"></el-option>
<el-option :value="2" label="报名中"></el-option>
<el-option :value="3" label="已结束"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="活动状态：">
<el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
placeholder="请选择活动状态" filterable>
<el-option :value="1" label="全部"></el-option>
<el-option :value="4" label="即将开始"></el-option>
<el-option :value="2" label="报名中"></el-option>
<el-option :value="3" label="已结束"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card class="mt10" shadow="never">
@@ -60,7 +84,7 @@ layout("/layouts/platform.html"){
<span>{{$moment(row.activityEndTime).format('MM/DD HH:mm')}}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="100">
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
<el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js
+12 -11
View File
@@ -16,11 +16,16 @@ const apply_component = {
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="birthday" label="出生日期">
<el-date-picker v-model="formData.birthday" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item prop="birthday" label="出生日期">-->
<!-- <el-date-picker v-model="formData.birthday" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item prop="governmentPosition" label="党政职务">
<el-input v-model="formData.governmentPosition" placeholder="填写党政职务" max="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="sex" label="性别" disabled>
<el-input v-model="formData.sex" disabled></el-input>
@@ -69,11 +74,7 @@ const apply_component = {
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="governmentPosition" label="党政职务">
<el-input v-model="formData.governmentPosition" placeholder="填写党政职务" max="50"></el-input>
</el-form-item>
</el-col>
</el-row>
</template>
@@ -236,7 +237,7 @@ const apply_component = {
this.$set(this.formData, "unionId", user.union ? user.union.id : null)
this.$set(this.formData, "unionName", user.union ? user.union.name : null)
this.$set(this.formData, "sex", user.sex)
this.$set(this.formData, "birthday", user.birthday)
// this.$set(this.formData, "birthday", user.birthday)
this.$set(this.formData, "nation", user.nation)
this.$set(this.formData, "political", user.political)
this.$set(this.formData, "education", user.education)
src/main/resources/views/platform/zhgh/dayofficework/honor/board/index.html
+1
View File
@@ -150,6 +150,7 @@ layout("/layouts/platform.html"){
columnStyle: {
radius: [20, 20, 0, 0],
},
maxColumnWidth: 50
})
singleLevelTypePlot.render()
}
src/main/resources/views/platform/zhgh/dayofficework/rest/query/index.html
+4 -3
View File
@@ -5,9 +5,10 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<!-- <search-item label="年度">-->
<!-- <el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>-->
<!-- </search-item>-->
<!-- <search-item label="年度">-->
<!-- <el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year"-->
<!-- value-format="yyyy"></el-date-picker>-->
<!-- </search-item>-->
<search-item label="活动">
<el-select v-model="pageForm.actId" placeholder="请选择活动">
<el-option v-for="item in actOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js
+1
View File
@@ -153,6 +153,7 @@ const MEMBER_AUDIT_CHANGE_INFO = {
})
},
onOpen(data) {
console.log(data)
this.findAuditChangeInfo(data.recordId)
this.$nextTick(() => {
this.findUserInfo(data.userId)
src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditTable.js
+1 -1
View File
@@ -53,7 +53,7 @@ const MEMBER_AUDIT_TABLE = {
:sortable="column.sortable" :width="column.width"
align="center" header-align="center" min-width="100px"
show-overflow-tooltip>
<template slot-scope="{row}" v-if="column.prop=='loginname'">
<template scope="{row}" v-if="column.prop=='loginname'">
<el-link @click="openView(row.userId)" type="primary">{{row.loginname}}</el-link>
</template>
</el-table-column>
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js
+22 -15
View File
@@ -32,6 +32,9 @@ const MEMBER_MANAGE_TABLE = {
</div>-->
<!--<el-button @click="addMember" type="primary" size="small">新增会员</el-button>-->
<el-button type="primary" size="small" icon="el-icon-printer" @click="exportExcel">导出会员名单
</el-button>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id"
@@ -114,8 +117,8 @@ const MEMBER_MANAGE_TABLE = {
查看
</el-dropdown-item>
<el-dropdown-item
:command="{type:'change',data:row}"
v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN'])">
:command="{type:'change',data:row}"
v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN'])">
变更
</el-dropdown-item>
<!--<el-dropdown-item
@@ -149,15 +152,15 @@ const MEMBER_MANAGE_TABLE = {
return {
changeTypeData: [],
tableColumns: [
{ prop: "loginname", label: "工号", sortable: true },
{ prop: "username", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true, width: "100px" },
{ prop: "birthday", label: "出生年月", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "聘用方式", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }
{prop: "loginname", label: "工号", sortable: true},
{prop: "username", label: "姓名", sortable: true},
{prop: "sex", label: "性别", sortable: true, width: "100px"},
{prop: "birthday", label: "出生年月", sortable: true},
{prop: "userState", label: "在职状态", sortable: true},
{prop: "preparedBy", label: "聘用方式", sortable: true},
{prop: "personType", label: "人员类型", sortable: true},
{prop: "unionName", label: "所属工会", sortable: true},
{prop: "unitName", label: "所属单位", sortable: true}
],
changeInfoVisible: false,
userId: "",
@@ -169,7 +172,7 @@ const MEMBER_MANAGE_TABLE = {
},
methods: {
dropdownCommand(command) {
const { type, data } = command
const {type, data} = command
if (type === "view") {
this.openView(data.id)
} else if (type === "change") {
@@ -187,7 +190,7 @@ const MEMBER_MANAGE_TABLE = {
type: "warning"
})
.then(() => {
this.$axios.post("/platform/member/modelWorker/manage/setModelWorker", { userId: userId }).then((res) => {
this.$axios.post("/platform/member/modelWorker/manage/setModelWorker", {userId: userId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.$emit("refresh-table")
@@ -204,7 +207,7 @@ const MEMBER_MANAGE_TABLE = {
type: "warning"
})
.then(() => {
this.$axios.post("/platform/member/modelWorker/manage/cancelModelWorker", { userIds: JSON.stringify([userId]) })
this.$axios.post("/platform/member/modelWorker/manage/cancelModelWorker", {userIds: JSON.stringify([userId])})
.then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
@@ -216,7 +219,7 @@ const MEMBER_MANAGE_TABLE = {
})
},
openChange(data) {
this.$emit("change-member", { id: data.id, username: data.username })
this.$emit("change-member", {id: data.id, username: data.username})
},
openView(id) {
this.$emit("view-member", id)
@@ -249,6 +252,10 @@ const MEMBER_MANAGE_TABLE = {
this.$emit("refresh", this.pageForm)
}
})
},
exportExcel() {
const pageForm = clone(this.pageForm)
this.$downLoad(loc() + "/doExport", pageForm)
}
},
created() {
src/main/resources/views/platform/zhghh5/sys/home/work.js
+1 -1
View File
@@ -14,7 +14,7 @@ const work = {
<img :src="menu.icon" alt="" style="width: 40px;height: 40px">
</template>
<template #text>
<span>{{menu.name}}</span>
<span style="font-size: 14px">{{menu.name}}</span>
</template>
</van-grid-item>
</van-grid>