diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvController.java index 60723e07..89e39ccb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvController.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.dayofficework.qsv.h5controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; @@ -23,13 +24,14 @@ public class H5QsvController { private QsvActivityService qsvActivityService; @At("") - @Ok("beetl:/mobile/qsv/index.html") + @Ok("beetl:/platform/zhghh5/dayofficework/qsv/index.html") + @SaCheckLogin public void index() { } -// 分页查询 @At + @SaCheckLogin public Result pageData(@Valid PageForm pageForm, @Valid String category) { Cnd cnd = Cnd.NEW(); cnd.andEX("category", "=", category); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java index 8f875880..3bba5530 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java @@ -1,7 +1,9 @@ package com.budwk.app.zhgh.dayofficework.qsv.h5controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.result.Result; @@ -44,26 +46,30 @@ public class H5QsvQuizController { private QsvQuizService qsvQuizService; @At("") - @Ok("beetl:/mobile/qsv/quiz/index.html") + @SaCheckLogin + @Ok("beetl:/platform/zhghh5/dayofficework/qsv/quiz/index.html") public void index() { } @At - @Ok("beetl:/mobile/qsv/quiz/result.html") + @SaCheckLogin + @Ok("beetl:/platform/zhghh5/dayofficework/qsv/quiz/result.html") public void result() { } -// 题目列表 @At + @SaCheckLogin public Result subjects(@Valid String activityId) { QsvActivity activity = dao.fetch(QsvActivity.class, activityId); - int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getGroupId()) - .and("userId", "=", SecurityUtil.getUserId())); - if (count != 1) { - return Result.error("您无需参加此次答题,感谢您的关注!"); + if(activity.getGroupId() != null){ + int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getGroupId()) + .and("userId", "=", SecurityUtil.getUserId())); + if (count != 1) { + return Result.error("您无需参加此次答题,感谢您的关注!"); + } } String mode = activity.getMode(); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java index 2a8c4026..82a827da 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java @@ -46,6 +46,13 @@ public class ProposalFeedbackEvaluationController { public void index() { } + @At(value = "/platform/h5/proposal/feedbackEvaluation",top = true) + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html") + @SaCheckPermission("proposal.feedbackEvaluation") + public void h5Index() { + } + + @At @SaCheckPermission("proposal.feedbackEvaluation") @ApiOperation("分页列表") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java index 26a7379e..7e58b927 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java @@ -49,6 +49,14 @@ public class ProposalSchoolLeaderApprovalController { public void index() { } + + @At(value = "/platform/h5/proposal/schoolLeaderApproval",top = true) + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html") + @SaCheckPermission("proposal.schoolLeaderApproval") + public void h5Index() { + } + + @At @SaCheckPermission("proposal.schoolLeaderApproval") @ApiOperation("分页列表") 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 ba13b026..170e3a9b 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 @@ -44,17 +44,17 @@ public class SuggestionBoxMineController { } - @At(value = "/platform/h5/suggestionBox/mine",top = true) + @At(value = "/platform/h5/suggestionBox/mine", top = true) @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/mine/index.html") @SaCheckLogin - public void h5Index(){ + public void h5Index() { } @At @SaCheckPermission("suggestionBox.mine") - public Result pageData(Integer pageNumber, Integer pageSize, String title, Integer year) { + public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) { Sql sql = Sqls.create(""" SELECT info.id, @@ -89,8 +89,8 @@ public class SuggestionBoxMineController { """); Cnd cnd = Cnd.NEW(); cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); - if (StrUtil.isNotBlank(title)) { - cnd.where().andLike("info.title", title); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.where().andLike("info.title", searchKeyword); } cnd.andEX("YEAR(info.submitTime)", "=", year); cnd.desc("info.submitTime"); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java index f5b0ca09..348f6500 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java @@ -1,10 +1,11 @@ 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.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.flow.engine.FlowEngine; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.suggestionBox.service.SuggestionBoxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,15 +37,22 @@ public class SuggestionBoxQueryController { @At("") @Ok("beetl:/platform/zhgh/democratic/suggestionBox/query/index.html") - @SaCheckLogin + @SaCheckPermission("suggestionBox.query") public void index() { } + @At(value = "/platform/h5/suggestionBox/query", top = true) + @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/query/index.html") + @SaCheckPermission("suggestionBox.query") + public void h5Index() { + + } + @At - @SaCheckLogin - public Result pageData(Integer pageNumber, Integer pageSize, String title, Integer year) { + @SaCheckPermission("suggestionBox.query") + public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) { Sql sql = Sqls.create(""" SELECT info.id, @@ -79,7 +87,9 @@ public class SuggestionBoxQueryController { """); Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(info.submitTime)", "=", year); - cnd.and(Cnd.likeEX("info.title", title)); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.where().andLike("info.title", searchKeyword); + } cnd.desc("info.submitTime"); sql.setCondition(cnd); Pagination pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java index 12fd8278..deeee1e6 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java @@ -1,6 +1,7 @@ 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.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -35,14 +36,22 @@ public class SuggestionXghController { @At("") @Ok("beetl:/platform/zhgh/democratic/suggestionBox/xgh/index.html") - @SaCheckLogin + @SaCheckPermission("suggestionBox.xgh") public void index() { } + @At(value = "/platform/h5/suggestionBox/xgh",top = true) + @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/xgh/index.html") + @SaCheckPermission("suggestionBox.xgh") + public void h5Index() { + + } + + @At - @SaCheckLogin - public Result pageData(PageForm pageForm, String taskId, String title, Integer year, boolean approval) { + @SaCheckPermission("suggestionBox.xgh") + public Result pageData(PageForm pageForm, String taskId, String searchKeyword, Integer year, boolean approval) { Sql sql = Sqls.create(""" SELECT info.id, @@ -88,7 +97,10 @@ public class SuggestionXghController { } cnd.andEX("YEAR(info.submitTime)", "=", year); - cnd.and(Cnd.likeEX("info.title", title)); + + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.where().andLike("info.title", searchKeyword); + } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.submitTime"); @@ -103,7 +115,7 @@ public class SuggestionXghController { } @At - @SaCheckLogin + @SaCheckPermission("suggestionBox.xgh") @ApiOperation("查询任务") public Result queryTask(@Valid @Param("taskId") String taskId) { Sql sql = Sqls.create(""" diff --git a/src/main/resources/static/assets/platform/css/h5.css b/src/main/resources/static/assets/platform/css/h5.css index 7bddea61..bb2b0fc2 100644 --- a/src/main/resources/static/assets/platform/css/h5.css +++ b/src/main/resources/static/assets/platform/css/h5.css @@ -219,10 +219,22 @@ body { } .form-container .van-cell-group__title { - padding: 12px 16px 8px; font-size: 15px; - color: #323233; - font-weight: bold; + color: var(--color-black); + font-weight: 600; + padding: 10px; + position: relative; +} + +.form-container .van-cell-group__title::before{ + content: ""; + width: 5px; + background: var(--color-primary); + display: inline-block; + position: absolute; + left: 0; + top: 0; + bottom: 0; } .form-container .van-field__label { @@ -256,3 +268,32 @@ body { margin-top: 8px; } +/***************************查看详情CSS********************************/ +.detail-container { + background: #f9f9f9 +} + +.detail-container .van-cell-group__title{ + font-size: 15px; + color: var(--color-black); + font-weight: 600; + padding: 10px; + position: relative; +} + +.detail-container .van-cell-group__title::before{ + content: ""; + width: 5px; + background: var(--color-primary); + display: inline-block; + position: absolute; + left: 0; + top: 0; + bottom: 0; +} + +.detail-container .direction-column-cell{ + display: flex; + flex-direction: column; +} + diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html index 7f773f17..ced9b528 100644 --- a/src/main/resources/views/layouts/platform_h5.html +++ b/src/main/resources/views/layouts/platform_h5.html @@ -8,8 +8,8 @@ 智慧工会 - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js index f571f266..81c5396e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js @@ -396,13 +396,13 @@ const subjectForm = { /* background: rgb(248, 249, 250);*/ /*}*/ - .questionnaire-editor { + ::v-deep .questionnaire-editor { max-width: 1200px; margin: 0 auto; padding: 20px; } - .editor-header { + ::v-deep .editor-header { background: white; padding: 20px; border-radius: 8px; @@ -410,7 +410,7 @@ const subjectForm = { margin-bottom: 20px; } - .subject-item { + ::v-deep .subject-item { background: white; border-radius: 8px; padding: 25px; @@ -420,18 +420,18 @@ const subjectForm = { border: 1px dashed #d9d9d9; } - .subject-item:hover { + ::v-deep .subject-item:hover { box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.1); /*transform: translateY(-1px);*/ } - .subject-header { + ::v-deep .subject-header { border-bottom: 1px solid #eee; padding-bottom: 15px; margin-bottom: 15px; } - .subject-toolbar { + ::v-deep .subject-toolbar { display: flex; justify-content: space-between; align-items: center; @@ -440,7 +440,7 @@ const subjectForm = { border-top: 1px solid #eee; } - .toolbar { + ::v-deep .toolbar { background: white; padding: 15px; border-radius: 8px; @@ -448,12 +448,12 @@ const subjectForm = { z-index: 1000; } - .toolbar-btn { + ::v-deep .toolbar-btn { margin: 5px 0; width: 100%; } - .option-item { + ::v-deep .option-item { background: #f8f9fa; border-radius: 4px; padding: 10px; @@ -462,33 +462,33 @@ const subjectForm = { align-items: center; } - .option-drag-handle { + ::v-deep .option-drag-handle { cursor: move; margin-right: 10px; color: #909399; } - .option-content { + ::v-deep .option-content { flex-grow: 1; margin-right: 10px; } - .option-tools { + ::v-deep .option-tools { display: flex; align-items: center; gap: 10px; } - .preview-dialog { + ::v-deep .preview-dialog { max-width: 800px; margin: 0 auto; } - .date-visible { + ::v-deep .date-visible { margin-left: 20px; } - .subject-meta { + ::v-deep .subject-meta { display: flex; flex-wrap: wrap; gap: 15px; @@ -498,7 +498,7 @@ const subjectForm = { border-radius: 4px; } - .image-preview { + ::v-deep .image-preview { max-width: 200px; max-height: 200px; margin-top: 10px; @@ -506,24 +506,24 @@ const subjectForm = { border: 1px solid #dcdfe6; } - .drag-handler { + ::v-deep .drag-handler { cursor: move; color: #909399; margin-right: 10px; } - .meta-info { + ::v-deep .meta-info { color: #909399; font-size: 12px; margin-top: 5px; } - .subject-type-icon { + ::v-deep .subject-type-icon { margin-right: 5px; } - .option-img-box { + ::v-deep .option-img-box { position: relative; width: 40px; height: 40px; @@ -531,16 +531,16 @@ const subjectForm = { flex-shrink: 0 } - .option-img-box:hover .el-icon-remove { + ::v-deep .option-img-box:hover .el-icon-remove { display: block; } - .option-img-box img { + ::v-deep .option-img-box img { width: 100%; height: 100%; } - .option-img-box .el-icon-remove { + ::v-deep .option-img-box .el-icon-remove { position: absolute; top: -7px; right: -7px; @@ -548,7 +548,7 @@ const subjectForm = { display: none; } - .option-img-box .el-icon-remove:hover { + ::v-deep .option-img-box .el-icon-remove:hover { transform: scale(1.1); } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js index 9f060b7b..94faf7d2 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js @@ -314,11 +314,11 @@ E.先进性" } }, style: /*language=CSS*/ ` - .txt-import-dialog .el-dialog__body { + ::v-deep .txt-import-dialog .el-dialog__body { padding: 10px 20px; } - .txt-import-container { + ::v-deep .txt-import-container { display: flex; height: 80vh; border-radius: 4px; @@ -327,7 +327,7 @@ E.先进性" background-color: #fff; } - .txt-import-panel-header { + ::v-deep .txt-import-panel-header { display: flex; justify-content: space-between; align-items: center; @@ -337,7 +337,7 @@ E.先进性" height: 32px; /* 统一高度 */ } - .txt-import-left-panel { + ::v-deep .txt-import-left-panel { width: 50%; padding: 20px; border-right: 1px solid #ebeef5; @@ -345,7 +345,7 @@ E.先进性" flex-direction: column; } - .txt-import-right-panel { + ::v-deep .txt-import-right-panel { width: 50%; padding: 20px; background-color: #fff; /* 改为白色背景 */ @@ -354,22 +354,22 @@ E.先进性" flex-direction: column; } - .txt-import-title { + ::v-deep .txt-import-title { font-size: 16px; font-weight: bold; color: #303133; } - .txt-import-format-tip { + ::v-deep .txt-import-format-tip { display: flex; align-items: center; } - .txt-import-format-tooltip { + ::v-deep .txt-import-format-tooltip { margin-left: 10px; } - .txt-import-input-area { + ::v-deep .txt-import-input-area { flex: 1; position: relative; margin-bottom: 15px; @@ -379,7 +379,7 @@ E.先进性" padding: 2px; } - .txt-import-textarea { + ::v-deep .txt-import-textarea { width: 100%; height: 100%; padding: 15px; @@ -394,25 +394,25 @@ E.先进性" background-color: transparent; } - .txt-import-textarea:focus { + ::v-deep .txt-import-textarea:focus { box-shadow: 0 0 0 2px rgba(24,103,176,0.2); } - .txt-import-action-buttons { + ::v-deep .txt-import-action-buttons { display: flex; justify-content: flex-end; margin-top: 10px; gap: 10px; } - .txt-import-stats { + ::v-deep .txt-import-stats { color: #1867b0; font-size: 13px; display: flex; align-items: center; } - .txt-import-result-display { + ::v-deep .txt-import-result-display { flex: 1; overflow-y: auto; background-color: #f9fafc; /* 只在结果显示区域使用浅灰色背景 */ @@ -421,7 +421,7 @@ E.先进性" border: 1px solid #ebeef5; } - .txt-import-no-questions { + ::v-deep .txt-import-no-questions { height: 100%; display: flex; align-items: center; @@ -431,7 +431,7 @@ E.先进性" padding: 20px; } - .txt-import-question-item { + ::v-deep .txt-import-question-item { background-color: #fff; margin-bottom: 15px; padding: 15px; @@ -441,12 +441,12 @@ E.先进性" border-left: 3px solid #67c23a; } - .txt-import-question-item:hover { + ::v-deep .txt-import-question-item:hover { box-shadow: 0 4px 12px 0 rgba(0,0,0,0.1); transform: translateY(-2px); } - .txt-import-question-title { + ::v-deep .txt-import-question-title { font-size: 15px; font-weight: bold; margin-bottom: 12px; @@ -454,7 +454,7 @@ E.先进性" line-height: 1.5; } - .txt-import-question-number { + ::v-deep .txt-import-question-number { display: inline-block; width: 25px; height: 25px; @@ -467,11 +467,11 @@ E.先进性" font-size: 13px; } - .txt-import-options { + ::v-deep .txt-import-options { margin-bottom: 12px; } - .txt-import-option-item { + ::v-deep .txt-import-option-item { margin-bottom: 8px; padding: 8px 12px; background-color: #f5f7fa; @@ -483,27 +483,27 @@ E.先进性" transition: all 0.2s; } - .txt-import-option-item:hover { + ::v-deep .txt-import-option-item:hover { background-color: #ebeef5; } - .txt-import-option-item.txt-import-correct { + ::v-deep .txt-import-option-item.txt-import-correct { background-color: #f0f9eb; color: #67c23a; border-left: 3px solid #67c23a; } - .txt-import-option-text { + ::v-deep .txt-import-option-text { flex: 1; } - .txt-import-correct-mark { + ::v-deep .txt-import-correct-mark { color: #67c23a; font-weight: bold; font-size: 16px; } - .txt-import-question-meta { + ::v-deep .txt-import-question-meta { margin-top: 12px; padding-top: 12px; border-top: 1px dashed #ebeef5; @@ -511,12 +511,12 @@ E.先进性" color: #909399; } - .txt-import-dialog-footer { + ::v-deep .txt-import-dialog-footer { display: flex; justify-content: flex-end; } - .txt-import-no-options { + ::v-deep .txt-import-no-options { padding: 10px; color: #f56c6c; font-style: italic; diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html index 75e63233..cab68788 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedbackEvaluation/index.html @@ -66,7 +66,7 @@ layout("/layouts/platform.html"){ + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/query/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/query/index.html new file mode 100644 index 00000000..7c0e9987 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/query/index.html @@ -0,0 +1,83 @@ + + +
+ + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/taskForm.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/taskForm.html deleted file mode 100644 index 5b5278e0..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/taskForm.html +++ /dev/null @@ -1,363 +0,0 @@ - - - - -
- - -
- - - - - - -
-
- - - - diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write.html deleted file mode 100644 index 6d596259..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/write.html +++ /dev/null @@ -1,294 +0,0 @@ - - - - -
- - - - -
-
-
-
- 填写人信息 -
-
-
姓名
-
- -
-
-
-
工号
-
- -
-
-
-
手机号码
-
- -
-
-
-
所在单位
-
- -
-
-
-
-
-
- 填写标题 -
-
-
标题
-
- -
-
-
-
-
-
- 填写意见建议内容 -
-
- -
-
-
-
-
- 照片上传 -
- -
- - - - - - - - - - - - - -
-
-
- 提 交 -
-
-
- - 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 99633dae..9e87beea 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 @@ -3,8 +3,7 @@ layout("/layouts/platform_h5.html"){ #-->
- +
@@ -39,7 +38,7 @@ layout("/layouts/platform_h5.html"){
保存 提交 - 提交 + 提交
@@ -74,6 +73,7 @@ layout("/layouts/platform_h5.html"){ this.$axios.post('/platform/suggestionBox/write/save', {data: JSON.stringify(this.formData)}).then(res => { if (res.code === 0) { this.$toast.success("保存成功"); + pjaxReplace("/platform/h5/suggestionBox/mine") } }) }).catch(() => { @@ -95,7 +95,8 @@ layout("/layouts/platform_h5.html"){ }).then(() => { this.$axios.post('/platform/suggestionBox/write/submit', {data: JSON.stringify(this.formData)}).then(res => { if (res.code === 0) { - this.$toast.success("保存成功"); + this.$toast.success("提交成功"); + pjaxReplace("/platform/h5/suggestionBox/mine") } }) }).catch(() => { @@ -121,7 +122,7 @@ layout("/layouts/platform_h5.html"){ }).then(res => { if (res.code === 0) { this.$toast.success("提交成功"); - window.location.href = '/platform/suggestionBox/mine'; + pjaxReplace("/platform/h5/suggestionBox/mine") } }) }).catch(() => { diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/xgh/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/xgh/index.html new file mode 100644 index 00000000..2b7cfde5 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestionBox/xgh/index.html @@ -0,0 +1,176 @@ + + +
+ + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + +
+ 退回 + 拒绝 + 同意 +
+
+
+ +
+ + + +