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

Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

Browse Source
This commit is contained in:
=
2025-12-19 11:24:06 +08:00
parent d122db043a 1d785f693a
commit 330a53576b
42 changed files with 22713 additions and 22662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+3 -1
View File
@@ -376,7 +376,9 @@ public class ActivityBasicScopeController {
try {
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){
cnd.andEX("u.unionid", "=", SecurityUtil.getUnionId());
}
cnd.andEX("u.unionid", EQ_OR_NEQ_OP, activityUserScopePageParam.getUnionId());
cnd.andEX("u.unitid", EQ_OR_NEQ_OP, activityUserScopePageParam.getUnitId());
cnd.andEX("u.personType", IN_OR_NIN_OP, activityUserScopePageParam.getPersonTypes());
src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java
+1
View File
@@ -140,6 +140,7 @@ public class ActivityCultureApplyActivityController {
Dict args = Dict.create();
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
args.set(FlowConst.FORM_DATA, tissue);
args.set("activity_type", tissue.getActivity_type());
ProcessInstance instance = flowEngine.startProcessInstanceByKey("WHHD", tissue.getId(), SecurityUtil.getUserId(), args);
// 自动完成第一个申请任务
src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java
+5 -1
View File
@@ -102,7 +102,11 @@ public class ActivityCultureAuditActivityController {
LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
$condition
""");
cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37");
if (activity_type==40002){
cnd.and("t.taskName", "=", "12f7ed7d-9286-4453-8754-57df7d3b260b");
}else{
cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37");
}
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("YEAR(tissue.startTime)", "=", year);
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
+1 -1
View File
@@ -145,7 +145,7 @@ public class ActivityDeclareMineController {
@At
@ApiOperation("活动申报,查看活动申报")
@SaCheckPermission("activityDeclare.mine")
@SaCheckPermission("activityDeclare")
public Result findOne(@Valid String id) {
ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, id);
return Result.success().addData(info);
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java
+8 -2
View File
@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
@@ -94,8 +95,6 @@ public class ActivityDeclareSchoolUnionController {
$condition
""");
Cnd cnd = Cnd.NEW();
pageParam.buildSearch(cnd, "info.");
cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
@@ -105,6 +104,13 @@ public class ActivityDeclareSchoolUnionController {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
}
if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageParam.getSearchKeyword());
seg.orLike("info.loginName", pageParam.getSearchKeyword());
cnd.and(seg);
}
if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
cnd.desc("info.applyTime");
} else {
src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java
+2 -2
View File
@@ -145,8 +145,8 @@ public class ActivityWorksCollectionReadController {
cnd.andEX("up.activityId", "=", pageForm.getActivityId());
cnd.andEX("up.subjectId", "=", pageForm.getSubjectId());
cnd.andEX("up.worksId", "=", pageForm.getWorksId());
cnd.andEX("unionId", "=", pageForm.getUnionId());
cnd.andEX("unitId", "=", pageForm.getUnitId());
cnd.andEX("up.unionId", "=", pageForm.getUnionId());
cnd.andEX("up.unitId", "=", pageForm.getUnitId());
if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("userName", pageForm.getSearchKeyword());
src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class BlessingUserController {
FROM
blessing_user blu
LEFT JOIN blessing bl ON bl.id = blu.blessingId
LEFT JOIN `user` u ON u.id = blu.userId
LEFT JOIN `vw_user` u ON u.id = blu.userId
$condition
""");
if (Strings.isNotBlank(pageForm.getSearchKeyword()) && Strings.isNotBlank(pageForm.getSearchName())) {
src/main/resources/static/assets/platform/plugins/element-ui/lib/index.js
+1 -22372
View File
File diff suppressed because one or more lines are too long
src/main/resources/static/assets/platform/plugins/element-ui/lib/index2.js
+22372
View File
File diff suppressed because it is too large Load Diff
src/main/resources/static/components/plugins/sysSignature/index.vue
+20 -2
View File
@@ -1,7 +1,7 @@
<template>
<div class="signature-wrap">
<canvas id="canvas"></canvas>
<div class="action-buttons">
<div :class="isLikelyMobile() ? 'action-buttons' : 'action-buttons pc-action-buttons'">
<button @click="clear" class="action-button-danger" type="button">清空</button>
<button @click="undo" class="action-button-warning" type="button">撤销</button>
<button @click="save" class="action-button-primary" type="button">确定</button>
@@ -48,6 +48,13 @@ module.exports = {
rotate() {
signature.getRotateCanvas(90)
},
isLikelyMobile() {
const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
const isSmallScreen = window.screen.width <= 768;
const hasMobileUA = /Android|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
return hasMobileUA || (isTouchDevice && isSmallScreen);
},
save() {
if (signature.isEmpty()) {
alert("请签字后再保存")
@@ -56,7 +63,11 @@ module.exports = {
// const png = signature.getPNG()
//旋转一下 横过来
const rotateCanvas = signature.getRotateCanvas(-90)
this.$emit("save", rotateCanvas.toDataURL())
if (this.isLikelyMobile()) {
this.$emit("save", rotateCanvas.toDataURL())
} else {
this.$emit("save", signature.toDataURL())
}
}
},
mounted() {
@@ -110,6 +121,13 @@ module.exports = {
row-gap: 20px;
}
.signature-wrap .pc-action-buttons {
bottom: 50px;
right: 50px;
left: unset;
transform: rotate(0deg);
}
.action-buttons button {
color: #ffffff;
position: relative;
src/main/resources/static/components/plugins/sysSignature/pc.vue
+84 -71
View File
@@ -1,96 +1,109 @@
<template>
<el-card shadow="never" class="pc-signature-card">
<div class="pc-signature">
<el-link type="primary">扫描下方二维码进行签字</el-link>
<div class="signature-body">
<QrCode v-if="!signatureContent" :options="{ width: 126 }" :value="signatureAddress" class="signature-qrcode"></QrCode>
<el-image v-if="signatureContent" :src="signatureContent" class="signature-image"></el-image>
</div>
<el-link type="danger" icon="el-icon-edit" @click="signatureAgain" v-if="signatureContent">重签</el-link>
</div>
</el-card>
<el-card shadow="never" class="pc-signature-card">
<div class="pc-signature">
<el-link type="primary">扫描下方二维码进行签字</el-link>
<div class="signature-body" v-loading="loading">
<QrCode v-if="!signatureContent" :options="{ width: 126 }" :value="signatureAddress"
class="signature-qrcode"></QrCode>
<el-image v-if="signatureContent" :src="signatureContent" class="signature-image"></el-image>
</div>
<el-link type="danger" icon="el-icon-edit" @click="signatureAgain" v-if="signatureContent">重签</el-link>
</div>
</el-card>
</template>
<script>
module.exports = {
name: "sysSignaturePc",
store,
props: {
value: {
type: String,
default: ""
}
},
watch: {
value: {
handler(val) {
if(val){
this.signatureContent = val
this.$emit("input", this.signatureContent)
}
},
immediate: true
}
},
data() {
return {
//前端唯一标识 当然后端还有用户id作为唯一标识
id: new Date().getTime() + Math.floor(Math.random() * 10000) + 1,
signatureAddress: null,
interval: null,
signatureContent: null
}
},
methods: {
async init() {
const { code, data } = await this.$axios.post("/platform/signature/get")
if (code === 0) {
this.signatureContent = data && data.signature
this.$emit("input", this.signatureContent)
}
this.signatureAddress = origin + "/platform/signature/scanPcCode?id=" + this.id
console.log(this.signatureAddress)
},
signatureAgain() {
const val = sessionStorage.getItem("h5-scan-code-signature-" + this.id)
this.signatureContent = val
this.$emit("input", val)
}
},
mounted() {
this.init()
webSocketPubSub.subscribe("h5-scan-code-signature", (data) => {
console.info("ws:收到签字成功消息:", data)
this.signatureContent = data.value
this.$emit("input", data.value)
})
name: "sysSignaturePc",
store,
props: {
value: {
type: String,
default: ""
}
},
watch: {
value: {
handler(val) {
if (val) {
this.signatureContent = val
this.$emit("input", this.signatureContent)
}
},
immediate: true
}
},
data() {
return {
//前端唯一标识 当然后端还有用户id作为唯一标识
id: new Date().getTime() + Math.floor(Math.random() * 10000) + 1,
signatureAddress: null,
interval: null,
signatureContent: null,
loading: true,
}
},
methods: {
async init() {
const {code, data} = await this.$axios.post("/platform/signature/get")
if (code === 0) {
this.signatureContent = data && data.signature
this.$emit("input", this.signatureContent)
}
this.signatureAddress = origin + "/platform/signature/scanPcCode?id=" + this.id
},
signatureAgain() {
const val = sessionStorage.getItem("h5-scan-code-signature-" + this.id)
this.signatureContent = val
this.$emit("input", val)
}
},
async mounted() {
await this.init()
webSocketPubSub.subscribe("h5-scan-code-signature", (data) => {
console.info("ws:收到签字成功消息:", data)
this.signatureContent = data.value
this.$emit("input", data.value)
})
// 可选：轮询或 watch ready 状态
const checkReady = () => {
if (webSocketPubSub.ws && webSocketPubSub.ws.readyState === WebSocket.OPEN) {
console.info("ws.readyState is open");
this.loading = false;
console.log(this.signatureAddress)
} else {
setTimeout(checkReady, 100);
}
};
checkReady();
}
}
</script>
<style scoped>
.pc-signature-card {
border: 1px solid var(--border-color-base);
border: 1px solid var(--border-color-base);
}
.pc-signature {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
row-gap: 20px;
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
row-gap: 20px;
}
.signature-body {
position: relative;
position: relative;
}
.signature-qrcode {
transition: opacity 0.5s ease;
transition: opacity 0.5s ease;
}
.signature-image {
height: 100px;
width: auto;
height: 100px;
width: auto;
}
</style>
src/main/resources/views/layouts/v4/baseLayout.html
+28 -8
View File
@@ -31,9 +31,9 @@
<link rel="stylesheet" href="${base!}/assets/platform/css/common.css" />
<!-- import Jquery -->
<script src="${base!}/assets/platform/plugins/jquery/jquery.js"></script>
<script src="${base!}/assets/platform/plugins/jquery/jquery-high.min.js"></script>
<!-- pjax是异步加载html片段的工具,模拟前端路由机制 -->
<script src="${base!}/assets/platform/plugins/pjax/jquery.pjax.js"></script>
<script src="${base!}/assets/platform/plugins/pjax/jquery.pjax-high.min.js"></script>
<!-- nprogress 配合pjax使用 -->
<link rel="stylesheet" href="${base!}/assets/platform/plugins/nprogress/nprogress.css" />
<script src="${base!}/assets/platform/plugins/nprogress/nprogress.js"></script>
@@ -100,9 +100,28 @@
<script src="https://map.qq.com/api/gljs?v=2.exp&key=MLLBZ-GQECI-ASXG7-5GNOZ-XW2OF-H5BVH"></script>
<script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: "4fa1e1aeabba7eb9518129cf57ab17c1"
<script>
// 在加载 lodash 后、使用前插入
const originalDefaultsDeep = window._.defaultsDeep;
window._.defaultsDeep = function(...args) {
// 先对所有参数做原型污染清洗
const cleanArgs = args.map(arg => sanitizeForPrototypePollution(arg));
return originalDefaultsDeep.apply(window._, cleanArgs);
};
function sanitizeForPrototypePollution(obj) {
if (obj === null || typeof obj !== 'object') return obj;
if (Array.isArray(obj)) return obj.map(sanitizeForPrototypePollution);
const clean = {};
for (const key in obj) {
if (!Object.hasOwn(obj, key)) continue;
if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
continue;
}
clean[key] = sanitizeForPrototypePollution(obj[key]);
}
return clean;
}
</script>
@@ -168,7 +187,7 @@
this.isSubscribed = true
this.sendJoinMessage()
}
}, 2000)
}, 1000)
}
// 事件处理
@@ -202,6 +221,7 @@
// )
// 连接建立时不立即发送 join，等待订阅完成
this.ping()
console.info('websocket open success')
}
}
@@ -243,9 +263,9 @@
if (this.ws.readyState === WebSocket.OPEN) {
this.sendJoinMessage()
}
}, 1000)
}, 500)
}
}, 3000) // 延迟3秒重连
}, 1000) // 延迟2秒重连
}
// 窗口事件处理
src/main/resources/views/platform/sys/login.html
+20 -18
View File
@@ -100,26 +100,28 @@
<!-- import jsencrypt-->
<script src="${base!}/assets/platform/plugins/jsencrypt/jsencrypt.min.js"></script>
<script>
// 安全地冻结 Object.prototype（跳过不可配置属性）
(function () {
const badKeys = ['constructor', 'prototype'];
for (const key of badKeys) {
if (key in Object.prototype) {
try {
delete Object.prototype[key];
} catch (e) {
// 忽略无法删除的属性（如 __proto__ 在现代浏览器中不可删除）
}
}
}
// 在加载 lodash 后、使用前插入
const originalDefaultsDeep = window._.defaultsDeep;
window._.defaultsDeep = function(...args) {
// 先对所有参数做原型污染清洗
const cleanArgs = args.map(arg => sanitizeForPrototypePollution(arg));
return originalDefaultsDeep.apply(window._, cleanArgs);
};
// 冻结 Object.prototype（如果可能）
try {
Object.freeze(Object.prototype);
} catch (e) {
// 忽略错误（某些环境可能不允许）
function sanitizeForPrototypePollution(obj) {
if (obj === null || typeof obj !== 'object') return obj;
if (Array.isArray(obj)) return obj.map(sanitizeForPrototypePollution);
const clean = {};
for (const key in obj) {
if (!Object.hasOwn(obj, key)) continue;
if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
continue;
}
clean[key] = sanitizeForPrototypePollution(obj[key]);
}
})();
return clean;
}
</script>
<script>
new Vue({
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+1 -1
View File
@@ -356,7 +356,7 @@ layout("/layouts/platform.html"){
}
})
}
if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "UNION_REIMBURSEMENT_MANAGER"])) {
if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "BRANCH_UNION_CHAIRMAN"])) {
this.activityDeclareReimbursementList.map(v => {
if (["BRANCH_UNION"].includes(v.name)) {
activityDeclareReimbursementList.push(v)
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html
+13 -13
View File
@@ -2,18 +2,18 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">{{ viewData.activityName }}</el-descriptions-item>
<el-descriptions-item label="活动类型">{{ getActivityTypeName(viewData.activityType) }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请协会' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item label="联系方式">{{ viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.applyTime }}</el-descriptions-item>
<el-descriptions-item label="活动计划时间">{{ viewData.planStartTime + ' ~ ' + viewData.planEndTime }}</el-descriptions-item>
<el-descriptions-item label="活动人数">{{ viewData.activityNumber }}</el-descriptions-item>
<el-descriptions-item label="活动地址" :span="2">{{ viewData.activityAddress }}</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-table :data="viewData.budgets" border max-height="500" size="mini" style="width: calc(1200px - 150px - 15%)">
<el-table-column label="序号" sortable type="index" width="100"></el-table-column>
@@ -21,16 +21,16 @@
<el-table-column label="预算费用" prop="budgetPrice"></el-table-column>
</el-table>
</el-descriptions-item>
<el-descriptions-item label="活动方案及简介" :span="2">
<div v-html="viewData.activityContent"></div>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-image v-if="viewData.sign"
:src="viewData.sign"
@@ -38,7 +38,7 @@
<span v-else>暂无</span>
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
<div class="task-panel mt10">
<div class="task-panel-header">{{ task.displayName }}</div>
@@ -49,7 +49,7 @@
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE" :value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
@@ -113,7 +113,7 @@
border-radius: 4px;
overflow: hidden;
}
.task-panel-header {
background: rgb(250, 250, 250);
border: 1px solid rgb(228, 231, 237);
@@ -123,11 +123,11 @@
justify-content: space-between;
align-items: center;
}
.el-descriptions-item__label.is-bordered-label {
width: 15% !important;
}
.el-descriptions-item__label {
width: 15% !important;
}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const INFO = {
var INFO = {
template: /*language=HTML*/ `
<div>
<div class="process-title">申请信息
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html
+14 -14
View File
@@ -19,7 +19,7 @@
<el-descriptions-item label="相关数据">
<el-button size="small" type="primary">查看申报信息</el-button>
</el-descriptions-item>
<el-descriptions-item label="实际活动时间" :span="2">
<el-form-item prop="activityTime">
<el-date-picker
@@ -33,7 +33,7 @@
</el-date-picker>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-form-item prop="budgets">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
@@ -122,7 +122,7 @@
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="发票" :span="2">
<el-form-item prop="billFiles">
<file-upload :value.sync="formData.billFiles"
@@ -141,7 +141,7 @@
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="奖品/纪念品/服装/道具等活动人员名单" :span="2">
<el-form-item prop="otherFiles">
<file-upload :value.sync="formData.otherFiles"
@@ -151,7 +151,7 @@
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -159,8 +159,8 @@
</el-descriptions-item>
</el-descriptions>
</el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction" @save-draft="handleSaveDraft"></snaker-flow-task-form-action>
</div>
@@ -179,7 +179,7 @@
formRules: {
id: [{required: true, message: "必填", trigger: ['change', 'blur']}]
},
activityOptions: []
}
},
@@ -189,15 +189,15 @@
if (!this.formData.id) {
this.$message.warning("请选择活动后才能保存")
}
this.$refs.formRef.validate((valid) => {
if (valid) {
if (this.formData.activityTime && this.formData.activityTime.length > 0) {
this.formData.startTime = this.formData.activityTime[0]
this.formData.endTime = this.formData.activityTime[1]
}
if (!this.instanceId) {
this.handleApply(val)
} else {
@@ -278,7 +278,7 @@
},
// 取消
handleCancel() {
},
async getCardNumberByPayeeId(row) {
const resp = await $.get('/platform/activityReimbursement/apply/getCardNumberByPayeeId', {username:row.username})
@@ -296,14 +296,14 @@
...this.formData,
...data
}
if (data.planStartTime && data.planEndTime) {
this.formData.activityTime = [
new Date(data.planStartTime),
new Date(data.planEndTime)
]
}
}
},
async getActivityReimbursementByUser() {
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html
+17 -17
View File
@@ -2,20 +2,20 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">{{ viewData.activityName }}</el-descriptions-item>
<el-descriptions-item label="活动类型">{{ getActivityTypeName(viewData.activityType) }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请协会' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item label="联系方式">{{ viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.applyTime }}</el-descriptions-item>
<el-descriptions-item label="活动计划时间">{{ (viewData.planStartTime ? viewData.planStartTime : '未填写') + ' ~ ' + (viewData.planEndTime ? viewData.planEndTime : '未填写') }}</el-descriptions-item>
<el-descriptions-item label="活动人数">{{ viewData.activityNumber }}</el-descriptions-item>
<el-descriptions-item label="实际活动时间" :span="2">{{ (viewData.startTime ? viewData.startTime : '未填写') + ' ~ ' + (viewData.endTime ? viewData.endTime : '未填写') }}</el-descriptions-item>
<el-descriptions-item label="活动地址" :span="2">{{ viewData.activityAddress }}</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-table :data="viewData.budgets" border max-height="500" size="mini" style="width: calc(1200px - 150px - 15%)">
<el-table-column label="序号" sortable type="index" fixed></el-table-column>
@@ -28,31 +28,31 @@
<el-table-column label="备注" prop="remark"></el-table-column>
</el-table>
</el-descriptions-item>
<el-descriptions-item label="活动方案及简介" :span="2">
<div v-html="viewData.activityContent"></div>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="发票" :span="2">
<file-preview v-if="viewData.billFiles && viewData.billFiles.length > 0" :files="viewData.billFiles" complete_result></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="活动报道照片/总结/链接" :span="2">
<file-preview v-if="viewData.photoFiles && viewData.photoFiles.length > 0" :files="viewData.photoFiles" complete_result></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="奖品/纪念品/服装/道具等活动人员名单" :span="2">
<file-preview v-if="viewData.otherFiles && viewData.otherFiles.length > 0" :files="viewData.otherFiles" complete_result></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-image v-if="viewData.sign"
:src="viewData.sign"
@@ -60,7 +60,7 @@
<span v-else>暂无</span>
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
<div class="task-panel mt10">
<div class="task-panel-header">{{ task.displayName }}</div>
@@ -71,7 +71,7 @@
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE" :value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
@@ -131,7 +131,7 @@
border-radius: 4px;
overflow: hidden;
}
.task-panel-header {
background: rgb(250, 250, 250);
border: 1px solid rgb(228, 231, 237);
@@ -141,11 +141,11 @@
justify-content: space-between;
align-items: center;
}
.el-descriptions-item__label.is-bordered-label {
width: 15% !important;
}
.el-descriptions-item__label {
width: 15% !important;
}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/board/index.html
+20 -20
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
padding: 20px 80px;
border-bottom: 10px solid rgb(240, 240, 240);
}
.top_title {
font-size: 14px;
color: #808492;
@@ -15,11 +15,11 @@ layout("/layouts/platform.html"){
line-height: 30px;
margin-bottom: 5px;
}
.top_num {
font-size: 26px;
}
.cut-off-line {
width: 1px;
height: 70%;
@@ -30,11 +30,11 @@ layout("/layouts/platform.html"){
margin: auto;
background-color: rgb(230, 230, 230);
}
.year input {
text-align: center;
}
.chartTitle {
font-size: 14px;
color: #808492;
@@ -87,14 +87,14 @@ layout("/layouts/platform.html"){
<el-col :span="4" style="position: relative">
<div class="top_title">校工会活动报销费用（元）
</div>
<div class="top_num">{{numData.schoolActivityMoney?numData.schoolActivityMoney:'0'}}</div>
<div class="cut-off-line"></div>
</el-col>
<el-col :span="4" style="position: relative">
<div class="top_title">分工会活动报销费用（元）
</div>
<div class="top_num">{{numData.unionActivityMoney?numData.unionActivityMoney:'0'}}</div>
<div class="cut-off-line"></div>
</el-col>
@@ -105,7 +105,7 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
</div>
<el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
<div style="position: absolute;top: 25px;right: 40px;z-index: 200">
<el-date-picker
@@ -141,7 +141,7 @@ layout("/layouts/platform.html"){
<div id="activityTypePieChart" style="width: 100%;height: 330px;"></div>
</el-col>
</el-row>
<el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
<div style="position: absolute;top: 25px;right: 40px;z-index: 2000">
<el-date-picker
@@ -177,8 +177,8 @@ layout("/layouts/platform.html"){
<div id="activityJfPieChart" style="width: 100%;height: 330px;"></div>
</el-col>
</el-row>
<el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
<div style="position: absolute;top: 25px;right: 40px;z-index: 999">
<el-date-picker
@@ -201,8 +201,8 @@ layout("/layouts/platform.html"){
<div id="allUnionChart" style="width: 100%;height: 300px;"></div>
</el-col>
</el-row>
<el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
<div style="position: absolute;top: 25px;right: 40px;z-index: 999">
<el-date-picker
@@ -225,7 +225,7 @@ layout("/layouts/platform.html"){
<div id="allClubChart" style="width: 100%;height: 300px;"></div>
</el-col>
</el-row>
</el-card>
</div>
</div>
@@ -255,12 +255,12 @@ layout("/layouts/platform.html"){
startYear: new Date().getFullYear() - 2 + '',
endYear: new Date().getFullYear() + '',
},
all_union_loading: false,
unionTip:'分工会活动数',
allUnionYear: moment().format('YYYY'),
isUnionJf:true,
all_club_loading: false,
clubTip:'协会活动数',
allClubYear: moment().format('YYYY'),
@@ -295,7 +295,7 @@ layout("/layouts/platform.html"){
"yField": "num",
"seriesField": "type",
}
const plot = new G2Plot.Column(document.getElementById("activityTypeChart"), {
data,
...config,
@@ -341,7 +341,7 @@ layout("/layouts/platform.html"){
...config,
});
this.activityTypePieChart.render();
}
this.activity_type_pie_loading = false
},
@@ -364,7 +364,7 @@ layout("/layouts/platform.html"){
"yField": "num",
"seriesField": "type",
}
const plot = new G2Plot.Column(document.getElementById("activityJfChart"), {
data,
...config,
@@ -410,7 +410,7 @@ layout("/layouts/platform.html"){
...config,
});
this.activityJfPieChart.render();
}
this.activity_jf_pie_loading = false
},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const INFO = {
var INFO = {
template: /*language=HTML*/ `
<div>
<div class="process-title">申请信息
src/main/resources/views/platform/zhgh/activity/family/manage/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/activity/family/statistics/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/activity/fellowship/manage/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/activity/fellowship/statistics/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/punchStatistics.html
+2 -2
View File
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="活动">
<el-cascader
style="width: 100%"
@@ -202,7 +202,7 @@ layout("/layouts/platform.html"){
if (activityDate && activityDate.length > 0) {
activityDate1 = JSON.stringify(activityDate)
}
this.$downLoad(loc() + "/exportExcel", {
hdid: hdid,
unionId: unionId,
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html
+6 -6
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年份">
<el-date-picker style="width: 100%"
@@ -19,7 +19,7 @@ layout("/layouts/platform.html"){
placeholder="选择年">
</el-date-picker>
</search-item>
<search-item label="活动">
<el-cascader
style="width: 100%"
@@ -29,13 +29,13 @@ layout("/layouts/platform.html"){
:props="{ checkStrictly: true,emitPath:false}"
:clearable="false"></el-cascader>
</search-item>
<search-item label="姓名工号">
<el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"
style="width: 100%" @keyup.enter.native="doSearch">
</el-input>
</search-item>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<search-item label="所属工会">
<el-select @change="unionChange" clearable filterable style="width: 100%"
@@ -48,7 +48,7 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select @change="doSearch" clearable filterable style="width: 100%"
placeholder="请选择所属单位" v-model="pageForm.unitId">
@@ -98,7 +98,7 @@ layout("/layouts/platform.html"){
<el-input v-model="scope.row.awardName" placeholder="请输入奖项名称" max="50" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="奖项积分" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.points" placeholder="请输入奖项积分" style="width: 100%"></el-input-number>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html
+3 -3
View File
@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年份">
<el-date-picker
@@ -41,7 +41,7 @@ layout("/layouts/platform.html"){
<search-item label="姓名工号">
<el-input v-model="pageForm.searchKeyword" max="20" placeholder="请输入工号或者姓名查询" clearable></el-input>
</search-item>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<search-item label="所属工会">
<el-select @change="unionChange" clearable filterable style="width: 100%"
@@ -66,7 +66,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
</template>
</search>
</el-card>
<el-card class="mt20" shadow="never">
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html
+2 -2
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年份">
<el-date-picker style="width: 100%"
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
placeholder="选择年">
</el-date-picker>
</search-item>
<search-item label="活动">
<el-cascader
style="width: 100%"
src/main/resources/views/platform/zhgh/activity/leadthought/apply/index.html
+20 -20
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<snaker-start slot="header" label="思政申报" define_key="SZBKSB"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-descriptions :column="3" border>
<el-descriptions-item label="归属项目" :span="1.5">
<el-form-item prop="manageId">
<el-select v-model="formData.manageId" placeholder="请选择项目名称" clearable>
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
<el-input placeholder="请填写项目名称" v-model="formData.projectName" maxlength="100"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="申报单位">
<el-form-item prop="applyUnitName">
<el-input placeholder="申报单位" readonly v-model="formData.applyUnitName"></el-input>
@@ -48,8 +48,8 @@ layout("/layouts/platform.html"){
</el-date-picker>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="负责人">
<el-form-item prop="headName">
<el-input placeholder="负责人" readonly v-model="formData.headName"></el-input>
@@ -65,8 +65,8 @@ layout("/layouts/platform.html"){
<el-input placeholder="邮箱" v-model="formData.email" maxlength="20"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="项目规模(人数)">
<el-form-item prop="numberPeople">
<el-input-number placeholder="项目规模(人数)" v-model="formData.numberPeople"></el-input-number>
@@ -82,8 +82,8 @@ layout("/layouts/platform.html"){
<el-input-number placeholder="骨干教师参加人数" v-model="formData.numberTeacher"></el-input-number>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="单位人数占比">
<el-form-item prop="unitPercentage">
<el-input-number placeholder="占本单位人数百分比" v-model="formData.unitPercentage"></el-input-number>
@@ -99,8 +99,8 @@ layout("/layouts/platform.html"){
<el-input placeholder="占本骨干教师人数百分比" v-model="formData.teacherPercentage"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="项目类别">
<el-form-item prop="typeId">
<el-select v-model="formData.typeId" placeholder="请选择项目类别" clearable>
@@ -113,8 +113,8 @@ layout("/layouts/platform.html"){
<el-input placeholder="项目主题" v-model="formData.projectTheme" maxlength="255"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="项目经费预算" :span="3">
<el-form-item prop="leadThoughtFunds">
<el-table :data="formData.leadThoughtFunds" border size="small">
@@ -125,27 +125,27 @@ layout("/layouts/platform.html"){
placeholder="请填写开支科目"></el-input>
</template>
</el-table-column>
<el-table-column label="向校工会申请经费(元)" prop="applySchoolMoney">
<template slot-scope="{row}">
<el-input @input="changNum(row)" v-model="row.applySchoolMoney"
oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请填写向校工会申请经费"></el-input>
</template>
</el-table-column>
<el-table-column label="部门配套经费(元)" prop="deptMoney">
<template slot-scope="{row}">
<el-input @input="changNum(row)" v-model="row.deptMoney"
oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请填写部门配套经费"></el-input>
</template>
</el-table-column>
<el-table-column label="合计(元)" prop="amountTo">
<template slot-scope="{row}">
<el-input readonly v-model="row.amountTo" placeholder="填写前两项后自动计算"></el-input>
</template>
</el-table-column>
<el-table-column width="100px">
<template slot="header" slot-scope="scope">
<el-button type="primary" size="mini"
@@ -162,8 +162,8 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="项目主要内容/进度安排">
<el-form-item prop="content">
<text-editor v-model="formData.content"></text-editor>
@@ -171,7 +171,7 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</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>
@@ -287,7 +287,7 @@ layout("/layouts/platform.html"){
})
})
},
init() {
if (this.id) {
this.$axios.post("/platform/leadThought/apply/findWriteInfo", {id: this.id})
src/main/resources/views/platform/zhgh/activity/leadthought/basic/manage/index.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
placeholder="选择年">
</el-date-picker>
</search-item>
<search-item label="项目名称">
<el-input placeholder="请输入项目名称" clearable v-model="pageForm.projectName"
@keyup.enter.native="doSearch">
src/main/resources/views/platform/zhgh/activity/leadthought/basic/type/index.html
+1 -1
View File
@@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="类别名称">
<el-input @keyup.enter.native="doSearch" clearable
src/main/resources/views/platform/zhgh/activity/leadthought/branchunionaudit/index.html
+4 -4
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
<el-table-column
:index="indexMethod"
@@ -81,13 +81,13 @@ layout("/layouts/platform.html"){
</div>
</info>
</template>
</guava>
</div>
<script>
<!--#include("../common/info.js"){}#-->
<!--#include("../common/commonQuery.js"){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
@@ -107,7 +107,7 @@ layout("/layouts/platform.html"){
{ prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" }
],
// 审核相关
showApprovalForm: false,
formData: {
src/main/resources/views/platform/zhgh/activity/leadthought/common/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const INFO = {
var INFO = {
template: /*language=HTML*/ `
<div>
<div class="process-title">
src/main/resources/views/platform/zhgh/activity/leadthought/mine/index.html
+7 -7
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<el-card class="mt10" shadow="never">
<table-tool></table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
<el-table-column
:index="indexMethod"
@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220" fixed="right">
<template slot-scope="{row}">
<!-- <el-button size="mini" @click="openView(row)">查看</el-button>-->
@@ -48,7 +48,7 @@ layout("/layouts/platform.html"){
<!-- <el-button @click="doDelete(row.id)" size="mini" type="danger"-->
<!-- v-if="[6000,6100,6125,6200].includes(row.state)">删除-->
<!-- </el-button>-->
<el-button @click="openView(row)" size="mini" type="primary">
查看
</el-button>
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
@click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
</template>
</el-table-column>
@@ -79,10 +79,10 @@ layout("/layouts/platform.html"){
</div>
<script>
<!--#include("../common/info.js"){}#-->
<!--#include("../common/commonQuery.js"){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
@@ -131,7 +131,7 @@ layout("/layouts/platform.html"){
})
})
},
onDelete(id) {
this.$confirm("您确定要删除吗?", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/activity/leadthought/query/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<table-tool>
<!-- <el-button size="mini" type="primary" @click="exportAllInfo">导出全部</el-button>-->
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
<el-table-column
:index="indexMethod"
@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
<!--#include("../common/commonQuery.js"){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
src/main/resources/views/platform/zhgh/activity/leadthought/schoolunionaudit/index.html
+9 -9
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 class="mt10" shadow="never">
<table-tool>
<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
<el-table-column
:index="indexMethod"
@@ -39,7 +39,7 @@ layout("/layouts/platform.html"){
size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="300">
<template scope="{row}">
<el-button size="mini" type="primary" @click="openView(row)">
@@ -53,12 +53,12 @@ layout("/layouts/platform.html"){
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<info ref="infoRef">
<div v-if="showApprovalForm">
@@ -81,13 +81,13 @@ layout("/layouts/platform.html"){
</div>
</info>
</template>
</guava>
</div>
<script>
<!--#include("../common/info.js"){}#-->
<!--#include("../common/commonQuery.js"){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
{ prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" }
],
// 审核相关
showApprovalForm: false,
formData: {
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-descriptions :column="2" border class="table_fixed">
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-descriptions :column="2" border class="table_fixed">
src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
.el-carousel__container {
height: 250px !important;
}
.one-line {
overflow: hidden;
text-overflow: ellipsis;
src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/activity/trainSignUp/statistics/info.js
+1 -1
View File
@@ -1,4 +1,4 @@
const info = {
var info = {
template: /*language=HTML*/ `
<div>
<el-tabs>
src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html
+33 -49
View File
@@ -46,14 +46,13 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item"
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}">
<div class="search-item">
<div class="search-item-label">所属工会：</div>
<div class="search-item-option">
<el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
clearable="true"
clearable
@change="flushUnits" @clear="flushUnits"
filterable="true">
filterable>
<el-option v-for="item in unions" :label="item.unionname" :value="item.id"></el-option>
</el-select>
</div>
@@ -63,8 +62,8 @@ layout("/layouts/platform.html"){
<div class="search-item-label">所属单位：</div>
<div class="search-item-option">
<el-select placeholder="所属单位" v-model="pageForm.unitId" style="width: 100%;"
clearable="true"
filterable="true">
clearable
filterable>
<el-option v-for="item in units" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
@@ -83,49 +82,41 @@ layout("/layouts/platform.html"){
</div>
</div>
<template v-if="searchMore">
<div class="search-item">
<div class="search-item-label">人员类型：</div>
<div class="search-item-option">
<dict-select v-model="pageForm.personType" style="width: 100%" clearable
placeholder="人员类型"
code="UserType"></dict-select>
</div>
<div class="search-item">
<div class="search-item-label">人员类型：</div>
<div class="search-item-option">
<dict-select v-model="pageForm.personType" style="width: 100%" clearable
placeholder="人员类型"
code="UserType"></dict-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">在职状态：</div>
<div class="search-item-option">
<dict-select v-model="pageForm.userState" style="width: 100%" clearable
placeholder="在职状态"
code="UserState"></dict-select>
</div>
<div class="search-item">
<div class="search-item-label">在职状态：</div>
<div class="search-item-option">
<dict-select v-model="pageForm.userState" style="width: 100%" clearable
placeholder="在职状态"
code="UserState"></dict-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">性&emsp;&emsp;别：</div>
<div class="search-item-option">
<el-select v-model="pageForm.sex" style="width: 100%" clearable
placeholder="请选择">
<el-option v-for="sex in sexOptions" :label="sex" :value="sex"></el-option>
</el-select>
</div>
<div class="search-item">
<div class="search-item-label">性&emsp;&emsp;别：</div>
<div class="search-item-option">
<el-select v-model="pageForm.sex" style="width: 100%" clearable
placeholder="请选择">
<el-option v-for="sex in sexOptions" :label="sex" :value="sex"></el-option>
</el-select>
</div>
</template>
</div>
<div class="search-query">
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
<more v-model="searchMore"></more>
</div>
</div>
</el-card>
<el-card shadow="never" class="mt20">
<table-tool label="用户列表" :app="this">
<template #func>
</template>
</table-tool>
<el-table :data="tableData" style="width: 100%" row-key="id" @sort-change="pageOrder"
@@ -134,7 +125,6 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" type="index" :index="indexMethod" label="序号"
width="80px"></el-table-column>
<el-table-column
align="center"
header-align="center"
@@ -147,13 +137,9 @@ layout("/layouts/platform.html"){
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
</guava>
</div>
<script>
const vue = new Vue({
@@ -192,26 +178,24 @@ layout("/layouts/platform.html"){
}
},
methods: {
async getActivityGroup() {
const {data} = await $.get('/platform/activity/basic/scope/getActivityUserScopeGroup')
this.activityGroupList = data
},
async flushUnits() {
this.$set(this.pageForm, "unitId", "")
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
this.units = await getUnits(this.pageForm.unionId)
this.$set(this.pageForm, "unitId", null)
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else {
this.units = await getUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}")
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
}
}
},
},
async created() {
await this.getActivityGroup()
this.pageData()
this.unions = await getUnions()
this.unions = await this.$businessTool.listUnion()
this.flushUnits()
}
})