commit

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -208,6 +208,10 @@ public class SysHomeController {
 //            if (!DateUtil.isIn(today, startDate, endDate)) {
 //                continue;
 //            }
+			// 只过滤结束的
+			if (DateUtil.compare(today, endDate) > 0) {
+				continue;
+			}
             Integer allowUserGroupId = activity.getAllowUserGroupId();
             String allowUserSql = activity.getAllowUserSql();
             activity.setAllowUserSql(null);

src/main/resources/views/platform/zhgh/democratic/proposal/transact/suggestion/index.html

@@ -0,0 +1,231 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    /* 提案信息卡片样式 - OA风格 */
+    .proposal-info-card {
+        background: #ffffff;
+        border: 1px solid var(--border-color-lighter);
+        margin-bottom: 20px;
+        overflow: hidden;
+    }
+
+    .proposal-info-content {
+        padding: 16px;
+        background: #fafafa;
+    }
+
+    .info-item {
+        display: flex;
+        align-items: flex-start;
+        margin-bottom: 12px;
+        line-height: 1.6;
+        padding: 8px 12px;
+        background: #ffffff;
+        border-left: 3px solid var(--color-primary-2);
+        transition: all 0.2s ease;
+    }
+
+    .info-item:hover {
+        border-left-color: var(--color-primary);
+    }
+
+    .info-item:last-child {
+        margin-bottom: 0;
+    }
+
+    .info-item label {
+        color: var(--color-text-regular);
+        font-weight: 500;
+        min-width: 80px;
+        margin-right: 12px;
+        flex-shrink: 0;
+        font-size: 13px;
+    }
+
+    .info-item span {
+        color: var(--color-text-primary);
+        word-break: break-all;
+        flex: 1;
+        font-size: 13px;
+    }
+</style>
+
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="教代会">
+                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会" style="width: 100%"
+                               v-model="pageForm.sessionId">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                                   v-for="item in sessionOptions"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="提案编号">
+                    <el-input v-model="pageForm.code" placeholder="提案编号" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
+                </search-item>
+                <search-item label="提案名称">
+                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
+                </search-item>
+                <search-item label="姓名/工号：">
+                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
+                </search-item>
+                <!--                <search-item label="提案人姓名">-->
+                <!--                    <el-input-->
+                <!--                            @keyup.enter.native="doSearch"-->
+                <!--                            clearable-->
+                <!--                            placeholder="请输入提案人姓名"-->
+                <!--                            v-model="pageForm.createUserName"-->
+                <!--                            style="width: 100%"-->
+                <!--                    ></el-input>-->
+                <!--                </search-item>-->
+                <!--                <search-item label="提案人工号">-->
+                <!--                    <el-input-->
+                <!--                            @keyup.enter.native="doSearch"-->
+                <!--                            clearable-->
+                <!--                            placeholder="请输入提案人工号"-->
+                <!--                            v-model="pageForm.createUserLoginName"-->
+                <!--                            style="width: 100%"-->
+                <!--                    ></el-input>-->
+                <!--                </search-item>-->
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool :columns.sync="tableColumns">
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :key="column.key"
+                    :min-width="column.width"
+                    :fixed="column.fixed"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                    v-if="column.visible !== false"
+                >
+                    <template v-if="column.prop === 'caseFilingResult'" scope="{row}">
+                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                  :value="row.caseFilingResult"></dict-tag>
+                    </template>
+                    <template v-else-if="column.prop === 'instanceState'" scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" min-width="100px">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button @click="openAudit(row)" size="mini" type="primary">答复</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <proposal-info ref="proposalInfoRef">
+                <div v-if="showApprovalForm">
+                    <el-form :model="formData" ref="formRef" label-width="80px" :rules="formRules" label-suffix="">
+                        <el-form-item label="承办单位">
+                            <el-input :value="formData.underTakeName" disabled></el-input>
+                        </el-form-item>
+                        <el-form-item label="落实情况" prop="tf_implementState"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <el-radio-group v-model="formData.tf_implementState" size="small">
+                                <el-radio v-for="item in dict.type.PROPOSAL_REPLY_IMPLEMENT" :label="item.code" border>
+                                    {{item.label}}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="答复内容" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <text-editor v-model="formData.tf_opinion"></text-editor>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="" size="small" type="primary">提交</el-button>
+                    </el-row>
+                </div>
+            </proposal-info>
+        </template>
+    </guava>
+
+</div>
+
+<script>
+    <!--#include('../../common/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        dicts: ["PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_REPLY_IMPLEMENT"],
+        mixins: [initTableMixins],
+        components: {
+            "proposal-info": PROPOSAL_INFO
+        },
+        data() {
+            return {
+                tableColumns: [
+                    {label: "提案编号", prop: "code"},
+                    {label: "提案名称", prop: "name", width: "200px"},
+                    {label: "提案类别", prop: "typeName"},
+                    {label: "届次", prop: "sessionName"},
+                    {label: "代表团", prop: "delegationName"},
+                    {label: "当前节点", prop: "curTaskName"},
+                    {label: "流程状态", prop: "instanceState"}
+                ],
+                pageForm: {
+                    approval: false
+                },
+                showApprovalForm: false,
+                formData: {},
+                sessionOptions: [],
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.proposalInfoRef.onOpen(row)
+                })
+            },
+
+            // 教代会
+            async meetingChange(val) {
+                this.doSearch()
+            },
+
+            // 查询开启的教代会
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                        }
+                    }
+                })
+            }
+        },
+        created() {
+            this.pageData()
+            this.listOpenSession()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/sys/home/apps.js

@@ -177,9 +177,9 @@ const apps = {
 
             // 如果是"推荐应用"分类
             if (this.currentCategoryId === "recommended") {
-                this.$axios.post("/platform/v4/apps/recommended").then((result) => {
+                this.$axios.post("/platform/home/listRecommendApp", { platform: "H5" }).then((result) => {
                     if (result.code === 0) {
-                        this.applications = result.data.list || []
+                        this.applications = result.data || []
                     } else {
                         console.error("获取推荐应用失败:", result.msg)
                     }

src/main/resources/views/platform/zhghh5/sys/home/home.js

@@ -16,7 +16,7 @@ const home = {
 
             <!--快捷入口-->
             <div class="quick-grid">
-                <div class="section-title">快速入口</div>
+                <div class="section-title">推荐服务</div>
                 <van-grid :column-num="4" icon-size="46" square clickable :border="false">
                     <van-grid-item v-for="item in quickEntries"
                                    @click="menuClick(item)"
@@ -38,10 +38,15 @@ const home = {
                             已结束
                         </van-tag>
                         
-                        <van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() < $moment(item.endDate).unix()">
+                        <van-tag class="act-item-wrapper-tag" type="success" 
+                                 v-else-if="$moment().unix() > $moment(item.startDate).unix() && $moment().unix() < $moment(item.endDate).unix()">
                             进行中
                         </van-tag>
 
+                        <van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() < $moment(item.startDate).unix()">
+                            即将开始
+                        </van-tag>
+                        
                         <div class="act-item-cover">
                             <van-image v-if="item.cover" width="120" height="84" :src="item.cover"></van-image>
                         </div>
@@ -68,7 +73,7 @@ const home = {
     },
     methods: {
         listRecommendApp() {
-            this.$axios.post("/platform/home/listRecommendApp", { platform: "H5" }).then((res) => {
+            this.$axios.post("/platform/home/listRecommendService", { platform: "H5" }).then((res) => {
                 if (res.code === 0) {
                     this.quickEntries = res.data
                 }
@@ -178,8 +183,17 @@ const home = {
         }
         
         .section-title{
-            padding: 10px 0 5px 10px;
+            padding: 0 0 5px 5px;
+            font-size: 15px;
         }
         
+        /deep/ .home__swipe img {
+            width: 100%;
+            height: 100%;
+        }
+        
+        /deep/ .act-item-cover img {
+            border-radius: 8px;
+        }
     `
 }

src/main/resources/views/platform/zhghh5/sys/home/index.html

@@ -23,10 +23,10 @@ layout("/layouts/platform_h5.html"){
         <div id="page-tarbar" class="page-tarbar">
             <van-tabbar v-model="homeTabbarActive" @change="homeTabbarChange">
                 <van-tabbar-item name="home" icon="wap-home-o">首页</van-tabbar-item>
-                <van-tabbar-item name="apps" icon="gem">应用</van-tabbar-item>
+                <van-tabbar-item name="apps" icon="apps-o">应用</van-tabbar-item>
 <!--                <van-tabbar-item name="work" icon="gem">工作台</van-tabbar-item>-->
-                <van-tabbar-item name="todo" icon="gem">待办</van-tabbar-item>
+                <van-tabbar-item name="todo" icon="records-o">待办</van-tabbar-item>
-                <van-tabbar-item name="msg" icon="gem">消息</van-tabbar-item>
+                <van-tabbar-item name="msg" icon="envelop-o">消息</van-tabbar-item>
                 <van-tabbar-item name="mine" icon="user-o">我的</van-tabbar-item>
             </van-tabbar>
         </div>

src/main/resources/views/platform/zhghh5/sys/home/mine.js

@@ -116,7 +116,7 @@ const mine = {
             }
 
             .profile-card {
-                margin: 16px;
+                margin: 10px;
                 padding: 20px;
                 background: white;
                 border-radius: 12px;
@@ -224,7 +224,7 @@ const mine = {
                 border-top: 1px solid #f5f5f5;
                 display: flex;
                 flex-direction: column;
-                gap: 16px;
+                gap: 0;
             }
 
             .info-item {
@@ -259,7 +259,7 @@ const mine = {
             }
 
             .action-cards {
-                margin: 16px;
+                margin: 10px;
                 animation: slideUp 0.3s ease-out;
             }
 

src/main/resources/views/platform/zhghh5/sys/home/msg.js

@@ -56,6 +56,7 @@ const msg= {
             <!-- 消息列表 -->
             <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
                 <van-list
+                    style="padding: 10px"
                     v-model="loading"
                     :finished="finished"
                     finished-text="没有更多了"
@@ -335,7 +336,7 @@ const msg= {
         /* 自定义消息列表项样式 */
         /deep/ .custom-message-item {
             background-color: #fff;
-            padding: 20px;
+            padding: 10px;
             margin-bottom: 8px;
             cursor: pointer;
             transition: all 0.2s ease;

src/main/resources/views/platform/zhghh5/sys/home/todo.js

@@ -219,7 +219,7 @@ const todo = {
         }
         
         /deep/ .filter-section {
-            margin-bottom: 16px;
+            /*margin-bottom: 16px;*/
         }
 
         .search-form {