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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-01-28 16:53:35 +08:00
parent b2036c1285
commit 35326ead8e
5 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+12 -12
View File
@@ -2,8 +2,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
template: /*language=HTML*/ `
<div>
<template>
<el-card shadow="never">
<snaker-start slot="header" label="文化活动申报" :define_key="activity_type===40002?'FGHWHHD':'XHWHHD'"
<custom-card>
<snaker-start slot="header" label="文化活动申报"
:define_key="activity_type===40002?'FGHWHHD':'XHWHHD'"
v-if="activity_type===40002||activity_type===40003"></snaker-start>
<el-form :model="formData" :rules="formRules" label-suffix="：" label-width="170px"
ref="addForm" v-loading="formLoading">
@@ -178,7 +179,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="hostUnitIds" label="主办单位">
<el-select v-model="formData.hostUnitIds" clearable filterable multiple
@@ -520,15 +521,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
</el-tab-pane>
</el-tabs>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button>
<template v-if="formData.isEnrollSystem">
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</template>
</el-row>
</el-card>
<template slot="footer">
<el-button type="primary" plain @click="onSave">保存</el-button>
<template v-if="formData.isEnrollSystem">
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</template>
</template>
</custom-card>
<drawer-user-scope
@group_change="getActivityGroup"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+4 -5
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
}
</style>
<div id="app">
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="活动申报" define_key="HDSB"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
@@ -187,13 +187,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!}">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+4 -5
View File
@@ -8,7 +8,7 @@ layout("/layouts/platform.html"){
</style>
<div id="app">
<div>
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="活动报销" define_key="HDBX"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
@@ -283,13 +283,12 @@ layout("/layouts/platform.html"){
</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>
<el-dialog title="申报数据" :visible.sync="declareDialogVisible" width="60%">
<div style="max-height: 68vh;overflow-y: auto">
src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
+11 -9
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<template>
<el-card shadow="never">
<custom-card>
<snaker-start slot="header" label="撰写提案" define_key="JDHTA"></snaker-start>
<template>
<el-form :model="formData" :rules="formRules" label-width="120px" ref="addForm">
@@ -153,13 +153,15 @@ layout("/layouts/platform.html"){
<!-- <pc-signature v-model="formData.signature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row justify="end" type="flex" v-if="isWriteTime">
<el-button type="primary" @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>
<template slot="footer">
<el-row v-if="isWriteTime">
<el-button type="primary" @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>
</template>
</template>
</el-card>
</custom-card>
</template>
<el-dialog title="提案撰写须知" :visible.sync="noticeDialogVisible" :show-close="false" width="50%">
@@ -260,7 +262,7 @@ layout("/layouts/platform.html"){
loading.close()
if (res.code === 0) {
this.$message.success("提交成功")
if (this.formData.source==="PERSONAL"){
if (this.formData.source === "PERSONAL") {
this.$confirm("提交成功，是否立即去邀请附议人？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -271,7 +273,7 @@ layout("/layouts/platform.html"){
this.$message.info("请到我的提案界面邀请附议人")
commonUtil.pjaxPush('/platform/proposal/mine')
})
}else{
} else {
commonUtil.pjaxPush('/platform/proposal/mine')
}
src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js
+24 -15
View File
@@ -4,7 +4,8 @@ const times = {
`
<div>
<van-action-sheet v-model="visible" title="时间段" cancel-text="取消">
<div id="mapContainer" v-if="row?.isMobileSign === true && row?.signType === 3" style="width: 100%; height: 250px"></div>
<div id="mapContainer" v-if="row?.isMobileSign === true && row?.signType === 3"
style="width: 100%; height: 250px"></div>
<button v-for="(item,index) in row?.courseTimes" type="button" class="van-action-sheet__item">
<div style="display: flex; justify-content: space-between; align-items: center">
<div>
@@ -13,21 +14,28 @@ const times = {
<label>{{ $moment(item.courseDate).format('YYYY-MM-DD') }}</label>
</div>
<div class="van-action-sheet__subname">
{{$moment(item.courseStartTime).format('MM-DD HH:mm') + ' 至 ' + $moment(item.courseEndTime).format('MM-DD HH:mm')}}
{{$moment(item.courseStartTime).format('MM-DD HH:mm') + ' 至 ' +
$moment(item.courseEndTime).format('MM-DD HH:mm')}}
</div>
</div>
<div v-if="row.isSign === true && row.isMobileSign === true" class="sign_button">
<van-button v-if="item.isAttend !== true" @click.stop="onSign(item)" size="mini" type="info">签到</van-button>
<van-button v-if="item.isAttend === true" size="mini" type="info" disabled>已签到</van-button>
<van-button
v-if="item.isAttend !== true
&&
$moment(item.courseEndTime).unix()>$moment().unix()"
@click.stop="onSign(item)" size="mini" type="info">签到
</van-button>
<van-button v-if="item.isAttend === true" size="mini" type="info" disabled>已签到
</van-button>
</div>
</div>
</button>
</van-action-sheet>
<van-popup round :safe-area-inset-bottom="true"
:close-on-click-overlay="false"
v-model="signVisible"
:style="{ width: '80%', height: '66%' }"
<van-popup round :safe-area-inset-bottom="true"
:close-on-click-overlay="false"
v-model="signVisible"
:style="{ width: '80%', height: '66%' }"
get-container="#app"
@close="onSignClose"
closeable
@@ -39,7 +47,7 @@ const times = {
store,
data() {
return {
visible:false,
visible: false,
row: null,
weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
@@ -62,8 +70,8 @@ const times = {
this.row = row
this.visible = true
this.$nextTick(() => {
if(this.row.signType === 3) {
if(this.map) this.map.destroy()
if (this.row.signType === 3) {
if (this.map) this.map.destroy()
this.initMap()
this.getLocation((coords) => {
if (coords) {
@@ -115,7 +123,8 @@ const times = {
},
getLocation(callback) {
if (typeof callback !== 'function') {
callback = () => {};
callback = () => {
};
}
if (!navigator.geolocation) {
this.$toast('当前浏览器不支持定位功能');
@@ -161,7 +170,7 @@ const times = {
);
},
initMap() {
if(!this.row.courseLocationCoordinates) {
if (!this.row.courseLocationCoordinates) {
this.$toast('未设置签到点')
return
}
@@ -210,11 +219,11 @@ const times = {
const content = jrQrcode.getQrBase64(data)
vant.ImagePreview([content])
},
onClose(){
onClose() {
this.visible = false
},
},
style: /*language=CSS*/ `
`
}