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:
=
2026-01-28 17:17:30 +08:00
parent e663f6f331 5a0d531d77
commit 8dbc5c2978
7 changed files with 196 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html
+17 -10
View File
@@ -6,13 +6,14 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card v-if="isCanApply" shadow="never">
<custom-card v-if="isCanApply">
<snaker-start slot="header" label="年度优秀协会申报" define_key="XHPY"></snaker-start>
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
<el-row :gutter="30">
<el-col :span="8">
<el-form-item label="开始年份" prop="applyStartYear" :rules="{required: true, message: '请选择开始年份', trigger: 'blur'}">
<el-form-item label="开始年份" prop="applyStartYear"
:rules="{required: true, message: '请选择开始年份', trigger: 'blur'}">
<el-date-picker
placeholder="请选择开始年份"
:clearable="false"
@@ -26,7 +27,8 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="结束年份" prop="applyEndYear" :rules="{required: true, message: '请选择结束年份', trigger: 'blur'}">
<el-form-item label="结束年份" prop="applyEndYear"
:rules="{required: true, message: '请选择结束年份', trigger: 'blur'}">
<el-date-picker
placeholder="请选择结束年份"
:clearable="false"
@@ -40,7 +42,8 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="协会名称" prop="clubId" :rules="{required: true, message: '请选择协会', trigger: 'blur'}">
<el-form-item label="协会名称" prop="clubId"
:rules="{required: true, message: '请选择协会', trigger: 'blur'}">
<el-select
v-model="formData.clubId"
placeholder="请选择协会"
@@ -49,7 +52,8 @@ layout("/layouts/platform.html"){
style="width: 100%"
:disabled="isCanApply === false"
>
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -83,16 +87,19 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row class="mt20" justify="end" type="flex">
<template slot="footer">
<el-button :disabled="isCanApply === false" type="primary" plain @click="onSave">保存</el-button>
<el-button :disabled="isCanApply === false" type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button :disabled="isCanApply === false" type="primary" @click="onSubmit" v-if="!taskId">提交
</el-button>
<el-button :disabled="isCanApply === false" type="primary" @click="onFinishTask" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
<el-card v-else shadow="never">
<el-empty style="height: 88vh" description="抱歉，当前年份不能申请，考核周期：每两年考核一次，逢双数年进行考核。"></el-empty>
<el-empty style="height: 88vh"
description="抱歉，当前年份不能申请，考核周期：每两年考核一次，逢双数年进行考核。"></el-empty>
</el-card>
</guava>
</div>
src/main/resources/views/platform/zhgh/club/examine/apply/index.html
+6 -4
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava>
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="考核登记" define_key="XHNS"></snaker-start>
<el-steps :active="registerTypeName" finish-status="success" simple>
@@ -310,7 +310,8 @@ layout("/layouts/platform.html"){
</el-form>
<el-row v-if="isRegister === false" class="mt10" justify="end" type="flex">
<template slot="footer">
<div v-if="isRegister === false">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary"
@click="registerTypeName=registerTypeName-1"
@@ -323,9 +324,10 @@ layout("/layouts/platform.html"){
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</template>
</el-row>
</div>
</template>
</el-card>
</custom-card>
</guava>
</div>
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+15 -9
View File
@@ -3,14 +3,17 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="文体协会会员申请" define_key="XHRH"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-descriptions border class="descriptions-form">
<el-descriptions-item label="协会" :span="3">
<el-form-item prop="clubId" label="协会">
<el-select v-model="formData.clubId" filterable @change="checkApplyClub" placeholder="请选择协会">
<el-option v-for="item in clubOptions" :label="item.clubName" :value="item.id" :key="item.id"></el-option>
<el-select v-model="formData.clubId" filterable @change="checkApplyClub"
placeholder="请选择协会">
<el-option v-for="item in clubOptions" :label="item.clubName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
@@ -109,21 +112,24 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="电子签名" :span="3">
<el-form-item label="电子签名" prop="signature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<el-form-item label="电子签名" prop="signature"
:rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.signature"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row class="mt20">
<el-checkbox v-model="isAgree">注：本人已仔细阅读并愿意遵守所参加本校教职工文体协会的章程和规定，自愿加入所报名协会。</el-checkbox>
<el-checkbox v-model="isAgree">
注：本人已仔细阅读并愿意遵守所参加本校教职工文体协会的章程和规定，自愿加入所报名协会。
</el-checkbox>
</el-row>
<el-row type="flex" justify="end" class="mt10">
<template slot="footer">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
</div>
<script nonce="${cspNonce!}">
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+4 -4
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<custom-card>
<!--标题-->
<snaker-start slot="header" label="注册协会" define_key="XHZC"></snaker-start>
<!--步骤条-->
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<el-row class="mt20" justify="end" type="flex">
<template slot="footer">
<el-button v-if="activeName === 1" type="primary" @click="activeName = 0">上一步</el-button>
<el-button v-if="activeName === 2" type="primary" @click="activeName = 1">上一步</el-button>
<el-button v-if="activeName === 0" type="primary" @click="nextStep">下一步</el-button>
@@ -34,8 +34,8 @@ layout("/layouts/platform.html"){
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
</div>
<script nonce="${cspNonce!}">
src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
+4 -4
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<custom-card>
<h3 style="color: var(--color-primary)" slot="header">新建投稿</h3>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="150px" label-suffix="：">
<el-form-item prop="origin" label="投稿来源">
@@ -63,12 +63,12 @@ layout("/layouts/platform.html"){
></file-upload>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<template slot="footer">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onSubmitAgain" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
</div>
<script nonce="${cspNonce!}">
src/main/resources/views/platform/zhgh/dayofficework/ghkh/xjkhzb.html
+5 -7
View File
@@ -13,8 +13,8 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<template #header>
<custom-card>
<!-- <template #header>
<div>
<h3 style="color: #1867b0">新建考核指标</h3>
</div>
@@ -22,15 +22,13 @@ layout("/layouts/platform.html"){
<el-button type="primary" @click="doAdd('save')">暂存</el-button>
<el-button type="primary" @click="doAdd('submit')">提交</el-button>
</div>
</template>
<template>
</template>-->
<kh-zb :form_data="formData" @change="v=>{this.formData=v}"></kh-zb>
<el-row type="flex" justify="end">
<template slot="footer">
<el-button type="primary" @click="doAdd('save')">暂存</el-button>
<el-button type="primary" @click="doAdd('submit')">提交</el-button>
</el-row>
</template>
</el-card>
</custom-card>
</guava>
</div>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+4 -4
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="职工慰问" define_key="ZGWW"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
@@ -192,12 +192,12 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<template slot="footer">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
</div>
<script nonce="${cspNonce!}">