change

target/classes/static/components/plugins/h5/TableColumn.vue

@@ -37,26 +37,32 @@ module.exports = {
 <style scoped>
 .table-column {
   display: flex;
-  padding: 6px 0;
-    align-items: center;
+  width: calc(50% - 6px);
+  min-width: 0;
+  padding: 4px 0;
+  align-items: center;
+  box-sizing: border-box;
 }
 
 .label {
-  color: #333;
-  font-size: 14px;
+  color: #98a3b3;
+  font-size: 12px;
+  line-height: 18px;
   flex-shrink: 0;
-  max-width: 120px;
+  max-width: 50%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 .value {
-  color: #555;
-  font-size: 14px;
-  flex-grow: 1; /* 动态占据剩余部分 */
-  white-space: nowrap; /* 防止换行 */
-  overflow: hidden; /* 隐藏溢出的部分 */
-  text-overflow: ellipsis; /* 省略号 */
+  min-width: 0;
+  color: #56657a;
+  font-size: 12px;
+  line-height: 18px;
+  flex-grow: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>

target/classes/static/components/plugins/h5/TableList.vue

@@ -1,7 +1,9 @@
 <template>
-  <van-pull-refresh v-model="tableRefreshing" @refresh="onRefresh">
+  <van-pull-refresh class="table-list" v-model="tableRefreshing" @refresh="onRefresh">
     <div v-if="tableData.length === 0" class="empty-state">
-      <van-empty description="暂无数据"></van-empty>
+      <slot name="empty">
+        <van-empty description="暂无数据"></van-empty>
+      </slot>
     </div>
     <van-list v-if="tableData && tableData.length>0"
               v-model="tableLoading"
@@ -9,7 +11,8 @@
               finished-text="没有更多了"
               @load="onLoad">
       <div class="table-list-container">
-        <div v-for="(row, index) in tableData" :key="index" class="table-list-item">
+        <div v-for="(row, index) in tableData" :key="index" class="table-list-item"
+             :data-row-id="row && row.id ? row.id : ''">
           <slot name="header" :index="index" :row="row">
             <div class="item-header">
               <div class="item-title">{{ calcTitle(row) }}</div>
@@ -18,12 +21,12 @@
             </div>
           </slot>
 
-          <div style="display: flex;column-gap: 10px"
+          <div class="table-list-content"
                :style="{'max-height':img ? '100px':'unset', 'overflow': img ? 'hidden':'unset' }">
             <div class="img-container" v-if="img">
-              <img :src="row[img]" alt="" style="object-fit: cover">
+              <img :src="row[img]" alt="">
             </div>
-            <div style="width: 100%">
+            <div class="table-list-columns">
               <slot :index="index" :row="row"></slot>
             </div>
           </div>
@@ -66,6 +69,10 @@ module.exports = {
     img: {
       type: String,
       default: ""
+    },
+    show_loading_overlay: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {
@@ -87,6 +94,33 @@ module.exports = {
     }
   },
   methods: {
+    /**
+     * 获取当前列表快照。
+     * 返回值包含已加载记录、分页参数和加载完成状态，供业务页面在进入详情前暂存列表现场。
+     */
+    getListState() {
+      return {
+        tableData: JSON.parse(JSON.stringify(this.tableData)),
+        localPageForm: JSON.parse(JSON.stringify(this.localPageForm)),
+        tableFinished: this.tableFinished
+      }
+    },
+
+    /**
+     * 恢复列表快照。
+     * state 应包含 tableData、localPageForm 和 tableFinished；返回 true 表示恢复成功。
+     */
+    restoreListState(state) {
+      if (!state || !Array.isArray(state.tableData)) return false
+      this.$set(this, "tableData", state.tableData)
+      this.$set(this, "localPageForm", {...this.localPageForm, ...(state.localPageForm || {})})
+      this.$set(this, "tableFinished", !!state.tableFinished)
+      this.$set(this, "tableLoading", false)
+      this.$set(this, "tableRefreshing", false)
+      this.$emit("update:page_form", {...this.localPageForm})
+      return true
+    },
+
     calcTitle(row) {
       if (!this.title) return ""
       // 处理key1.key2.key3 这样的形式
@@ -111,9 +145,15 @@ module.exports = {
 
     pageData() {
       this.tableLoading = true
+      const isInitialLoad = this.tableData.length === 0
+      this.$emit("loading-change", {loading: true, initial: isInitialLoad})
 
-      const loading = createListLoading()
-      this.$axios.post(this.api, this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm).then((res) => {
+      const loading = this.show_loading_overlay ? createListLoading() : null
+      this.$axios.post(
+          this.api,
+          this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm,
+          {h5SkeletonLoading: !this.show_loading_overlay}
+      ).then((res) => {
         if (res.code === 0) {
           this.tableData = this.tableData.concat(res.data.list)
           this.localPageForm.totalCount = res.data.totalCount
@@ -123,11 +163,10 @@ module.exports = {
           this.$emit("update:page_form", {...this.localPageForm})
         }
       }).finally(() => {
-        loading.close()
-        console.log(this.tableLoading)
+        if (loading) loading.close()
         this.tableLoading = false
-        console.log(this.tableLoading)
         this.tableRefreshing = false
+        this.$emit("loading-change", {loading: false, initial: isInitialLoad})
       })
     },
     doSearch() {
@@ -152,33 +191,36 @@ module.exports = {
 <style scoped>
 .table-list-container {
   padding: 0;
-  margin-top: 10px;
+  margin-top: 12px;
 }
 
 .table-list-container .table-list-item {
   background-color: #fff;
-  border-bottom: 1px solid #eaecef;
-  padding: 16px;
+  border: 1px solid #eef1f6;
+  border-radius: 12px;
+  box-shadow: 0 7px 20px rgba(55, 85, 126, .08);
+  padding: 14px;
   position: relative;
-  margin-bottom: 10px;
+  margin-bottom: 12px;
+  overflow: hidden;
 }
 
 .table-list-container .table-list-item:last-child {
-  border-bottom: none;
   margin-bottom: 0;
 }
 
 .table-list-container .table-list-item .item-header {
   display: flex;
   justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 10px;
+  align-items: center;
+  margin-bottom: 8px;
 }
 
 .table-list-container .table-list-item .item-title {
-  font-size: 16px;
-  font-weight: 500;
-  color: #1f2f3d;
+  font-size: 15px;
+  line-height: 22px;
+  font-weight: 600;
+  color: #263548;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -190,15 +232,29 @@ module.exports = {
   width: 100px;
   height: 100px;
   flex-shrink: 0;
-  border-radius: 6px;
+  overflow: hidden;
+  border-radius: 10px;
 }
 
 .table-list-container .table-list-item .img-container img {
   width: 100%;
   height: 100%;
-  border-radius: 6px;
+  object-fit: cover;
+  border-radius: 10px;
 }
 
+.table-list-container .table-list-item .table-list-content {
+  display: flex;
+  column-gap: 10px;
+}
+
+.table-list-container .table-list-item .table-list-columns {
+  display: flex;
+  width: 100%;
+  min-width: 0;
+  flex-wrap: wrap;
+  column-gap: 12px;
+}
 
 .table-list-container .table-list-item .item-meta {
   display: flex;
@@ -245,48 +301,57 @@ module.exports = {
 
 .table-list-container .table-list-item .item-actions {
   display: flex;
-  column-gap: 20px;
+  gap: 8px;
+  flex-wrap: wrap;
   justify-content: end;
-  margin-top: 15px;
-  padding-top: 12px;
-  border-top: 1px solid #eaecef;
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px solid #edf1f6;
 }
 
 .table-list-container .table-list-item .action-btn {
-  display: flex;
+  display: inline-flex;
   align-items: center;
-  justify-content: end;
-  font-size: 14px;
+  justify-content: center;
+  min-height: 26px;
+  padding: 4px 10px;
+  box-sizing: border-box;
+  border-radius: 14px;
+  background-color: #eaf4ff;
+  font-size: 12px;
+  line-height: 18px;
   color: var(--color-primary);
-  padding: 4px 0;
+  cursor: pointer;
 }
 
 .table-list-container .table-list-item .action-btn i {
-  margin-right: 6px;
-  font-size: 16px;
+  margin-right: 5px;
+  font-size: 13px;
 }
 
 .table-list-container .table-list-item .action-btn.delete {
-  color: #ff0000;
+  color: #f04444;
+  background-color: #fff0f0;
 }
 
 .table-list-container .table-list-item .action-btn.review {
   color: #67c23a;
+  background-color: #eef9e9;
 }
 
-.table-list-container .empty-state {
+.empty-state {
   text-align: center;
   padding: 60px 20px;
   color: #909399;
 }
 
-.table-list-container .empty-state i {
+.empty-state i {
   font-size: 60px;
   margin-bottom: 16px;
   color: #dcdee0;
 }
 
-.table-list-container .empty-state p {
+.empty-state p {
   margin-top: 10px;
   font-size: 14px;
 }

target/classes/static/components/plugins/sysSignature/h5Index.vue

@@ -1,13 +1,28 @@
 <template>
     <div class="h5-signature">
-        <div v-if="!showSignaturePanel" class="main-panel">
-            <slot v-if="$slots.default"></slot>
-            <template v-else>
-                <van-button @click="openSignature" class="open-button" size="middle" plain native-type="button">打开签字板</van-button>
-                <van-image :src="signatureContent"></van-image>
-            </template>
+        <slot v-if="$slots.default"></slot>
+        <div v-else class="signature-entry">
+            <!-- 未签名时展示统一空状态和入口，组件放入 van-field 时仍保持完整宽度。 -->
+            <div v-if="!signatureContent" class="signature-entry-panel">
+                <van-icon class="signature-placeholder-icon" name="edit"></van-icon>
+                <div class="signature-placeholder-text">请完成本人手写签名</div>
+                <van-button @click="openSignature" class="signature-open-button" block plain
+                            native-type="button">进入签字板</van-button>
+            </div>
+
+            <!-- 已签名时直接预览结果，并在下方提供统一的重新签名入口。 -->
+            <div v-else class="signature-entry-panel signature-entry-panel--completed">
+                <van-image :src="signatureContent" class="signature-preview" fit="contain"></van-image>
+                <div class="signature-completed-text">
+                    <van-icon name="passed"></van-icon>
+                    <span>已完成本人手写签名</span>
+                </div>
+            </div>
+            <button v-if="signatureContent" @click="openSignature" class="signature-reset-button"
+                    type="button">重新签名</button>
         </div>
-        <van-popup v-model="showSignaturePanel" :style="{ height: '100vh', width: '100vw' }">
+        <van-popup v-model="showSignaturePanel" :close-on-click-overlay="false"
+                   :style="{ height: '100vh', width: '100vw' }" @close="handleSignaturePopupClose">
             <signature @save="save"></signature>
         </van-popup>
     </div>
@@ -36,14 +51,39 @@ module.exports = {
     data() {
         return {
             signatureContent: null,
-            showSignaturePanel: false
+            showSignaturePanel: false,
+            historyLayerName: "",
+            historyLayerUnsubscribe: null
         }
     },
     methods: {
+        /**
+         * 打开签字板。
+         * 无请求参数；优先向全局历史栈增加当前签字弹层，返回值为空。
+         */
         openSignature() {
+            const manager = window.h5HistoryLayerManager
+            if (manager && manager.open(this.historyLayerName)) return
             this.showSignaturePanel = true
         },
 
+        // 保存成功或业务主动关闭时同步回退签字弹层历史，管理器不可用时直接关闭 Popup。
+        closeSignaturePanel() {
+            const manager = window.h5HistoryLayerManager
+            if (manager && manager.close(this.historyLayerName)) return
+            this.showSignaturePanel = false
+        },
+
+        // Vant 组件自行关闭时仅处理仍位于栈顶的签字层，避免返回同步触发重复 history.back。
+        handleSignaturePopupClose() {
+            const manager = window.h5HistoryLayerManager
+            if (!manager) return
+            const stack = manager.stack
+            if (stack[stack.length - 1] === this.historyLayerName) {
+                manager.close(this.historyLayerName)
+            }
+        },
+
         save(signature) {
             const file = this.base64ToFile(signature, "signature.png")
             const formData = new FormData()
@@ -59,11 +99,20 @@ module.exports = {
                 })
                 .then((res) => {
                     if (res.code === 0) {
-                        alert("保存成功")
-                        this.showSignaturePanel = false
+                        // 保存成功后使用项目统一的 Vant 反馈，避免浏览器原生弹框阻塞签字流程。
+                        this.$toast.success({
+                            message: "签名保存成功",
+                            duration: 1500,
+                            forbidClick: true
+                        })
                         this.$emit("input", res.data)
+                        this.closeSignaturePanel()
                     } else {
-                        alert("保存失败")
+                        // 接口返回失败时保留签字板，方便用户重试。
+                        this.$toast.fail({
+                            message: res.msg || "签名保存失败，请重试",
+                            duration: 2000
+                        })
                     }
                 })
         },
@@ -86,27 +135,114 @@ module.exports = {
             return new File([blob], filename, { type: contentType })
         }
     },
-    created() {}
+    mounted() {
+        const manager = window.h5HistoryLayerManager
+        if (!manager || typeof manager.ensureRegistered !== "function" || typeof manager.subscribe !== "function") return
+
+        // 每个组件实例使用唯一弹层名称，同一页面存在多个签字组件时互不影响。
+        this.historyLayerName = "h5-signature-" + this._uid
+        manager.ensureRegistered("h5-signature-page-" + window.location.pathname + window.location.search)
+        this.historyLayerUnsubscribe = manager.subscribe((stack) => {
+            this.showSignaturePanel = stack.includes(this.historyLayerName)
+        })
+    },
+    beforeDestroy() {
+        if (typeof this.historyLayerUnsubscribe === "function") {
+            this.historyLayerUnsubscribe()
+        }
+    }
 }
 </script>
 
 <style scoped>
 .h5-signature {
     width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
 }
 
-.main-panel {
-    position: relative;
-    flex-direction: column-reverse;
+.signature-entry {
+    width: 100%;
     display: flex;
-    row-gap: 10px;
+    flex-direction: column;
+    align-items: stretch;
+    box-sizing: border-box;
 }
 
-.main-panel .van-image {
+.signature-entry-panel {
+    width: 100%;
     min-height: 150px;
+    padding: 16px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    border: 1px dashed #dfe6ef;
+    border-radius: 9px;
+    background: #fbfcfe;
 }
 
-.main-panel .open-button {
-    color: var(--color-primary);
+.signature-placeholder-icon {
+    margin-bottom: 6px;
+    color: #c7cfda;
+    font-size: 38px;
+}
+
+.signature-placeholder-text {
+    margin-bottom: 12px;
+    color: #9aa4b2;
+    font-size: 13px;
+    line-height: 20px;
+}
+
+.signature-open-button {
+    width: 100%;
+    height: 40px;
+    color: var(--color-primary, #1989fa);
+    font-size: 15px;
+    font-weight: 500;
+    background: linear-gradient(90deg, #f0f7ff, #f5f9ff);
+    border-color: #d8e9ff;
+    border-radius: 7px;
+}
+
+.signature-entry-panel--completed {
+    min-height: 150px;
+    justify-content: space-between;
+}
+
+.signature-preview {
+    width: 100%;
+    height: 96px;
+    background: #fff;
+    border-radius: 6px;
+    overflow: hidden;
+}
+
+.signature-completed-text {
+    margin-top: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #5f6b7a;
+    font-size: 13px;
+}
+
+.signature-completed-text .van-icon {
+    margin-right: 5px;
+    color: #28a745;
+    font-size: 16px;
+}
+
+.signature-reset-button {
+    align-self: center;
+    margin-top: 10px;
+    padding: 3px 12px;
+    color: var(--color-primary, #1989fa);
+    font-size: 14px;
+    line-height: 22px;
+    background: transparent;
+    border: 0;
 }
 </style>

target/classes/static/components/plugins/sysSignature/index.vue

@@ -57,7 +57,16 @@ module.exports = {
         },
         save() {
             if (signature.isEmpty()) {
-                alert("请签字后再保存")
+                // H5 页面使用统一的 Vant 提示；未加载 Vant 的独立签字页保留原生提示作为兼容兜底。
+                if (typeof this.$toast === "function") {
+                    this.$toast({
+                        message: "请先完成手写签名",
+                        icon: "edit",
+                        duration: 2000
+                    })
+                } else {
+                    alert("请先完成手写签名")
+                }
                 return
             }
             // const png = signature.getPNG()

target/classes/static/components/plugins/vantMore/yearVanDropDownItem.vue

@@ -1,5 +1,11 @@
 <template>
-    <van-dropdown-item :options="yearOptions" @change="yearChange" v-model="year"></van-dropdown-item>
+    <van-dropdown-item
+        :options="yearOptions"
+        v-model="year"
+        @change="yearChange"
+        @open="$emit('open')"
+        @close="$emit('close')"
+    ></van-dropdown-item>
 </template>
 
 <script>