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

Merge branch 'main' of https://dd3skj.picp.vip/hongqiwei/zhgh_squ

Browse Source
This commit is contained in:
=
2026-05-16 10:00:44 +08:00
parent 657e74be7a e9dd000fc9
commit a4299d4968
7 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+1 -1
View File
@@ -131,7 +131,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
:rules="[{required:[1,2].includes(formData.signUpMethod),message:'请选择报名日期',trigger:['change','blur']}]" :rules="[{required:[1,2,3].includes(formData.signUpMethod),message:'请选择报名日期',trigger:['change','blur']}]"
label="报名日期" label="报名日期"
prop="applyTime2"> prop="applyTime2">
<el-date-picker <el-date-picker
src/main/resources/views/platform/zhgh/activity/workscollection/manage/index.html
+4 -4
View File
@@ -220,9 +220,9 @@ layout("/layouts/platform.html"){
upload_result_category="interval" upload_result_category="interval"
></file-upload> ></file-upload>
</el-form-item> </el-form-item>
<el-form-item label="配色" prop="activityColor"> <!--<el-form-item label="配色" prop="activityColor">
<el-color-picker v-model="formData.activityColor" show-alpha></el-color-picker> <el-color-picker v-model="formData.activityColor" show-alpha></el-color-picker>
</el-form-item> </el-form-item>-->
<el-form-item prop="enable" label="状态"> <el-form-item prop="enable" label="状态">
<el-radio-group v-model="formData.enable" size="small"> <el-radio-group v-model="formData.enable" size="small">
<el-radio :label="true" border>开启</el-radio> <el-radio :label="true" border>开启</el-radio>
@@ -358,7 +358,7 @@ layout("/layouts/platform.html"){
allowFileTypes: [], allowFileTypes: [],
}, },
settingDialogVisible: false, settingDialogVisible: false,
colorList: ["#081776", "#31cab1", "#e54242", "#ff8939", "#ffb712", "#1dc47b", "#4495f7", "#ff5e8b", "#5d6e7f"], // colorList: ["#081776", "#31cab1", "#e54242", "#ff8939", "#ffb712", "#1dc47b", "#4495f7", "#ff5e8b", "#5d6e7f"],
pageForm: { pageForm: {
activityTime: [] activityTime: []
}, },
@@ -417,7 +417,7 @@ layout("/layouts/platform.html"){
this.$nextTick(() => { this.$nextTick(() => {
this.formData = { this.formData = {
nbCount: 0, nbCount: 0,
activityColor: this.colorList[0], // activityColor: this.colorList[0],
subjectTypes: [{worksTypes: [{}]}], subjectTypes: [{worksTypes: [{}]}],
enable: true enable: true
} }
src/main/resources/views/platform/zhgh/democratic/chairmanMailbox/query/index.html
+18 -1
View File
@@ -87,15 +87,32 @@ layout("/layouts/platform.html"){
<style> <style>
.stats-panel { .stats-panel {
display: flex; display: flex;
gap: 16px;
} }
.stats-item { .stats-item {
flex: 1; flex: 1;
text-align: center; text-align: center;
padding: 18px 16px;
border-radius: 8px;
background: #f3fafb;
box-shadow: 0 6px 18px rgba(0, 78, 100, 0.08);
}
.stats-item:nth-child(2) {
background: #fff8ee;
}
.stats-item:nth-child(3) {
background: #f1fbf6;
}
.stats-item:nth-child(4) {
background: #f7f5ff;
} }
.stats-value { .stats-value {
font-size: 24px; font-size: 26px;
font-weight: 700; font-weight: 700;
color: rgb(0, 78, 100); color: rgb(0, 78, 100);
} }
src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html
+1
View File
@@ -298,6 +298,7 @@ layout("/layouts/platform_h5.html"){
unionName: union.name, unionName: union.name,
unionId: union.id, unionId: union.id,
mobile: mobile, mobile: mobile,
childrenBirthdayDate: new Date(2000, 0, 1),
} }
} }
src/main/resources/views/platform/zhghh5/democratic/chairmanMailbox/index.html
+4 -1
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){
#--> #-->
<div id="app" v-cloak> <div id="app" v-cloak>
<van-nav-bar title="主席信箱" fixed placeholder left-text="返回" left-arrow @click-left="history.go(-1)"></van-nav-bar> <van-nav-bar title="主席信箱" fixed placeholder left-text="返回" left-arrow @click-left="backHome"></van-nav-bar>
<div class="banner-section"> <div class="banner-section">
<div class="banner-content"> <div class="banner-content">
@@ -407,6 +407,9 @@ layout("/layouts/platform_h5.html"){
} }
}, },
methods: { methods: {
backHome() {
this.$pjaxReplace('/platform/h5/home')
},
goPage(url) { goPage(url) {
this.$pjaxReplace(url) this.$pjaxReplace(url)
}, },
src/main/resources/views/platform/zhghh5/democratic/chairmanMailbox/query/index.html
+19 -2
View File
@@ -24,19 +24,36 @@ layout("/layouts/platform_h5.html"){
.stats-panel { .stats-panel {
background-color: var(--card-bg); background-color: var(--card-bg);
padding: 16px; padding: 12px;
margin-bottom: 10px; margin-bottom: 10px;
display: flex; display: flex;
gap: 8px;
justify-content: space-between; justify-content: space-between;
} }
.stats-item { .stats-item {
flex: 1; flex: 1;
text-align: center; text-align: center;
padding: 12px 4px;
border-radius: 8px;
background: #f3fafb;
box-shadow: 0 4px 12px rgba(0, 78, 100, 0.08);
}
.stats-item:nth-child(2) {
background: #fff8ee;
}
.stats-item:nth-child(3) {
background: #f1fbf6;
}
.stats-item:nth-child(4) {
background: #f7f5ff;
} }
.stats-value { .stats-value {
font-size: 20px; font-size: 22px;
font-weight: bold; font-weight: bold;
color: var(--primary-color); color: var(--primary-color);
} }
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+18 -5
View File
@@ -173,13 +173,13 @@ layout("/layouts/platform_h5.html"){
maxlength="20" maxlength="20"
clearable clearable
name="bankCardNum" name="bankCardNum"
placeholder="请填写华夏银行工资卡号" placeholder="请填写国内银行工资卡号"
:rules="[{ required: true }]" :rules="[{ required: true }]"
required required
></van-field> ></van-field>
<div style="margin-left: 10px"> <!--<div style="margin-left: 10px">
<span style="color: #bc2a25">据学校要求，请您填写【<span style="color: red;font-weight: bolder">华夏银行工资卡号</span>】为收款账户</span> <span style="color: #bc2a25">据学校要求，请您填写【<span style="color: red;font-weight: bolder">银行工资卡号</span>】为收款账户</span>
</div> </div>-->
<van-field <van-field
v-model="formData.reason" v-model="formData.reason"
@@ -310,6 +310,7 @@ layout("/layouts/platform_h5.html"){
showDialog: false, showDialog: false,
isEditing: false, isEditing: false,
editingIndex: null, editingIndex: null,
echoingFormDataFlag: false,
// 替他人申请相关 // 替他人申请相关
userSheetShow: false, userSheetShow: false,
@@ -496,12 +497,24 @@ layout("/layouts/platform_h5.html"){
findOne(id) { findOne(id) {
this.$axios.post('/platform/difficultHelp/mine/findOne', { id }).then(res => { this.$axios.post('/platform/difficultHelp/mine/findOne', { id }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.formData = res.data this.echoingFormDataFlag = true
this.formData = Object.assign({
familyList: [],
files: []
}, res.data || {})
this.$nextTick(() => {
setTimeout(() => {
this.echoingFormDataFlag = false
})
})
} }
}) })
}, },
// 申请模式 // 申请模式
modeChange(val) { modeChange(val) {
if (this.echoingFormDataFlag) {
return
}
const user = this.$store.state.user const user = this.$store.state.user
if (val === "1") { if (val === "1") {
this.$set(this.formData, 'userId', user.id) this.$set(this.formData, 'userId', user.id)