整改提案UI

2026-08-25 15:58:05 +08:00
parent e83f1317a4
commit b81c59dc86
19 changed files with 410 additions and 71 deletions
@@ -131,7 +131,8 @@ public class SysSignatureController {
    @Aop(TransAop.READ_COMMITTED)
    public Result update(@Param("file") TempFile tempFile) {
        String url = sysFileService.uploadReturnUrl(SysFileEngineTypeEnum.MINIO.getValue(), tempFile);
-        Sys_user_signature sysUserSignature = dao.fetch(Sys_user_signature.class);
+        // 签字记录必须按当前登录用户读取，避免后续用户更新时覆盖其他用户的签字。
+        Sys_user_signature sysUserSignature = dao.fetch(Sys_user_signature.class, Cnd.where(Sys_user_signature::getUserId, "=", SecurityUtil.getUserId()));
        if (ObjectUtil.isNull(sysUserSignature)) {
            sysUserSignature = new Sys_user_signature();
        }
@@ -257,10 +257,14 @@
                    window.customStyleList = document.querySelectorAll('style[id^="style-"]')
                })
                $(document).on("pjax:complete", function () {
+                    // PJAX 替换 #container 时可能已经移除旧样式节点，清理前需兼容节点脱离 DOM 的情况。
                    if (window.customStyleList) {
                        window.customStyleList.forEach((style) => {
-                            style.parentNode.removeChild(style)
+                            if (style.parentNode) {
+                                style.parentNode.removeChild(style)
+                            }
                        })
+                        window.customStyleList = null
                    }
                    NProgress.done()
                    toggleShowBar()
@@ -287,7 +291,7 @@
        })()

        function pjaxReplace(url, data = null) {
-            $.pjax({
+            return $.pjax({
                url: url,
                container: "#container",
                maxCacheLength: 0,
@@ -49,6 +49,63 @@
    column-gap: 10px;
 }

+/* 提案页面按需启用的圆角按钮与分页样式，不影响未声明对应 class 的组件。 */
+.proposal-soft-button,
+.proposal-soft-pagination {
+    --proposal-soft-primary: #1989fa;
+}
+
+/* 提案审核弹框的次要操作按钮统一使用柔和圆角，不包含阴影或漫反射效果。 */
+.proposal-rounded-button {
+    border-radius: 14px;
+}
+
+.proposal-soft-pagination {
+    column-gap: 2px;
+}
+
+.proposal-soft-button {
+    border-color: var(--proposal-soft-primary);
+    border-radius: 14px;
+    background-color: var(--proposal-soft-primary);
+}
+
+/* 保持危险操作原有红色语义。 */
+.proposal-soft-button--danger {
+    border-color: #ff4d4f;
+    background-color: #ff4d4f;
+}
+
+/* 保持退回类操作原有橙色语义。 */
+.proposal-soft-button--warning {
+    border-color: #ff976a;
+    background-color: #ff976a;
+}
+
+.proposal-soft-pagination .van-pagination__item {
+    color: var(--proposal-soft-primary);
+    background-color: #f8fbff;
+    border-radius: 12px;
+    transition: color 0.2s ease, background-color 0.2s ease;
+}
+
+.proposal-soft-pagination .van-pagination__item::after {
+    border-color: rgba(25, 137, 250, 0.16);
+    border-radius: inherit;
+}
+
+.proposal-soft-pagination .van-pagination__item--active,
+.proposal-soft-pagination .van-pagination__item:not(.van-pagination__item--disabled):active {
+    color: #fff;
+    background-color: var(--proposal-soft-primary);
+}
+
+.proposal-soft-pagination .van-pagination__item--disabled,
+.proposal-soft-pagination .van-pagination__item--disabled:active {
+    color: #646566;
+    background-color: #f7f8fa;
+}
+
 .proposal-action-icon {
    margin-right: 6px;
    font-size: 15px;
@@ -28,9 +28,9 @@ const PROPOSAL_TASK_POPUP = {
                                    </section>
                                </template>
                                <template v-if="kind === 'unitReply'">
-                                    <van-field :value="formData.underTakeName" label="承办单位" readonly></van-field>
-                                    <van-field v-model="formData.tf_implementStateName" label="落实情况" placeholder="请选择落实情况" :rules="[{required:true,message:'请选择落实情况'}]" required readonly is-link @click="openLayer('implement-picker')"></van-field>
                                    <section class="proposal-view-card">
+                                        <van-field :value="formData.underTakeName" label="承办单位" readonly></van-field>
+                                        <van-field v-model="formData.tf_implementStateName" label="落实情况" placeholder="请选择落实情况" :rules="[{required:true,message:'请选择落实情况'}]" required readonly is-link @click="openLayer('implement-picker')"></van-field>
                                        <h2 class="proposal-view-card__title">答复内容<span class="proposal-audit-card__required">*</span></h2>
                                        <van-field v-model="formData.tf_opinion" class="proposal-audit-field" name="tf_opinion" type="textarea" rows="6" label="" placeholder="请输入答复内容" :rules="[{required:true,message:'请填写答复内容'}]" required maxlength="100" show-word-limit></van-field>
                                    </section>
@@ -50,20 +50,21 @@ const PROPOSAL_TASK_POPUP = {
                                </template>
                            </van-form>
                            <div class="proposal-popup-form-actions" v-if="kind === 'delegation'">
-                                <van-button type="danger" block :loading="formLoading" @click="prepareSubmit(6)">退回</van-button><van-button type="danger" block :loading="formLoading" @click="prepareSubmit(2)">不同意</van-button><van-button type="primary" block :loading="formLoading" @click="prepareSubmit(1)">同意</van-button>
+                                <van-button type="danger" block :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="prepareSubmit(6)">退回</van-button><van-button type="danger" block :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="prepareSubmit(2)">不同意</van-button><van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="prepareSubmit(1)">同意</van-button>
                            </div>
                            <div class="proposal-popup-form-actions" v-else-if="kind === 'preAudit'" style="display:grid;grid-template-columns:repeat(2,minmax(0,1fr))">
-                                <van-button type="warning" :loading="formLoading" @click="prepareSubmit(4)">退回（不审核）</van-button><van-button type="warning" :loading="formLoading" @click="prepareSubmit(6)">退回（审核）</van-button><van-button type="danger" :loading="formLoading" @click="prepareSubmit(2)">不同意</van-button><van-button type="primary" :loading="formLoading" @click="prepareSubmit(1)">同意</van-button>
+                                <van-button type="warning" :loading="formLoading" class="proposal-soft-button proposal-soft-button--warning" @click="prepareSubmit(4)">退回（不审核）</van-button><van-button type="warning" :loading="formLoading" class="proposal-soft-button proposal-soft-button--warning" @click="prepareSubmit(6)">退回（审核）</van-button><van-button type="danger" :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="prepareSubmit(2)">不同意</van-button><van-button type="primary" :loading="formLoading" class="proposal-soft-button" @click="prepareSubmit(1)">同意</van-button>
                            </div>
-                            <div class="proposal-popup-form-actions" v-else-if="kind === 'schoolLeaderApproval'"><van-button type="danger" block :loading="formLoading" @click="prepareSubmit('back')">退回答复</van-button><van-button type="primary" block :loading="formLoading" @click="prepareSubmit('agree')">同意答复</van-button></div>
-                            <div class="proposal-popup-form-actions" v-else><van-button block :disabled="formLoading" @click="close">取消</van-button><van-button type="primary" block :loading="formLoading" @click="prepareSubmit(1)">提交</van-button></div>
+                            <div class="proposal-popup-form-actions" v-else-if="kind === 'schoolLeaderApproval'"><van-button type="danger" block :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="prepareSubmit('back')">退回答复</van-button><van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="prepareSubmit('agree')">同意答复</van-button></div>
+                            <div class="proposal-popup-form-actions" v-else><van-button block :disabled="formLoading" class="proposal-rounded-button" @click="close">取消</van-button><van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="prepareSubmit(1)">提交</van-button></div>
                        </div>
                    </proposal-info>
                </div>
            </div>
-            <van-popup v-model="feedbackPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="dict.type.PROPOSAL_FEEDBACK.map((item) => ({text:item.label,value:item.code}))" @confirm="confirmFeedback" @cancel="closeLayer('feedback-picker')"></van-picker></van-popup>
-            <van-popup v-model="resultPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="dict.type.UNDERTAKE_SUGGESTION.map((item) => item.code)" @confirm="confirmResult" @cancel="closeLayer('result-picker')"></van-picker></van-popup>
-            <van-popup v-model="implementPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="dict.type.PROPOSAL_REPLY_IMPLEMENT.map((item) => ({text:item.label,value:item.code}))" @confirm="confirmImplement" @cancel="closeLayer('implement-picker')"></van-picker></van-popup>
+            <!-- 字典通过异步请求加载，初始化阶段可能为 null；使用空数组保证弹层首次渲染不执行 null.map。 -->
+            <van-popup v-model="feedbackPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="(dict.type.PROPOSAL_FEEDBACK || []).map((item) => ({text:item.label,value:item.code}))" @confirm="confirmFeedback" @cancel="closeLayer('feedback-picker')"></van-picker></van-popup>
+            <van-popup v-model="resultPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="(dict.type.UNDERTAKE_SUGGESTION || []).map((item) => item.code)" @confirm="confirmResult" @cancel="closeLayer('result-picker')"></van-picker></van-popup>
+            <van-popup v-model="implementPickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="(dict.type.PROPOSAL_REPLY_IMPLEMENT || []).map((item) => ({text:item.label,value:item.code}))" @confirm="confirmImplement" @cancel="closeLayer('implement-picker')"></van-picker></van-popup>
            <van-popup v-model="candidatePickerVisible" position="bottom" :close-on-click-overlay="false"><van-picker show-toolbar :columns="candidates.map((item) => ({text:item.userName,value:item.userId}))" @confirm="confirmCandidate" @cancel="closeLayer('candidate-picker')"></van-picker></van-popup>
            <van-popup v-model="replyUnitPickerVisible" position="bottom" round :close-on-click-overlay="false" :style="{height:'70%'}">
                <div class="reply-unit-popup"><div class="reply-unit-toolbar"><button type="button" @click="closeLayer('reply-unit-picker')">取消</button><div class="reply-unit-toolbar-title">选择答复单位</div><button type="button" @click="confirmReplyUnits">确定</button></div>
@@ -108,7 +109,19 @@ const PROPOSAL_TASK_POPUP = {
        toggleReplyUnit(item) { const ids=[...this.pendingReplyUnitIds]; const index=ids.indexOf(item.unitId); if (index>-1) ids.splice(index,1); else ids.push(item.unitId); this.$set(this,"pendingReplyUnitIds",ids) },
        confirmReplyUnits() { this.$set(this.formData,"tf_secondReplyUnitIds",[...this.pendingReplyUnitIds]); this.closeLayer("reply-unit-picker") },
        buildCaseCheckData() { const data={...this.formData}; const units=data.tf_caseCheckNeedSecondReply === 1 ? this.replyUnitOptions.filter((item) => data.tf_secondReplyUnitIds.indexOf(item.unitId)>-1) : []; const masters=units.filter((item) => item.isMaster); const slaves=units.filter((item) => !item.isMaster); data.tf_masterUnitIds=masters.map((item) => item.unitId); data.tf_masterUnitId=data.tf_masterUnitIds[0] || ""; data.tf_masterUnitNames=masters.map((item) => item.unitName); data.tf_masterUnitName=data.tf_masterUnitNames[0] || ""; data.tf_masterUnitNameStr=data.tf_masterUnitNames.join(","); data.tf_slaveUnitIds=slaves.map((item) => item.unitId); data.tf_slaveUnitNames=slaves.map((item) => item.unitName); data.tf_slaveUnitNameStr=data.tf_slaveUnitNames.join(","); return data },
-        prepareSubmit(value) { this.$refs.formRef.validate().then(() => { this.$set(this,"pendingSubmitType",value); this.openLayer("submit-confirm") }).catch(() => {}) },
+        prepareSubmit(value) {
+            // 各办理页面提交前统一校验意见字段；空白字符按未填写处理，提示后不再打开确认弹框。
+            const opinionConfig = this.kind === "suggestion"
+                ? {field: "opinion", message: "请输入反馈意见"}
+                : this.kind === "unitReply"
+                    ? {field: "tf_opinion", message: "请填写答复内容"}
+                    : {field: "tf_opinion", message: "请填写审批意见"}
+            if (!(this.formData[opinionConfig.field] || "").trim()) {
+                this.$toast(opinionConfig.message)
+                return
+            }
+            this.$refs.formRef.validate().then(() => { this.$set(this,"pendingSubmitType",value); this.openLayer("submit-confirm") }).catch(() => {})
+        },
        /** 根据页面类型保留原接口和参数分支，成功后清理全部弹层历史并通知列表刷新。 */
        submit() {
            this.$set(this,"formLoading",true)
@@ -231,6 +231,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
    <div class="proposal-case-check-page">
@@ -2,31 +2,70 @@
 layout("/layouts/platform_h5.html"){
 #-->
 <style>
+    body { background-color: #f3f7fd; }
+    .proposal-commissioner-page { min-height: 100vh; padding-bottom: calc(24px + env(safe-area-inset-bottom)); box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-commissioner-page .van-nav-bar { background-color: #fff; }
+    .proposal-commissioner-page .van-nav-bar__title { color: #172033; font-size: 16px; font-weight: 600; }
+    .proposal-commissioner-page .van-nav-bar .van-icon, .proposal-commissioner-page .van-nav-bar__text { color: #1989fa; }
+    .proposal-commissioner-content { padding: 0 12px; }
+    .proposal-commissioner-sticky { padding: 22px 12px 1px; box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-commissioner-search { margin: 0 0 8px; padding: 0; overflow: hidden; border-radius: 12px; background-color: #fff; box-shadow: 0 5px 16px rgba(43, 73, 112, .1); }
+    .proposal-commissioner-search .van-search__content { height: 42px; padding-left: 12px; align-items: center; border-radius: 12px; background-color: #fff; }
+    .proposal-commissioner-search .van-field__control { color: #263548; font-size: 14px; }
+    .proposal-commissioner-search .van-field__control::placeholder { color: #a7b0bf; }
+    .proposal-commissioner-filter { margin: 0 0 10px; overflow: hidden; border-radius: 10px; box-shadow: 0 5px 16px rgba(43, 73, 112, .08); transition: border-radius .18s ease; }
+    .proposal-commissioner-filter.is-open { border-radius: 10px 10px 0 0; }
+    .proposal-commissioner-filter .van-dropdown-menu__bar, .proposal-commissioner-filter .van-dropdown-menu__item, .proposal-commissioner-filter .van-dropdown-menu__title { height: 44px; }
+    .proposal-commissioner-filter .van-dropdown-menu__bar { box-shadow: none; }
+    .proposal-commissioner-filter .van-dropdown-menu__item, .proposal-commissioner-filter .van-dropdown-menu__title { align-items: center; }
+    .proposal-commissioner-filter .van-dropdown-menu__item { justify-content: center; }
+    .proposal-commissioner-filter .van-dropdown-menu__title { display: inline-flex; color: #66758a; font-size: 14px; line-height: 20px; }
+    .proposal-commissioner-filter .van-dropdown-menu__title--active, .proposal-commissioner-filter .van-dropdown-item__option--active, .proposal-commissioner-filter .van-dropdown-item__option--active .van-dropdown-item__icon { color: #1989fa; }
+    .proposal-commissioner-filter .van-dropdown-menu__title--down::after { border-color: transparent transparent #1989fa #1989fa; }
+    .proposal-commissioner-filter .van-dropdown-item__content { width: calc(100% - 24px); margin: 0 12px; overflow: hidden; box-sizing: border-box; border-radius: 0 0 12px 12px; box-shadow: 0 10px 24px rgba(31, 65, 108, .14); }
+    .proposal-commissioner-filter .van-dropdown-item__option { display: flex; min-height: 48px; padding: 0 16px; align-items: center; color: #46566c; font-size: 14px; }
+    .proposal-commissioner-filter .van-cell::after { right: 16px; left: 16px; }
+    .proposal-commissioner-list .empty-state { display: none; }
+    .proposal-commissioner-empty { display: flex; min-height: 280px; padding: 46px 18px 36px; align-items: center; justify-content: center; flex-direction: column; box-sizing: border-box; text-align: center; }
+    .proposal-commissioner-empty img { display: block; width: 86%; max-width: 290px; height: auto; object-fit: contain; }
+    .proposal-commissioner-empty__title { margin-top: 14px; color: #50627a; font-size: 15px; line-height: 22px; font-weight: 600; }
+    .proposal-commissioner-empty__hint { margin-top: 5px; color: #9aa7b8; font-size: 12px; line-height: 18px; }
+    @media (max-width: 350px) { .proposal-commissioner-content, .proposal-commissioner-sticky { padding-right: 10px; padding-left: 10px; } }
+</style>
+<style id="style-proposal-commissioner-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
+    <div class="proposal-commissioner-page">
    <van-nav-bar @click-left="handlePageBack" left-arrow left-text="返回" title="委员会成员意见" placeholder
                 fixed></van-nav-bar>
    <van-sticky offset-top="46px">
+        <div class="proposal-commissioner-sticky">
        <van-search
                v-model="pageForm.name"
+                class="proposal-commissioner-search"
                :show-action="false"
                :reverse-color="false"
                input-align="left"
                placeholder="请输入提案名称搜索"
+                shape="round"
+                clearable
                @search="doSearch"
+                @clear="doSearch"
        ></van-search>
-        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+        <van-dropdown-menu class="proposal-commissioner-filter" :class="{'is-open': filterOpened}" active-color="#1989fa" :close-on-click-outside="false" :close-on-click-overlay="false">
            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
-                               @change="doSearch"></van-dropdown-item>
+                               @change="doSearch" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.approvalText" :options="approvalOptions" :multiple="false"
+                               @change="approvalChange" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item>
        </van-dropdown-menu>
-        <van-tabs v-model="pageForm.approvalText"
-                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
-            <van-tab title="已审核" name="1"></van-tab>
-            <van-tab title="未审核" name="0"></van-tab>
-        </van-tabs>
+        </div>
    </van-sticky>

+    <main class="proposal-commissioner-content"><div class="proposal-commissioner-list">
+    <!-- 列表无记录时展示与团长审核一致的提案专用空状态。 -->
+    <div v-if="pageForm.totalCount === 0" class="proposal-commissioner-empty"><img src="/assets/mobile/img/proposal/proposal-empty.png" alt="暂无提案记录插画"><div class="proposal-commissioner-empty__title">暂无提案记录</div><div class="proposal-commissioner-empty__hint">当前筛选条件下暂时没有提案</div></div>
    <table-list api="/platform/proposal/commissioner/pageData" :page_form.sync="pageForm" @ready="onReady"
                ref="tableListRef"
                title="name">
@@ -53,6 +92,7 @@ layout("/layouts/platform_h5.html"){
            </div>
        </template>
    </table-list>
+    </div></main>

    <van-popup v-model="detailVisible" class="proposal-full-popup" position="right"
               :close-on-click-overlay="false" safe-area-inset-bottom>
@@ -86,7 +126,7 @@ layout("/layouts/platform_h5.html"){
                        </van-form>
                        <div class="proposal-popup-form-actions">
                            <van-button block :disabled="formLoading" @click="closeHistoryLayer('detail')">取消</van-button>
-                            <van-button type="primary" block :loading="formLoading" @click="submitApproval">提交</van-button>
+                            <van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="submitApproval">提交</van-button>
                        </div>
                    </div>
                </proposal-info>
@@ -109,6 +149,7 @@ layout("/layouts/platform_h5.html"){
    <van-dialog :value="submitConfirmVisible" title="提示" message="您确定要提交吗？" show-cancel-button
                @confirm="confirmApproval" @cancel="closeHistoryLayer('submit-confirm')"></van-dialog>

+    </div>
 </div>
 <script nonce="${cspNonce!}">
    <!--#include("../../common/info.js"){}#-->
@@ -132,6 +173,11 @@ layout("/layouts/platform_h5.html"){
                },

                sessionOptions: [],
+                filterOpened: false,
+                approvalOptions: [
+                    {text: "未审核", value: "0"},
+                    {text: "已审核", value: "1"}
+                ],
                detailVisible: false,
                detailBizId: "",
                popupAction: "view",
@@ -183,22 +229,29 @@ layout("/layouts/platform_h5.html"){
                }
                this.historyBack()
            },
+            setFilterOpened(value) {
+                this.$set(this, "filterOpened", value)
+            },
            onReady() {
                this.listSession()
            },
+            // 审核状态下拉框使用字符串值展示，查询接口使用布尔值区分已审核和未审核。
+            approvalChange(value) {
+                this.$set(this.pageForm, "approval", value === "1")
+                this.doSearch()
+            },
            listSession() {
                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
                    if (res.code === 0) {
-                        this.sessionOptions = [
+                        this.$set(this, "sessionOptions", [
                            {
                                text: "全部届次",
                                value: null
                            }
-                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
-                        if (this.sessionOptions.length > 0) {
-                            this.pageForm.sessionId = this.sessionOptions[0].value
-                            this.doSearch()
-                        }
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id}))))
+                        // 届次接口按开始时间倒序返回，首条即最新届次；无届次时继续按全部届次查询。
+                        this.$set(this.pageForm, "sessionId", res.data.length > 0 ? res.data[0].id : null)
+                        this.doSearch()
                    }
                })
            },
@@ -231,6 +231,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
    <div class="proposal-delegation-page">
@@ -231,6 +231,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
    <div class="proposal-feedback-evaluation-page">
@@ -371,8 +372,8 @@ layout("/layouts/platform_h5.html"){
                        this.sessionOptions = [{text: "全部届次", value: null}]
                            .concat(res.data.map((item) => ({text: item.fullName, value: item.id})))
                        if (skipDefaultSearch) return
-                        // 保留反馈评价原有默认口径：首次进入查询全部届次。
-                        this.$set(this.pageForm, "sessionId", null)
+                        // 届次接口按开始时间倒序返回，首条即最新届次；无届次时继续按全部届次查询。
+                        this.$set(this.pageForm, "sessionId", res.data.length > 0 ? res.data[0].id : null)
                        this.doSearch()
                    }
                })
@@ -3,6 +3,7 @@ layout("/layouts/platform_h5.html"){
 #-->
 <style>
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->

    body {
        background-color: #f3f7fd;
@@ -49,6 +49,7 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                </van-cell-group>
                <div class="p10">
                    <van-pagination
+                            class="proposal-soft-pagination"
                            v-model="pageForm.pageNumber"
                            :total-items="pageForm.totalCount"
                            :items-per-page="pageForm.pageSize"
@@ -59,7 +60,7 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                            type="primary"
                            block
                            :disabled="pageForm.isInvite"
-                            class="mt10">
+                            class="mt10 proposal-soft-button">
                        邀请
                    </van-button>
                </div>
@@ -214,6 +214,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
    <div class="proposal-pre-audit-page">
@@ -1,16 +1,53 @@
 <!--#
 layout("/layouts/platform_h5.html"){
 #-->
+<style>
+    body { background-color: #f3f7fd; }
+    .proposal-school-leader-page { min-height: 100vh; padding-bottom: calc(24px + env(safe-area-inset-bottom)); box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-school-leader-page .van-nav-bar { background-color: #fff; }
+    .proposal-school-leader-page .van-nav-bar__title { color: #172033; font-size: 16px; font-weight: 600; }
+    .proposal-school-leader-page .van-nav-bar .van-icon, .proposal-school-leader-page .van-nav-bar__text { color: #1989fa; }
+    .proposal-school-leader-content { padding: 0 12px; }
+    .proposal-school-leader-sticky { padding: 22px 12px 1px; box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-school-leader-search { margin: 0 0 8px; padding: 0; overflow: hidden; border-radius: 12px; background-color: #fff; box-shadow: 0 5px 16px rgba(43, 73, 112, .1); }
+    .proposal-school-leader-search .van-search__content { height: 42px; padding-left: 12px; align-items: center; border-radius: 12px; background-color: #fff; }
+    .proposal-school-leader-search .van-field__control { color: #263548; font-size: 14px; }
+    .proposal-school-leader-search .van-field__control::placeholder { color: #a7b0bf; }
+    .proposal-school-leader-filter { margin: 0 0 10px; overflow: hidden; border-radius: 10px; box-shadow: 0 5px 16px rgba(43, 73, 112, .08); transition: border-radius .18s ease; }
+    .proposal-school-leader-filter.is-open { border-radius: 10px 10px 0 0; }
+    .proposal-school-leader-filter .van-dropdown-menu__bar, .proposal-school-leader-filter .van-dropdown-menu__item, .proposal-school-leader-filter .van-dropdown-menu__title { height: 44px; }
+    .proposal-school-leader-filter .van-dropdown-menu__bar { box-shadow: none; }
+    .proposal-school-leader-filter .van-dropdown-menu__item, .proposal-school-leader-filter .van-dropdown-menu__title { align-items: center; }
+    .proposal-school-leader-filter .van-dropdown-menu__item { justify-content: center; }
+    .proposal-school-leader-filter .van-dropdown-menu__title { display: inline-flex; color: #66758a; font-size: 14px; line-height: 20px; }
+    .proposal-school-leader-filter .van-dropdown-menu__title--active, .proposal-school-leader-filter .van-dropdown-item__option--active, .proposal-school-leader-filter .van-dropdown-item__option--active .van-dropdown-item__icon { color: #1989fa; }
+    .proposal-school-leader-filter .van-dropdown-menu__title--down::after { border-color: transparent transparent #1989fa #1989fa; }
+    .proposal-school-leader-filter .van-dropdown-item__content { width: calc(100% - 24px); margin: 0 12px; overflow: hidden; box-sizing: border-box; border-radius: 0 0 12px 12px; box-shadow: 0 10px 24px rgba(31, 65, 108, .14); }
+    .proposal-school-leader-filter .van-dropdown-item__option { display: flex; min-height: 48px; padding: 0 16px; align-items: center; color: #46566c; font-size: 14px; }
+    .proposal-school-leader-filter .van-cell::after { right: 16px; left: 16px; }
+    .proposal-school-leader-list .empty-state { display: none; }
+    .proposal-school-leader-empty { display: flex; min-height: 280px; padding: 46px 18px 36px; align-items: center; justify-content: center; flex-direction: column; box-sizing: border-box; text-align: center; }
+    .proposal-school-leader-empty img { display: block; width: 86%; max-width: 290px; height: auto; object-fit: contain; }
+    .proposal-school-leader-empty__title { margin-top: 14px; color: #50627a; font-size: 15px; line-height: 22px; font-weight: 600; }
+    .proposal-school-leader-empty__hint { margin-top: 5px; color: #9aa7b8; font-size: 12px; line-height: 18px; }
+    @media (max-width: 350px) { .proposal-school-leader-content, .proposal-school-leader-sticky { padding-right: 10px; padding-left: 10px; } }
+</style>
 <style id="style-proposal-school-leader-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
+    <div class="proposal-school-leader-page">
    <van-nav-bar @click-left="handlePageBack" left-arrow left-text="返回" title="分管校领导审批" placeholder fixed></van-nav-bar>
    <van-sticky offset-top="46px">
-        <van-search v-model="pageForm.name" placeholder="请输入提案名称搜索" @search="doSearch"></van-search>
-        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false"><van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" @change="doSearch"></van-dropdown-item></van-dropdown-menu>
-        <van-tabs v-model="pageForm.approvalText" @change="approvalChange"><van-tab title="已审核" name="1"></van-tab><van-tab title="未审核" name="0"></van-tab></van-tabs>
+        <div class="proposal-school-leader-sticky">
+        <van-search v-model="pageForm.name" class="proposal-school-leader-search" placeholder="请输入提案名称搜索" shape="round" clearable @search="doSearch" @clear="doSearch"></van-search>
+        <van-dropdown-menu class="proposal-school-leader-filter" :class="{'is-open': filterOpened}" active-color="#1989fa" :close-on-click-outside="false" :close-on-click-overlay="false"><van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false" @change="doSearch" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item><van-dropdown-item v-model="pageForm.approvalText" :options="approvalOptions" :multiple="false" @change="approvalChange" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item></van-dropdown-menu>
+        </div>
    </van-sticky>
+    <main class="proposal-school-leader-content"><div class="proposal-school-leader-list">
+    <!-- 列表无记录时展示与团长审核一致的提案专用空状态。 -->
+    <div v-if="pageForm.totalCount === 0" class="proposal-school-leader-empty"><img src="/assets/mobile/img/proposal/proposal-empty.png" alt="暂无提案记录插画"><div class="proposal-school-leader-empty__title">暂无提案记录</div><div class="proposal-school-leader-empty__hint">当前筛选条件下暂时没有提案</div></div>
    <table-list api="/platform/proposal/schoolLeaderApproval/pageData" :page_form.sync="pageForm" @ready="onReady" ref="tableListRef" title="name">
        <template v-slot="{row}"><table-column label="提案编号">{{row.code}}</table-column><table-column label="提案类别">{{row.typeName}}</table-column><table-column label="提案人">{{row.createUserName}}</table-column><table-column label="代表团">{{row.delegationName}}</table-column><table-column label="当前节点">{{row.curTaskName}}</table-column></template>
        <template #actions="{row}">
@@ -19,22 +56,24 @@ layout("/layouts/platform_h5.html"){
            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)"><van-icon class="proposal-action-icon" name="revoke"></van-icon><span>撤回</span></div>
        </template>
    </table-list>
+    </div></main>
    <van-popup v-model="detailVisible" position="right" class="proposal-full-popup" :close-on-click-overlay="false" get-container="#app">
        <div class="proposal-full-popup__page"><van-nav-bar @click-left="closeDetail" left-arrow left-text="返回" :title="popupTitle" placeholder fixed></van-nav-bar>
            <div class="proposal-full-popup__scroll"><proposal-info v-if="detailBizId" :biz-id="detailBizId" :visible="detailVisible">
                <div v-if="isApproval"><van-form ref="formRef"><section class="proposal-view-card"><h2 class="proposal-view-card__title">审批意见<span class="proposal-audit-card__required">*</span></h2><van-field v-model="formData.tf_opinion" class="proposal-audit-field" name="tf_opinion" type="textarea" rows="6" label="" placeholder="请输入审批意见" :rules="[{required:true,message:'请填写审批意见'}]" required maxlength="100" show-word-limit></van-field></section></van-form>
-                    <div class="proposal-popup-form-actions"><van-button type="danger" block :loading="formLoading" @click="handleTaskAction('back')">退回答复</van-button><van-button type="primary" block :loading="formLoading" @click="handleTaskAction('agree')">同意答复</van-button></div>
+                    <div class="proposal-popup-form-actions"><van-button type="danger" block :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="handleTaskAction('back')">退回答复</van-button><van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="handleTaskAction('agree')">同意答复</van-button></div>
                </div>
            </proposal-info></div>
        </div>
    </van-popup>
    <van-dialog :value="submitConfirmVisible" title="提示" message="您确定要提交吗？" show-cancel-button @confirm="confirmTaskAction" @cancel="closeSubmitConfirm"></van-dialog>
+    </div>
 </div>
 <script nonce="${cspNonce!}">
    <!--#include("../../common/info.js"){}#-->
    new Vue({
        el: "#app", store, components: {"proposal-info": PROPOSAL_INFO},
-        data() { return {pageForm:{pageNumber:1,pageSize:10,totalCount:0,name:null,sessionId:null,approvalText:"0",approval:false},sessionOptions:[],detailVisible:false,detailBizId:"",action:"view",formData:{},formLoading:false,submitConfirmVisible:false,pendingSubmitType:"",historyLayerPageKey:"proposal-school-leader-approval"} },
+        data() { return {pageForm:{pageNumber:1,pageSize:10,totalCount:0,name:null,sessionId:null,approvalText:"0",approval:false},sessionOptions:[],filterOpened:false,approvalOptions:[{text:"未审核",value:"0"},{text:"已审核",value:"1"}],detailVisible:false,detailBizId:"",action:"view",formData:{},formLoading:false,submitConfirmVisible:false,pendingSubmitType:"",historyLayerPageKey:"proposal-school-leader-approval"} },
        computed: {isApproval() { return this.action === "approval" }, popupTitle() { return this.isApproval ? "分管校领导审批" : "提案详情" }},
        methods: {
            registerHistoryLayers() { window.h5HistoryLayerManager.register(this.historyLayerPageKey, (stack) => { this.$set(this,"detailVisible",stack.includes("detail")); this.$set(this,"submitConfirmVisible",stack.includes("submit-confirm")) }) },
@@ -42,8 +81,9 @@ layout("/layouts/platform_h5.html"){
            closeHistoryLayer(name,callback) { window.h5HistoryLayerManager.close(name,callback) },
            handlePageBack() { if (window.h5HistoryLayerManager.stack.length) { window.h5HistoryLayerManager.close(); return } historyBack() },
            closeDetail() { this.closeHistoryLayer("detail") }, closeSubmitConfirm() { this.closeHistoryLayer("submit-confirm") },
+            setFilterOpened(value) { this.$set(this,"filterOpened",value) },
            approvalChange(value) { this.$set(this.pageForm,"approval",value === "1"); this.doSearch() }, onReady() { this.listSession() },
-            listSession() { this.$axios.post("/platform/proposal/common/listSession").then((res) => { if (res.code !== 0) return; this.$set(this,"sessionOptions",[{text:"全部届次",value:null}].concat(res.data.map((v) => ({text:v.fullName,value:v.id})))); this.$set(this.pageForm,"sessionId",this.sessionOptions[0].value); this.doSearch() }) },
+            listSession() { this.$axios.post("/platform/proposal/common/listSession").then((res) => { if (res.code !== 0) return; this.$set(this,"sessionOptions",[{text:"全部届次",value:null}].concat(res.data.map((v) => ({text:v.fullName,value:v.id})))); this.$set(this.pageForm,"sessionId",res.data.length > 0 ? res.data[0].id : null); this.doSearch() }) },
            onView(row) { this.$set(this,"detailBizId",row.id); this.$set(this,"action","view"); this.$set(this,"formData",{}); this.openHistoryLayer("detail") },
            onApproval(row) { this.$set(this,"detailBizId",row.id); this.$set(this,"action","approval"); this.$set(this,"formData",{processTaskId:row.taskId,taskKey:row.taskKey || "",taskName:row.taskName || "分管校领导审批",proposalId:row.id,tf_opinion:""}); this.openHistoryLayer("detail") },
            /** val 为 back 或 agree，确认后提交分管校领导审批接口。 */
@@ -3,6 +3,7 @@ layout("/layouts/platform_h5.html"){
 #-->
 <style>
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->

    body {
        background-color: #f3f7fd;
@@ -410,8 +411,8 @@ layout("/layouts/platform_h5.html"){
                                </van-form>
                            </section>
                            <div class="proposal-seconded-form-actions">
-                                <van-button type="danger" block :loading="formLoading" @click="submitSeconded(false)">不同意</van-button>
-                                <van-button type="primary" block :loading="formLoading" @click="submitSeconded(true)">同意</van-button>
+                                <van-button type="danger" block :loading="formLoading" class="proposal-soft-button proposal-soft-button--danger" @click="submitSeconded(false)">不同意</van-button>
+                                <van-button type="primary" block :loading="formLoading" class="proposal-soft-button" @click="submitSeconded(true)">同意</van-button>
                            </div>
                        </div>
                    </proposal-info>
@@ -2,38 +2,75 @@
 layout("/layouts/platform_h5.html"){
 #-->

-<style scoped>
+<style>
+    body { background-color: #f3f7fd; }
+    .proposal-suggestion-page { min-height: 100vh; padding-bottom: calc(24px + env(safe-area-inset-bottom)); box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-suggestion-page .van-nav-bar { background-color: #fff; }
+    .proposal-suggestion-page .van-nav-bar__title { color: #172033; font-size: 16px; font-weight: 600; }
+    .proposal-suggestion-page .van-nav-bar .van-icon, .proposal-suggestion-page .van-nav-bar__text { color: #1989fa; }
+    .proposal-suggestion-content { padding: 0 12px; }
+    .proposal-suggestion-sticky { padding: 22px 12px 1px; box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-suggestion-search { margin: 0 0 8px; padding: 0; overflow: hidden; border-radius: 12px; background-color: #fff; box-shadow: 0 5px 16px rgba(43, 73, 112, .1); }
+    .proposal-suggestion-search .van-search__content { height: 42px; padding-left: 12px; align-items: center; border-radius: 12px; background-color: #fff; }
+    .proposal-suggestion-search .van-field__control { color: #263548; font-size: 14px; }
+    .proposal-suggestion-search .van-field__control::placeholder { color: #a7b0bf; }
+    .proposal-suggestion-filter { margin: 0 0 10px; overflow: hidden; border-radius: 10px; box-shadow: 0 5px 16px rgba(43, 73, 112, .08); transition: border-radius .18s ease; }
+    .proposal-suggestion-filter.is-open { border-radius: 10px 10px 0 0; }
+    .proposal-suggestion-filter .van-dropdown-menu__bar, .proposal-suggestion-filter .van-dropdown-menu__item, .proposal-suggestion-filter .van-dropdown-menu__title { height: 44px; }
+    .proposal-suggestion-filter .van-dropdown-menu__bar { box-shadow: none; }
+    .proposal-suggestion-filter .van-dropdown-menu__item, .proposal-suggestion-filter .van-dropdown-menu__title { align-items: center; }
+    .proposal-suggestion-filter .van-dropdown-menu__item { justify-content: center; }
+    .proposal-suggestion-filter .van-dropdown-menu__title { display: inline-flex; color: #66758a; font-size: 14px; line-height: 20px; }
+    .proposal-suggestion-filter .van-dropdown-menu__title--active, .proposal-suggestion-filter .van-dropdown-item__option--active, .proposal-suggestion-filter .van-dropdown-item__option--active .van-dropdown-item__icon { color: #1989fa; }
+    .proposal-suggestion-filter .van-dropdown-menu__title--down::after { border-color: transparent transparent #1989fa #1989fa; }
+    .proposal-suggestion-filter .van-dropdown-item__content { width: calc(100% - 24px); margin: 0 12px; overflow: hidden; box-sizing: border-box; border-radius: 0 0 12px 12px; box-shadow: 0 10px 24px rgba(31, 65, 108, .14); }
+    .proposal-suggestion-filter .van-dropdown-item__option { display: flex; min-height: 48px; padding: 0 16px; align-items: center; color: #46566c; font-size: 14px; }
+    .proposal-suggestion-filter .van-cell::after { right: 16px; left: 16px; }
+    .proposal-suggestion-list .empty-state { display: none; }
+    .proposal-suggestion-empty { display: flex; min-height: 280px; padding: 46px 18px 36px; align-items: center; justify-content: center; flex-direction: column; box-sizing: border-box; text-align: center; }
+    .proposal-suggestion-empty img { display: block; width: 86%; max-width: 290px; height: auto; object-fit: contain; }
+    .proposal-suggestion-empty__title { margin-top: 14px; color: #50627a; font-size: 15px; line-height: 22px; font-weight: 600; }
+    .proposal-suggestion-empty__hint { margin-top: 5px; color: #9aa7b8; font-size: 12px; line-height: 18px; }
    .van-button--small {
        height: 26px;
    }
+    @media (max-width: 350px) { .proposal-suggestion-content, .proposal-suggestion-sticky { padding-right: 10px; padding-left: 10px; } }
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>

 <div id="app">
+    <div class="proposal-suggestion-page">
    <van-nav-bar title="承办单位意见" left-text="返回" left-arrow @click-left="handlePageBack" fixed placeholder></van-nav-bar>

    <van-sticky offset-top="46px">
+        <div class="proposal-suggestion-sticky">
        <van-search
            v-model="pageForm.name"
+            class="proposal-suggestion-search"
            :show-action="false"
            :reverse-color="false"
            input-align="left"
            placeholder="请输入提案名称搜索"
+            shape="round"
+            clearable
            @search="doSearch"
+            @clear="doSearch"
        ></van-search>
-        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+        <van-dropdown-menu class="proposal-suggestion-filter" :class="{'is-open': filterOpened}" active-color="#1989fa" :close-on-click-outside="false" :close-on-click-overlay="false">
            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
-                               @change="doSearch"></van-dropdown-item>
+                               @change="doSearch" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.approvalText" :options="approvalOptions" :multiple="false"
+                               @change="approvalChange" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item>
        </van-dropdown-menu>
-        <van-tabs v-model="pageForm.approvalText"
-                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
-            <van-tab title="已反馈" name="1"></van-tab>
-            <van-tab title="未反馈" name="0"></van-tab>
-        </van-tabs>
+        </div>
    </van-sticky>

+    <main class="proposal-suggestion-content"><div class="proposal-suggestion-list">
+    <!-- 列表无记录时展示与团长审核一致的提案专用空状态。 -->
+    <div v-if="pageForm.totalCount === 0" class="proposal-suggestion-empty"><img src="/assets/mobile/img/proposal/proposal-empty.png" alt="暂无提案记录插画"><div class="proposal-suggestion-empty__title">暂无提案记录</div><div class="proposal-suggestion-empty__hint">当前筛选条件下暂时没有提案</div></div>
    <table-list api="/platform/proposal/suggestion/pageData" :page_form.sync="pageForm" ref="tableListRef" title="name" @ready="onReady">
        <template v-slot="{index,row}">
            <table-column label="提案编号">{{row.code}}</table-column>
@@ -59,6 +96,7 @@ layout("/layouts/platform_h5.html"){
            </div>
        </template>
    </table-list>
+    </div></main>

    <van-popup v-model="visible" position="right" class="proposal-full-popup" :close-on-click-overlay="false" get-container="#app">
        <div class="proposal-full-popup__page">
@@ -85,6 +123,7 @@ layout("/layouts/platform_h5.html"){
        </div>
    </van-popup>
    <proposal-task-popup ref="taskPopup" kind="suggestion" page-key="proposal-suggestion-task" @success="doSearch"></proposal-task-popup>
+    </div>
 </div>

 <script nonce="${cspNonce!}">
@@ -107,6 +146,11 @@ layout("/layouts/platform_h5.html"){
                },

                sessionOptions: [],
+                filterOpened: false,
+                approvalOptions: [
+                    {text: "未反馈", value: "0"},
+                    {text: "已反馈", value: "1"}
+                ],
                suggestionList: [],
                visible: false,
                historyLayerPageKey: "proposal-suggestion-list"
@@ -116,6 +160,7 @@ layout("/layouts/platform_h5.html"){
            registerHistoryLayers() { window.h5HistoryLayerManager.register(this.historyLayerPageKey, (stack) => this.$set(this, "visible", stack.includes("opinions"))) },
            handlePageBack() { if (window.h5HistoryLayerManager.stack.length) { window.h5HistoryLayerManager.close(); return } historyBack() },
            closeSuggestion() { window.h5HistoryLayerManager.close("opinions") },
+            setFilterOpened(value) { this.$set(this, "filterOpened", value) },
            onDelete(row) {
                this.$dialog.confirm({
                    title: "提示",
@@ -152,19 +197,23 @@ layout("/layouts/platform_h5.html"){
            onReady() {
                this.listSession()
            },
+            // 反馈状态下拉框使用字符串值展示，查询接口使用布尔值区分已反馈和未反馈。
+            approvalChange(value) {
+                this.$set(this.pageForm, "approval", value === "1")
+                this.doSearch()
+            },
            listSession() {
                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
                    if (res.code === 0) {
-                        this.sessionOptions = [
+                        this.$set(this, "sessionOptions", [
                            {
                                text: "全部届次",
                                value: null
                            }
-                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
-                        if (this.sessionOptions.length > 0) {
-                            this.pageForm.sessionId = this.sessionOptions[0].value
-                            this.doSearch()
-                        }
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id}))))
+                        // 届次接口按开始时间倒序返回，首条即最新届次；无届次时继续按全部届次查询。
+                        this.$set(this.pageForm, "sessionId", res.data.length > 0 ? res.data[0].id : null)
+                        this.doSearch()
                    }
                })
            },
@@ -0,0 +1,17 @@
+/* 提案办理页统一使用 #1989fa 品牌蓝，并覆盖动态弹框及 Vant 组件继承的全局主题色。 */
+:root {
+    --color-primary: #1989fa;
+}
+
+/* 公共提案详情组件拥有独立主题变量，需要在办理页内同步覆盖。 */
+.proposal-view {
+    --proposal-view-primary: #1989fa;
+}
+
+.proposal-flow-node__icon {
+    box-shadow: 0 2px 7px rgba(25, 137, 250, 0.22);
+}
+
+.proposal-flow-node.is-active .proposal-flow-node__icon {
+    box-shadow: 0 0 0 5px #e7f2ff, 0 3px 9px rgba(25, 137, 250, 0.28);
+}
@@ -221,6 +221,22 @@ layout("/layouts/platform_h5.html"){
        white-space: nowrap;
    }

+    /* 转办弹框底部直接使用页面浅蓝底色承载操作按钮，避免出现独立白色操作栏。 */
+    .proposal-full-popup__page > .button-group.proposal-transfer-button-group {
+        background: transparent;
+    }
+
+    .proposal-transfer-button-group .van-button {
+        border-radius: 14px;
+    }
+
+    .proposal-transfer-button-group .proposal-transfer-cancel-button {
+        border-color: transparent;
+        color: #46566c;
+        background-color: rgba(255, 255, 255, .78);
+        box-shadow: 0 4px 12px rgba(43, 73, 112, .08), inset 0 1px 1px rgba(255, 255, 255, .82);
+    }
+
    @media (max-width: 350px) {
        .proposal-unit-reply-content,
        .proposal-unit-reply-sticky {
@@ -231,6 +247,7 @@ layout("/layouts/platform_h5.html"){
 </style>
 <style id="style-proposal-task-popup-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
    <div class="proposal-unit-reply-page">
@@ -385,8 +402,8 @@ layout("/layouts/platform_h5.html"){
                        this.sessionOptions = [{text: "全部届次", value: null}]
                            .concat(res.data.map((item) => ({text: item.fullName, value: item.id})))
                        if (skipDefaultSearch) return
-                        // 保留承办单位答复原有默认口径：首次进入查询全部届次。
-                        this.$set(this.pageForm, "sessionId", null)
+                        // 届次接口按开始时间倒序返回，首条即最新届次；无届次时继续按全部届次查询。
+                        this.$set(this.pageForm, "sessionId", res.data.length > 0 ? res.data[0].id : null)
                        this.doSearch()
                    }
                })
@@ -9,14 +9,23 @@ const transfer = {
                        <div class="info-item"><label>提案名称：</label><span>{{transferForm.name}}</span></div>
                        <div class="info-item"><label>代表团：</label><span>{{transferForm.delegationName}}</span></div>
                    </div>
-                    <van-field v-model="searchKeyword" label="转交给" placeholder="搜索用户" required readonly is-link @click="openUserList"></van-field>
+                    <div class="proposal-info-card">
+                        <van-field v-model="searchKeyword" label="转交给" placeholder="搜索用户" required readonly is-link @click="openUserList"></van-field>
+                    </div>
                </div>
-                <div class="button-group"><van-button block plain @click="closeTransfer">取消</van-button><van-button block type="info" @click="handleTransfer">提交</van-button></div>
+                <div class="button-group proposal-transfer-button-group"><van-button block plain class="proposal-transfer-cancel-button" @click="closeTransfer">取消</van-button><van-button block type="info" class="proposal-soft-button" @click="handleTransfer">提交</van-button></div>
            </div>
-            <van-popup v-model="showUserList" position="bottom" :close-on-click-overlay="false">
-                <van-search v-model="keyword" placeholder="搜索用户" @search="selectTransferUser(keyword)" @cancel="closeUserList"></van-search>
-                <van-empty v-if="transferUserOptions.length === 0" class="empty-tip">请搜索需要转办的用户</van-empty>
-                <van-cell v-for="item in transferUserOptions" :key="item.id" :title="item.username" @click="selectUser(item)"></van-cell>
+            <van-popup v-model="showUserList" position="right" class="proposal-full-popup" :close-on-click-overlay="false" get-container="#app">
+                <div class="proposal-full-popup__page">
+                    <van-nav-bar @click-left="closeUserList" left-arrow left-text="返回" title="选择转交人" placeholder fixed></van-nav-bar>
+                    <div class="proposal-full-popup__scroll">
+                        <van-search v-model="keyword" placeholder="搜索用户" @search="selectTransferUser(keyword)"></van-search>
+                        <div class="proposal-view-main">
+                            <div v-if="transferUserOptions.length" class="proposal-info-card"><van-cell v-for="item in transferUserOptions" :key="item.id" :title="item.username" @click="selectUser(item)"></van-cell></div>
+                            <van-empty v-else class="empty-tip">请搜索需要转办的用户</van-empty>
+                        </div>
+                    </div>
+                </div>
            </van-popup>
            <van-dialog :value="confirmVisible" title="提示" :message="confirmMessage" show-cancel-button @confirm="confirmTransfer" @cancel="closeConfirm"></van-dialog>
        </van-popup>
@@ -2,30 +2,72 @@
 layout("/layouts/platform_h5.html"){
 #-->
 <style>
+    body { background-color: #f3f7fd; }
+    .proposal-vice-delegation-page { min-height: 100vh; padding-bottom: calc(24px + env(safe-area-inset-bottom)); box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-vice-delegation-page .van-nav-bar { background-color: #fff; }
+    .proposal-vice-delegation-page .van-nav-bar__title { color: #172033; font-size: 16px; font-weight: 600; }
+    .proposal-vice-delegation-page .van-nav-bar .van-icon, .proposal-vice-delegation-page .van-nav-bar__text { color: #1989fa; }
+    .proposal-vice-delegation-content { padding: 0 12px; }
+    .proposal-vice-delegation-sticky { padding: 22px 12px 1px; box-sizing: border-box; background-color: #f3f7fd; }
+    .proposal-vice-delegation-search { margin: 0 0 8px; padding: 0; overflow: hidden; border-radius: 12px; background-color: #fff; box-shadow: 0 5px 16px rgba(43, 73, 112, .1); }
+    .proposal-vice-delegation-search .van-search__content { height: 42px; padding-left: 12px; align-items: center; border-radius: 12px; background-color: #fff; }
+    .proposal-vice-delegation-search .van-field__control { color: #263548; font-size: 14px; }
+    .proposal-vice-delegation-search .van-field__control::placeholder { color: #a7b0bf; }
+    .proposal-vice-delegation-filter { margin: 0 0 10px; overflow: hidden; border-radius: 10px; box-shadow: 0 5px 16px rgba(43, 73, 112, .08); transition: border-radius .18s ease; }
+    .proposal-vice-delegation-filter.is-open { border-radius: 10px 10px 0 0; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__bar, .proposal-vice-delegation-filter .van-dropdown-menu__item, .proposal-vice-delegation-filter .van-dropdown-menu__title { height: 44px; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__bar { box-shadow: none; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__item, .proposal-vice-delegation-filter .van-dropdown-menu__title { align-items: center; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__item { justify-content: center; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__title { display: inline-flex; color: #66758a; font-size: 14px; line-height: 20px; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__title--active, .proposal-vice-delegation-filter .van-dropdown-item__option--active, .proposal-vice-delegation-filter .van-dropdown-item__option--active .van-dropdown-item__icon { color: #1989fa; }
+    .proposal-vice-delegation-filter .van-dropdown-menu__title--down::after { border-color: transparent transparent #1989fa #1989fa; }
+    .proposal-vice-delegation-filter .van-dropdown-item__content { width: calc(100% - 24px); margin: 0 12px; overflow: hidden; box-sizing: border-box; border-radius: 0 0 12px 12px; box-shadow: 0 10px 24px rgba(31, 65, 108, .14); }
+    .proposal-vice-delegation-filter .van-dropdown-item__option { display: flex; min-height: 48px; padding: 0 16px; align-items: center; color: #46566c; font-size: 14px; }
+    .proposal-vice-delegation-filter .van-cell::after { right: 16px; left: 16px; }
+    .proposal-vice-delegation-list .empty-state { display: none; }
+    .proposal-vice-delegation-empty { display: flex; min-height: 280px; padding: 46px 18px 36px; align-items: center; justify-content: center; flex-direction: column; box-sizing: border-box; text-align: center; }
+    .proposal-vice-delegation-empty img { display: block; width: 86%; max-width: 290px; height: auto; object-fit: contain; }
+    .proposal-vice-delegation-empty__title { margin-top: 14px; color: #50627a; font-size: 15px; line-height: 22px; font-weight: 600; }
+    .proposal-vice-delegation-empty__hint { margin-top: 5px; color: #9aa7b8; font-size: 12px; line-height: 18px; }
+    @media (max-width: 350px) { .proposal-vice-delegation-content, .proposal-vice-delegation-sticky { padding-right: 10px; padding-left: 10px; } }
+</style>
+<style id="style-proposal-vice-delegation-h5">
    <!--#include("../../common/info.css"){}#-->
+    <!--#include("../theme.css"){}#-->
 </style>
 <div id="app" v-cloak>
+    <div class="proposal-vice-delegation-page">
    <van-nav-bar @click-left="handlePageBack" left-arrow left-text="返回" title="团长审核" placeholder fixed></van-nav-bar>
    <van-sticky offset-top="46px">
+        <div class="proposal-vice-delegation-sticky">
        <van-search
                v-model="pageForm.name"
+                class="proposal-vice-delegation-search"
                :show-action="false"
                :reverse-color="false"
                input-align="left"
                placeholder="请输入提案名称搜索"
+                shape="round"
+                clearable
                @search="doSearch"
+                @clear="doSearch"
        ></van-search>
-        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+        <van-dropdown-menu class="proposal-vice-delegation-filter" :class="{'is-open': filterOpened}" active-color="#1989fa" :close-on-click-outside="false" :close-on-click-overlay="false">
            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
-                               @change="doSearch"></van-dropdown-item>
+                               @change="doSearch" @open="setFilterOpened(true)" @close="setFilterOpened(false)"></van-dropdown-item>
        </van-dropdown-menu>
 <!--        <van-tabs v-model="pageForm.approvalText"-->
 <!--                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">-->
 <!--            <van-tab title="已审核" name="1"></van-tab>-->
 <!--            <van-tab title="未审核" name="0"></van-tab>-->
 <!--        </van-tabs>-->
+        </div>
    </van-sticky>

+    <main class="proposal-vice-delegation-content"><div class="proposal-vice-delegation-list">
+    <!-- 列表无记录时展示与团长审核一致的提案专用空状态。 -->
+    <div v-if="pageForm.totalCount === 0" class="proposal-vice-delegation-empty"><img src="/assets/mobile/img/proposal/proposal-empty.png" alt="暂无提案记录插画"><div class="proposal-vice-delegation-empty__title">暂无提案记录</div><div class="proposal-vice-delegation-empty__hint">当前筛选条件下暂时没有提案</div></div>
    <table-list api="/platform/proposal/vice/delegation/pageData" :page_form.sync="pageForm" @ready="onReady"
                ref="tableListRef"
                title="name">
@@ -43,6 +85,7 @@ layout("/layouts/platform_h5.html"){
            </div>
        </template>
    </table-list>
+    </div></main>

    <van-popup v-model="detailVisible" class="proposal-full-popup" position="right"
               :close-on-click-overlay="false" safe-area-inset-bottom>
@@ -54,7 +97,7 @@ layout("/layouts/platform_h5.html"){
            </div>
        </div>
    </van-popup>
-
+    </div>
 </div>
 <script nonce="${cspNonce!}">
    <!--#include("../../common/info.js"){}#-->
@@ -77,6 +120,7 @@ layout("/layouts/platform_h5.html"){
                },

                sessionOptions: [],
+                filterOpened: false,
                formData: {},
                showApprovalForm: false,
                detailVisible: false,
@@ -106,6 +150,9 @@ layout("/layouts/platform_h5.html"){
                }
                this.historyBack()
            },
+            setFilterOpened(value) {
+                this.$set(this, "filterOpened", value)
+            },
            onReady() {
                this.listSession()
            },
@@ -3,8 +3,10 @@ layout("/layouts/platform_h5.html"){
 #-->

 <style id="style-proposal-write-h5">
+    <!--#include("../theme.css"){}#-->
+
    .proposal-write-page {
-        --proposal-primary: #1677ee;
+        --proposal-primary: #1989fa;
        --proposal-text: #263548;
        --proposal-muted: #8995a5;
        min-height: 100%;
@@ -90,7 +92,7 @@ layout("/layouts/platform_h5.html"){
    }

    .proposal-notice__title {
-        color: #3673bd;
+        color: #1989fa;
        font-size: 12px;
        line-height: 18px;
        font-weight: 600;
@@ -237,8 +239,8 @@ layout("/layouts/platform_h5.html"){
    .proposal-actions .van-button:last-child {
        flex: 1.08;
        border-color: var(--proposal-primary);
+        border-radius: 14px;
        background: var(--proposal-primary);
-        box-shadow: 0 4px 10px rgba(22, 119, 238, 0.18);
    }

    .proposal-actions .van-icon {
@@ -804,7 +806,7 @@ layout("/layouts/platform_h5.html"){
                            this.$toast.clear();
                            if (res.code === 0) {
                                this.$toast.success(res.msg);
-                                pjaxReplace('/platform/proposal/mine/h5')
+                                return this.navigateToMine();
                            } else {
                                this.$toast.fail(res.msg || '保存失败');
                            }
@@ -840,6 +842,31 @@ layout("/layouts/platform_h5.html"){
                return true;
            },

+            // 提交成功后等待提示和 PJAX 跳转完成，避免跳转期间提前解除按钮的 loading 状态。
+            navigateToMine(delay = 0) {
+                return new Promise((resolve, reject) => {
+                    const navigate = () => {
+                        let request;
+                        try {
+                            request = pjaxReplace('/platform/proposal/mine/h5');
+                        } catch (error) {
+                            reject(error);
+                            return;
+                        }
+                        if (request && typeof request.then === 'function') {
+                            request.then(resolve, reject);
+                        } else {
+                            resolve();
+                        }
+                    };
+                    if (delay > 0) {
+                        setTimeout(navigate, delay);
+                    } else {
+                        navigate();
+                    }
+                });
+            },
+
            // 首次提交：info 为完整提案 JSON，成功后进入提案流程并返回我的提案。
            onSubmit() {
                if (this.formLoading) {
@@ -865,7 +892,7 @@ layout("/layouts/platform_h5.html"){
                                this.$toast.clear();
                                if (res.code === 0) {
                                    this.$toast.success("提交成功");
-                                    pjaxReplace('/platform/proposal/mine/h5')
+                                    return this.navigateToMine();
                                } else {
                                    this.$toast.fail(res.msg || '提交失败');
                                }
@@ -912,9 +939,7 @@ layout("/layouts/platform_h5.html"){
                            this.$toast.clear();
                            if (res.code === 0) {
                                this.$toast.success("提交成功");
-                                setTimeout(() => {
-                                    pjaxReplace('/platform/proposal/mine/h5')
-                                }, 1500);
+                                return this.navigateToMine(1500);
                            } else {
                                this.$toast.fail(res.msg || '提交失败');
                            }