diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java
index 73151a36..1e874883 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java
@@ -67,6 +67,12 @@ public class ProposalMineController {
public void index() {
}
+ @At(value = "/platform/h5/proposal/mine",top = true)
+ @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/mine/index.html")
+ @SaCheckPermission("proposal.mine")
+ public void h5Index() {
+ }
+
@At
@SaCheckPermission("proposal.mine")
@Aop(TransAop.READ_COMMITTED)
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java
index 3bb7201b..c13813a4 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java
@@ -59,6 +59,14 @@ public class ProposalWriteController {
public void index() {
}
+ @At("")
+ @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/write/index.html")
+ @SaCheckPermission("proposal.write")
+ public void h5Index(){
+
+ }
+
+
@At
@SaCheckPermission("proposal.write")
@Aop(TransAop.READ_COMMITTED)
diff --git a/src/main/resources/static/assets/platform/css/h5.css b/src/main/resources/static/assets/platform/css/h5.css
index a5e9b768..7bddea61 100644
--- a/src/main/resources/static/assets/platform/css/h5.css
+++ b/src/main/resources/static/assets/platform/css/h5.css
@@ -183,136 +183,6 @@ body {
}
-
-/*****************************列表list css********************************/
-.table-list-container {
- padding: 0;
- margin-top: 10px;
-}
-
-.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;
- margin-bottom: 0;
-}
-
-.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/static/components/plugins/h5/TableColumn.vue b/src/main/resources/static/components/plugins/h5/TableColumn.vue
new file mode 100644
index 00000000..475478a4
--- /dev/null
+++ b/src/main/resources/static/components/plugins/h5/TableColumn.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+ {{ label }}
+ {{label_suffix}}
+
+
+
+
+ {{ value }}
+
+
+
+
+
diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue
new file mode 100644
index 00000000..6dfc5d5c
--- /dev/null
+++ b/src/main/resources/static/components/plugins/h5/TableList.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html
index f3c4f004..7f773f17 100644
--- a/src/main/resources/views/layouts/platform_h5.html
+++ b/src/main/resources/views/layouts/platform_h5.html
@@ -369,7 +369,8 @@
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()))
+ Vue.component("table-list", httpVueLoader("/components/plugins/h5/TableList.vue?v=" + new Date().getTime()))
+ Vue.component("table-column", httpVueLoader("/components/plugins/h5/TableColumn.vue?v=" + new Date().getTime()))
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
index 228db974..71cb4ca9 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
@@ -5,57 +5,27 @@ layout("/layouts/platform_h5.html"){
-
+
-
-
-
-
-
{{row.name}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{row.typeName}}
+
+
+ {{index}}
+
+
@@ -88,10 +58,6 @@ layout("/layouts/platform_h5.html"){
searchKeyword: "",
sessionId: null
},
- tableData: [],
- tableLoading: false,
- tableFinished: false,
- tableRefreshing: false,
sessionOptions: [],
infoShow: false
@@ -109,7 +75,7 @@ layout("/layouts/platform_h5.html"){
text: v.fullName,
value: v.id
}))
- .concat([{ text: "全部届次", value: null }])
+ .concat([{text: "全部届次", value: null}])
if (this.sessionOptions.length > 0) {
this.pageForm.sessionId = this.sessionOptions[0].value
this.pageData()
@@ -129,31 +95,33 @@ layout("/layouts/platform_h5.html"){
},
pageData() {
- this.tableLoading = true
- const loading = createListLoading()
- this.$axios
- .post("/platform/proposal/mine/pageData", this.pageForm)
- .then((res) => {
- if (res.code === 0) {
- this.tableData = this.tableData.concat(res.data.list)
- this.pageForm.totalCount = res.data.totalCount
- if (this.tableData.length >= this.pageForm.totalCount) {
- this.tableFinished = true
- }
- this.pageForm.pageNumber++
- }
- })
- .finally(() => {
- loading.close()
- this.tableLoading = false
- this.tableRefreshing = false
- })
+ this.$refs.tableListRef.pageData()
+ // this.tableLoading = true
+ // const loading = createListLoading()
+ // this.$axios
+ // .post("/platform/proposal/mine/pageData", this.pageForm)
+ // .then((res) => {
+ // if (res.code === 0) {
+ // this.tableData = this.tableData.concat(res.data.list)
+ // this.pageForm.totalCount = res.data.totalCount
+ // if (this.tableData.length >= this.pageForm.totalCount) {
+ // this.tableFinished = true
+ // }
+ // this.pageForm.pageNumber++
+ // }
+ // })
+ // .finally(() => {
+ // loading.close()
+ // this.tableLoading = false
+ // this.tableRefreshing = false
+ // })
},
doSearch() {
- this.pageForm.pageNumber = 1
- this.pageForm.totalCount = 0
- this.tableData = []
- this.pageData()
+ this.$refs.tableListRef.doSearch()
+ // this.pageForm.pageNumber = 1
+ // this.pageForm.totalCount = 0
+ // this.tableData = []
+ // this.pageData()
},
openRevoke(row) {
this.$dialog
@@ -162,7 +130,7 @@ layout("/layouts/platform_h5.html"){
message: "您确定要撤销申请吗?"
})
.then(() => {
- this.$axios.post("/platform/proposal/mine/revokeApply", { id: row.id }).then((resp) => {
+ this.$axios.post("/platform/proposal/mine/revokeApply", {id: row.id}).then((resp) => {
this.$toast.success(resp.msg)
this.doSearch()
})
@@ -175,7 +143,7 @@ layout("/layouts/platform_h5.html"){
message: "您确定要删除吗?"
})
.then(() => {
- this.$axios.post("/platform/proposal/mine/delete", { id }).then((resp) => {
+ this.$axios.post("/platform/proposal/mine/delete", {id}).then((resp) => {
if (resp.code === 0) {
this.$toast.success(resp.msg)
this.doSearch()
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 3e8164ef..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
@@ -1,381 +1,497 @@
+
+
+
+
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
deleted file mode 100644
index fab11283..00000000
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index_.html
+++ /dev/null
@@ -1,560 +0,0 @@
-
-
-
-
-
-
-
-
-
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
index 17422ed9..78c1b09c 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html
@@ -127,67 +127,34 @@ layout("/layouts/platform_h5.html"){
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
- 编辑
-
-
-
- 撤回
-
-
-
- 删除
-
-
-
+
+
+ {{row.userName}}
+ {{row.unitName}}
+ {{row.submitTime}}
+ {{row.taskName}}
+
+
+
+
+ 查看
-
-
-
+
+
+ 编辑
+
+
+
+ 撤回
+
+
+
+ 删除
+
+
+