diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java index e24dfc9e..ba13b026 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; @@ -43,6 +44,14 @@ public class SuggestionBoxMineController { } + @At(value = "/platform/h5/suggestionBox/mine",top = true) + @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/mine/index.html") + @SaCheckLogin + public void h5Index(){ + + } + + @At @SaCheckPermission("suggestionBox.mine") public Result pageData(Integer pageNumber, Integer pageSize, String title, Integer year) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java index db545331..387bc2e6 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java @@ -46,9 +46,10 @@ public class SuggestionBoxWriteController { } - @At("") + @At(value = "/platform/h5/suggestionBox/write",top = true) @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/write/index.html") - @SaCheckPermission("h5.suggestionBox.write") +// @SaCheckPermission("h5.suggestionBox.write") + @SaCheckLogin public void h5Index(){ } diff --git a/src/main/resources/static/assets/platform/css/h5.css b/src/main/resources/static/assets/platform/css/h5.css index f0b8960b..4a6539af 100644 --- a/src/main/resources/static/assets/platform/css/h5.css +++ b/src/main/resources/static/assets/platform/css/h5.css @@ -104,8 +104,8 @@ body { font-size: 15px; color: var(--color-black); font-weight: 600; - margin: 10px 0 10px 0!important; - padding:10px; + margin: 10px 0 10px 0 !important; + padding: 10px; position: relative; line-height: 1.1; font-family: inherit; @@ -127,7 +127,7 @@ body { background-color: unset; } -.custom-list-loading .van-icon{ +.custom-list-loading .van-icon { font-size: 108px; } @@ -140,25 +140,25 @@ body { box-sizing: border-box; } -.list-card:not(:last-child){ +.list-card:not(:last-child) { margin-bottom: 10px; } -.list-card-title{ +.list-card-title { font-weight: bolder; } -.list-card-body{ +.list-card-body { display: flex; } -.list-card-body-img{ +.list-card-body-img { flex: 0 0 auto; width: 130px; height: 90px; } -.list-card-body-img img{ +.list-card-body-img img { width: 100%; height: 100%; border-radius: 5px; @@ -166,12 +166,12 @@ body { } -.list-card-body-content{ +.list-card-body-content { flex: 1; } -.list-card-footer{ +.list-card-footer { display: flex; justify-content: flex-end; gap: 10px; @@ -179,10 +179,138 @@ body { flex-wrap: wrap; } -.list-card-footer .van-button{ +.list-card-footer .van-button { } + +/*****************************列表list css********************************/ +.table-list-container { + padding: 0; +} + +.table-list-container .table-list-item { + background-color: #fff; + border-bottom: 1px solid #eaecef; + padding: 16px; + position: relative; + margin-bottom: 10px; +} + +.table-list-container .table-list-item:last-child { + border-bottom: none; +} + +.table-list-container .table-list-item .item-header { + display: flex; + justify-content: space-between; + align-items: flex-start; + margin-bottom: 10px; +} + +.table-list-container .table-list-item .item-title { + font-size: 16px; + font-weight: 500; + color: #1f2f3d; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; + padding-right: 10px; +} + +.table-list-container .table-list-item .item-meta { + display: flex; + color: #606266; + font-size: 14px; + margin-bottom: 5px; + padding: 4px 0; +} + +.table-list-container .table-list-item .meta-item { + display: flex; + align-items: center; + gap: 8px; + width: 100%; +} + +.table-list-container .table-list-item .meta-item i { + font-size: 14px; + color: #909399; + width: 16px; + text-align: center; +} + +.table-list-container .table-list-item .item-content { + color: #606266; + font-size: 14px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + line-height: 1.5; +} + +.table-list-container .table-list-item .item-footer { + display: flex; + justify-content: space-between; + margin-top: 12px; + padding-top: 8px; + border-top: 1px dashed #eaecef; + color: #909399; + font-size: 13px; +} + +.table-list-container .table-list-item .item-actions { + display: flex; + column-gap: 20px; + justify-content: end; + margin-top: 15px; + padding-top: 12px; + border-top: 1px solid #eaecef; +} + +.table-list-container .table-list-item .action-btn { + display: flex; + align-items: center; + justify-content: end; + font-size: 14px; + color: var(--color-primary); + padding: 4px 0; +} + +.table-list-container .table-list-item .action-btn i { + margin-right: 6px; + font-size: 16px; +} + +.table-list-container .table-list-item .action-btn.delete { + color: #ff0000; +} + +.table-list-container .table-list-item .action-btn.review { + color: #67c23a; +} + +.table-list-container .empty-state { + text-align: center; + padding: 60px 20px; + color: #909399; +} + +.table-list-container .empty-state i { + font-size: 60px; + margin-bottom: 16px; + color: #dcdee0; +} + +.table-list-container .empty-state p { + margin-top: 10px; + font-size: 14px; +} + + /*****************************申请表单CSS********************************/ .form-container { padding-bottom: 80px; diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html index 3d143391..43657148 100644 --- a/src/main/resources/views/layouts/platform_h5.html +++ b/src/main/resources/views/layouts/platform_h5.html @@ -365,6 +365,7 @@ Vue.component("year-van-dropdown-item", httpVueLoader("/components/plugins/vantMore/yearVanDropDownItem.vue?v=" + new Date().getTime())) Vue.component("van-text-dialog", httpVueLoader("/components/plugins/vantMore/vantTextDialog.vue?v=" + new Date().getTime())) Vue.component("enum-tag", httpVueLoader("/components/plugins/sysEnum/EnumTag.vue?v=" + new Date().getTime())) + Vue.component("h5-table-list", httpVueLoader("/components/plugins/h5/h5TableList.vue?v=" + new Date().getTime())) diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index_.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index_.html index 8bbf3679..fab11283 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index_.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index_.html @@ -3,80 +3,7 @@ layout("/layouts/platform_h5.html"){ #-->
diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html new file mode 100644 index 00000000..b951c33d --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html @@ -0,0 +1,274 @@ + + + + +
+ + + + + +
+
+ +
+ +
+
+
{{ item.title || '无标题' }}
+ +
+
+
+ 申请人：{{ item.userName || '未知' }} +
+
+
+
+ 所属单位：{{ item.unitName || '未知' }} +
+
+
+
+ 申请时间：{{ item.submitTime || '未知' }} +
+
+
+
+ 当前节点：{{ item.taskName || '未知' }} +
+
+
+
+ + 查看 +
+
+ + 编辑 +
+
+ + 撤回 +
+
+ + 删除 +
+
+
+
+ + + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write/index.html index 4fe100a4..8abee74f 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write/index.html @@ -4,13 +4,13 @@ layout("/layouts/platform_h5.html"){
-
- - - - - - +
+ + + + + + + > + > -
- - - 保存 - - - 提交 - 提交 - - + + +
+ 保存 + 提交 + 提交
@@ -64,22 +60,27 @@ layout("/layouts/platform_h5.html"){ }, methods: { historyBack, - + // 保存 - onSave() { + async onSave() { + try{ + await this.$refs.formRef.validate(); this.$dialog.confirm({ - title: '提示', - message: '您确定保存吗？', + title: '提示', + message: '您确定保存吗？', }).then(() => { - this.$axios.post('/platform/suggestionBox/write/save', {data: JSON.stringify(this.formData)}).then(res => { - if (res.code === 0) { - this.$toast.success("保存成功"); - window.location.href = '/platform/suggestionBox/mine'; - } - }) + this.$axios.post('/platform/suggestionBox/write/save', {data: JSON.stringify(this.formData)}).then(res => { + if (res.code === 0) { + this.$toast.success("保存成功"); + } + }) }).catch(() => { - // 取消操作 + // 取消操作 }); + }catch (e){ + // 表单验证失败 + console.log('表单验证失败', error); + } }, // 提交 @@ -149,13 +150,6 @@ layout("/layouts/platform_h5.html"){ } }) - - -