-
+
-
+
@@ -256,13 +256,18 @@
钉钉
-
-
-
-
+
+
+
+
+
-
@@ -406,6 +410,12 @@ module.exports = {
fileList: [],
},
importLoading: false,
+
+ formRules: {
+ title: [{required: true, message: '请输入发送标题', trigger: ['blur', 'change']}],
+ sendTypes: [{required: true, message: '请输入发送方式', trigger: ['blur', 'change']}],
+ content: [{required: true, message: '请输入发送内容', trigger: ['blur', 'change']}],
+ }
}
},
watch: {
diff --git a/src/main/resources/static/components/plugins/ELTabPlus.vue b/src/main/resources/static/components/plugins/ELTabPlus.vue
index fb85fe1..79c8a9e 100644
--- a/src/main/resources/static/components/plugins/ELTabPlus.vue
+++ b/src/main/resources/static/components/plugins/ELTabPlus.vue
@@ -1,12 +1,15 @@
+/**
+*Desc:
+*Create by: jug
+*Create time:2023/5/8/14:52
+*/
-
@@ -38,92 +37,100 @@ module.exports = {
},
data() {
return {
- tabName: null
+ tabName: null,
+ tabIndex: 0,
}
},
methods: {
jump(tab, event) {
- let target = document.querySelector('.scroll-content')
- let scrollItems = document.querySelectorAll('.scroll-item')
- // 判断滚动条是否滚动到底部
- if (target.scrollHeight <= target.scrollTop + target.clientHeight) {
- this.tabIndex = tab.index.toString()
- }
- let totalY = scrollItems[tab.index].offsetTop - scrollItems[0].offsetTop // 锚点元素距离其offsetParent(这里是body)顶部的距离(待滚动的距离)
- let distance = document.querySelector('.scroll-content').scrollTop // 滚动条距离滚动区域顶部的距离
- // let distance = document.body.scrollTop || document.documentElement.scrollTop || window.pageYOffset // 滚动条距离滚动区域顶部的距离(滚动区域为窗口)
- // 滚动动画实现, 使用setTimeout的递归实现平滑滚动，将距离细分为50小段，10ms滚动一次
- // 计算每一小段的距离
- let step = totalY / 50
- if (totalY > distance) {
- smoothDown(document.querySelector('.scroll-content'))
- } else {
- let newTotal = distance - totalY
- step = newTotal / 50
- smoothUp(document.querySelector('.scroll-content'))
- }
+ const scrollItems = this.$el.querySelectorAll('.scroll-item')
+ const targetItem = scrollItems[tab.index]
- // 参数element为滚动区域
- function smoothDown(element) {
- if (distance < totalY) {
- distance += step
- element.scrollTop = distance
- setTimeout(smoothDown.bind(this, element), 10)
- } else {
- element.scrollTop = totalY
- }
- }
-
- // 参数element为滚动区域
- function smoothUp(element) {
- if (distance > totalY) {
- distance -= step
- element.scrollTop = distance
- setTimeout(smoothUp.bind(this, element), 10)
- } else {
- element.scrollTop = totalY
- }
- }
-
- console.log(this.tabName)
+ // ✅ 用 scrollIntoView 替代手动计算，更可靠
+ targetItem?.scrollIntoView({behavior: 'auto', block: 'start'})
+ this.tabName = tab.name
},
onScroll(e) {
- if (e.target.scrollTop === 0) {
- this.tabName = this.tabs[0].refName
+ const container = e.target
+ const {scrollTop, scrollHeight, clientHeight} = container
+
+ // ✅ 1. 优先判断：是否滚动到底部（预留 1px 容差）
+ if (scrollTop + clientHeight >= scrollHeight - 1) {
+ const lastIndex = this.tabs.length - 1
+ if (this.tabIndex !== lastIndex) {
+ this.tabIndex = lastIndex
+ this.tabName = this.tabs[lastIndex]?.refName
+ }
+ return // ✅ 命中底部直接返回，避免后续逻辑干扰
+ }
+
+ // ✅ 2. 顶部边界：scrollTop 为 0 时选中第一个
+ if (scrollTop === 0) {
+ if (this.tabIndex !== 0) {
+ this.tabIndex = 0
+ this.tabName = this.tabs[0]?.refName
+ }
return
}
- $('#app > div.guava-main-content > span > div.el-card').each((idx, item) => {
- if ($(item).is(':visible')) {
- const scrollItems = $(item).find('.scroll-item')
- for (let i = scrollItems.length - 1; i >= 0; i--) {
- let judge = e.target.scrollTop >= scrollItems[i].offsetTop - scrollItems[0].offsetTop - 300
- if (judge) {
- this.tabIndex = i.toString()
- this.tabName = this.tabs[this.tabIndex].refName
- break
- }
+ // ✅ 3. 中间区域：正常遍历匹配（移除 jQuery，用 this.$el 局部查询）
+ const scrollItems = this.$el.querySelectorAll('.scroll-item')
+ const threshold = 100 // 可视区域偏移阈值
+
+ for (let i = scrollItems.length - 1; i >= 0; i--) {
+ const itemTop = scrollItems[i].offsetTop - scrollItems[0].offsetTop
+ if (scrollTop + threshold >= itemTop) {
+ if (this.tabIndex !== i) {
+ this.tabIndex = i
+ this.tabName = this.tabs[i]?.refName
}
+ break
}
+ }
+ },
+ scrollToTop(){
+ const tryScroll = () => {
+ const scrollEl = this.$el.querySelector('.scroll-content')
+ if (!scrollEl) return
+
+ // 检查内容是否已渲染（scrollHeight > clientHeight 说明有滚动空间）
+ if (scrollEl.scrollHeight <= scrollEl.clientHeight) {
+ // 内容还没加载完，100ms 后重试
+ setTimeout(tryScroll, 100)
+ return
+ }
+
+ // ✅ 内容就绪，执行滚动
+ scrollEl.scrollTo({ top: 0, behavior: 'auto' })
+ this.tabIndex = 0
+ this.tabName = this.tabs[0]?.refName
+ }
+
+ this.$nextTick(() => {
+ setTimeout(tryScroll, 200)
})
},
-
scrollEnd() {
this.$nextTick(() => {
+ // 等待 slot 内容渲染（根据内容复杂度调整 200~400ms）
setTimeout(() => {
- $('#app > div.guava-main-content > span > div.el-card').each((idx, item) => {
- if ($(item).is(':visible')) {
- const scrollContent = $(item).find('.scroll-content')[0]
- scrollContent.scrollTop = scrollContent.scrollHeight
- }
- })
- // document.querySelector('.scroll-content').scrollTop = document.querySelector('.scroll-content').scrollHeight
- this.tabName = 'audit'
+ const scrollEl = this.$el.querySelector('.scroll-content')
+ if (!scrollEl || !this.tabs?.length) return
+
+ // ✅ 1. 滚动到底部
+ scrollEl.scrollTop = scrollEl.scrollHeight
+
+ // ✅ 2. 选中最后一个 tab
+ const lastIndex = this.tabs.length - 1
+ this.tabIndex = lastIndex
+ this.tabName = this.tabs[lastIndex].refName
+
+ // ✅ 3. 可选：强制触发一次 onScroll 同步状态（节流场景下更可靠）
+ this.onScroll?.({ target: scrollEl })
}, 250)
})
- }
-
+ },
},
created() {
@@ -175,7 +182,7 @@ module.exports = {
.line-name::before {
content: "";
width: 5px;
- background: #11879f;
+ background: rgb(24, 103, 176);
display: inline-block;
position: absolute;
left: 0;
@@ -207,4 +214,4 @@ module.exports = {
color: #fff;
}
-
\ No newline at end of file
+
diff --git a/src/main/resources/static/components/proposal/ProposalInfo.vue b/src/main/resources/static/components/proposal/ProposalInfo.vue
index 91a3d67..296e1e1 100644
--- a/src/main/resources/static/components/proposal/ProposalInfo.vue
+++ b/src/main/resources/static/components/proposal/ProposalInfo.vue
@@ -1,471 +1,523 @@
-
+
-
-
-
-
-
-
-
+
+
+ -->
-
-
-
-
-
+
diff --git a/src/main/resources/views/mobile/suggestionBox/admin.html b/src/main/resources/views/mobile/suggestionBox/admin.html
new file mode 100644
index 0000000..cd53fc0
--- /dev/null
+++ b/src/main/resources/views/mobile/suggestionBox/admin.html
@@ -0,0 +1,877 @@
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html b/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html
index a97ef67..f83f43a 100644
--- a/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html
+++ b/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html
@@ -24,13 +24,6 @@ layout("/layouts/platform.html"){
-
-
@@ -77,7 +70,8 @@ layout("/layouts/platform.html"){
不填写发送链接发送文本消息，填写发送链接发送卡片消息
+
-
+
@@ -14,10 +17,6 @@
-
- {{ item.name }}
-
+
+
+
+
+
+ {{ viewData.proposalCode }}
+ {{
+ viewData.createUserName + "-" + viewData.loginname
+ }}
+
+ {{ viewData.createTime }}
+ {{ viewData.meetingName || "暂无" }}
+ {{ viewData.unionName }}
+
+ {{ viewData.mannerCode !== "W03" ? viewData.delegationName : viewData.committeeName }}
+
-
-
-
-
- {{ viewData.proposalCode }}
- {{
- viewData.createUserName + "-" + viewData.loginname
- }}
-
- {{ viewData.createTime }}
- {{ viewData.meetingName || "暂无" }}
- {{ viewData.unionName }}
-
- {{ viewData.mannerCode !== "W03" ? viewData.delegationName : viewData.committeeName }}
-
+ {{ viewData.typeName }}
+ {{
+ viewData.resultName ? viewData.resultName : "暂无"
+ }}
+
+
+
- {{ viewData.typeName }}
- {{
- viewData.resultName ? viewData.resultName : "暂无"
- }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
{{ row.proposalName }}
-
-
-
-
-
-
-
-
-
- {{ row.inviteTime }}
-
-
-
-
-
- 未附议
-
-
- 同意
- 拒绝
-
-
-
-
-
-
-
-
-
-
-
-
- {{ o.username + "-" + o.loginName }}
- {{ o.auditTime }}
-
- {{ o.flag ? "通过" : "退回" }}
-
- {{ o.opinion }}
-
-
-
-
-
-
-
-
-
-
-
- {{ o.username + "-" + o.loginName }}
-
-
- {{ o.dictName || "暂无" }}
-
- {{ o.auditTime }}
- {{ o.opinion }}
-
-
-
-
+
+
+
-
-
-
-
-
- {{ o.username + "-" + o.loginName }}
-
-
-
- {{ o.flag ? "通过" : "退回修改" }}
-
- {{ o.auditTime }}
-
-
- {{ hostUnit }}（主办）
-
- ，{{ helpUnit }}（协办）
-
-
-
-
- {{ o.opinion }}
-
-
-
+
+
+
+
+ {{ row.inviteTime }}
-
+
+
+
+
+ 未附议
+
+
+ 同意
+ 拒绝
+
+
+
+
+
-
-
-
- {{ o.underTakeName }}
- {{ o.opionTime }}
-
- 同意承办
- 无法承办
+
+
+
+
+ {{ o.username + "-" + o.loginName }}
+ {{ o.auditTime }}
+
+ {{ o.flag ? "通过" : "退回" }}
+
+ {{ o.opinion }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ o.username + "-" + o.loginName }}
+
+
+ {{ o.dictName || "暂无" }}
+
+ {{ o.auditTime }}
+ {{ o.opinion }}
+
+
+
+
+
+
+
+
+
+
+ {{ o.username + "-" + o.loginName }}
+
+
+
+ {{ o.flag ? "通过" : "退回修改" }}
+
+ {{ o.auditTime }}
+
+
+ {{ hostUnit }}（主办）
+
+ ，{{ helpUnit }}（协办）
+
+
+
+
+ {{ o.opinion }}
+
+
+
+
+
-
- {{ viewData.branchLeaderOpinion }}
-
-
-
- {{ o.username }}
- {{ o.auditTime }}
- {{ o.opinion }}
-
-
-
-
+
+
+
+ {{ o.underTakeName }}
+ {{ o.opionTime }}
+
+ 同意承办
+ 无法承办
+
+ {{ o.opinion }}
+
+
+
+
+
+
+
+ {{ viewData.caseUnitAudit.username + "-" + viewData.caseUnitAudit.loginName }}
+
+ {{ viewData.resultName }}
+ {{ viewData.caseUnitAudit.auditTime }}
+
+
+ {{ item.unitName }}
+ ({{ item.undertakeType === 1 ? "主办" : "协办" }})
+ {{ index + 1 === viewData.undertake.length ? "" : "、" }}
-
+
+ {{ viewData.caseUnitAudit.opinion }}
+
+
+
+
+
-
-
-
- {{
- o.unitName
- }}({{ o.undertakeType === 1 ? "主办" : "协办" }})
-
- {{ o.dfrUserName }}
- {{ o.replyTime }}
- {{ o.replyNumber }}
- {{ o.implementState }}
-
-
-
-
-
-
-
-
+
+
+
+ {{
+ o.unitName
+ }}({{ o.undertakeType === 1 ? "主办" : "协办" }})
+
+ {{ o.dfrUserName }}
+ {{ o.replyTime }}
+ {{ o.replyNumber }}
+ {{ o.implementState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ o.username }}
+ {{ o.auditTime }}
+ {{ o.opinion }}
+
+
-
+
+
+
-
-
-
-
- {{ o.username }}
- {{ o.auditTime }}
- {{ o.opinion }}
-
-
-
-
+
+
+
+ {{ o.username }}({{ o.loginname }})
+ {{ o.feedbackTime }}
+ {{ o.feedbackNumber }}
+ {{ o.feedbackResult }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ {{ viewData.proposalName }}
+
+
- {{ viewData.proposalName }}
-
-
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/mobile/suggestionBox/index.html b/src/main/resources/views/mobile/suggestionBox/index.html
new file mode 100644
index 0000000..5eeeac6
--- /dev/null
+++ b/src/main/resources/views/mobile/suggestionBox/index.html
@@ -0,0 +1,531 @@
+
+
+
+
+
+
+
+
+ {{ stats.total }}
+ 总意见数
+
+
+ {{ stats.pending }}
+ 待回复
+
+
+ {{ stats.replied }}
+ 已回复
+
+
+ {{ stats.today }}
+ 今日新增
+
+
+
+
+
+
+
+ 筛选条件
+
+ {{ filters.isCollapsed ? '展开' : '收起' }}
+
+
+
+
+
+
+
+
+
+ 状态
+
+
+
+ 时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无符合条件的意见
+
+
+
+
+ {{ item.title || '意见反馈' }}
+
+ {{ getStatusText(item.isReply) }}
+
+
+
+ {{ item.content }}
+
+
+
+
+
+
+ {{ currentSuggestion.title || '意见反馈' }}
+
+
+
+
+ 提交人信息
+
+
+
+ 姓名：
+ {{ currentSuggestion.submitterName || '未填写' }}
+
+
+ 工号：
+ {{ currentSuggestion.submitterLoginName || '未填写' }}
+
+
+ 单位：
+ {{ currentSuggestion.submitterUnitName || '未填写' }}
+
+
+ 联系方式：
+ {{ currentSuggestion.concat || '未填写' }}
+
+
+
+
+ 意见内容
+ {{ currentSuggestion.content }}
+
+
+
+ 附件
+
+
+
+
+ 已回复内容
+ {{ currentSuggestion.reply }}
+
+
+
+
+ {{ currentSuggestion.isReply ? '修改回复' : '回复意见' }}
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/mobile/suggestionBox/mine.html b/src/main/resources/views/mobile/suggestionBox/mine.html
new file mode 100644
index 0000000..8283eff
--- /dev/null
+++ b/src/main/resources/views/mobile/suggestionBox/mine.html
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交意见
+分享您的想法和建议
+
+
+
+
+
+
+
+
+
+ 我的意见
+查看您提交的所有意见
+
+
+
+
+
+
+
+ 意见管理
+管理所有用户提交的意见
+
+
+
+
+
+
+
+
+ 使用指南
+
+
+
+
+
+ 1
+
+
+
+ 提交意见
+点击"提交意见"按钮，填写您的意见和建议
+
+
+
+ 2
+
+
+
+ 等待处理
+我们将在3个工作日内处理您的意见
+
+
+ 3
+
+
+
+ 查看回复
+在"我的意见"中查看官方回复
+
+
+
+
+ 常见问题
+ 解答您的疑惑 +
+
+
+
+
+
+ 如何提交带附件的意见？
+
+
+
+ 在提交意见表单中，您可以上传最多3个文件作为附件，支持图片格式。点击附件上传区域，选择您要上传的文件即可。
+
+
+
+
+ 意见提交后多久能收到回复？
+
+
+
+ 我们会在3个工作日内处理您的意见，紧急问题会优先处理。您可以随时在"我的意见"中查看处理进度。
+
+
+
+
+ 我可以修改已提交的意见吗？
+
+
+
+ 提交后的意见暂不支持修改，如有补充，请重新提交并说明这是对之前意见的补充。我们会将相关意见关联处理。
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/mobile/suggestionBox/write.html b/src/main/resources/views/mobile/suggestionBox/write.html
new file mode 100644
index 0000000..915f077
--- /dev/null
+++ b/src/main/resources/views/mobile/suggestionBox/write.html
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去提交意见
+
+
+
+ 您还没有提交过意见
+
+
+
+
+ {{ item.title || '意见反馈' }}
+
+ {{ getStatusText(item.isReply) }}
+
+ {{ item.content }}
+
+
+
+
+
+
+ {{ currentSuggestion.title || '意见反馈' }}
+
+
+
+
+ 提交人信息
+
+
+
+ 姓名：
+ {{ currentSuggestion.submitterName || '未填写' }}
+
+
+ 工号：
+ {{ currentSuggestion.submitterLoginName || '未填写' }}
+
+
+ 单位：
+ {{ currentSuggestion.submitterUnitName || '未填写' }}
+
+
+ 联系方式：
+ {{ currentSuggestion.concat || '未填写' }}
+
+
+
+
+ 意见内容
+ {{ currentSuggestion.content }}
+
+
+
+ 附件
+
+
+
+
+ 回复
+ {{ currentSuggestion.replyContent }}
+
+
+ 回复
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/platform/blessing/applyList.html b/src/main/resources/views/platform/blessing/applyList.html
index 6da353b..9becd7f 100644
--- a/src/main/resources/views/platform/blessing/applyList.html
+++ b/src/main/resources/views/platform/blessing/applyList.html
@@ -406,15 +406,19 @@ layout("/layouts/platform.html"){
this.tableLoading = false
if (data.code == 0) {
data.data.list.forEach(v => {
- const a = JSON.parse(v.sendTypes).map(z => {
- if (z == "msg") {
- return "短信"
- } else {
- return "微信"
- }
+ if (v.sendTypes){
+ const a = JSON.parse(v.sendTypes).map(z => {
+ if (z === "DingTalk") {
+ return "钉钉"
+ } else {
+ return "钉钉"
+ }
- })
- v.sendTypesName = a.toString()
+ })
+ v.sendTypesName = a.toString()
+ } else {
+ v.sendTypesName = "钉钉"
+ }
})
this.tableData = data.data.list;
this.pageForm.totalCount = data.data.totalCount;
diff --git a/src/main/resources/views/platform/data/user/UpdateUser.html b/src/main/resources/views/platform/data/user/UpdateUser.html
index e1edd50..6cccf6c 100644
--- a/src/main/resources/views/platform/data/user/UpdateUser.html
+++ b/src/main/resources/views/platform/data/user/UpdateUser.html
@@ -214,6 +214,9 @@ layout("/layouts/platform.html"){
:visible.sync="dialogVisible"
width="50%">
+
+
+
+
+
+ 填写人信息
+
+
+
+ 姓名
+
+
+
+
+
+ 工号
+
+
+
+
+
+ 手机号码
+
+
+
+
+
+ 所在单位
+
+
+
+
+
+
+
+ 填写标题
+
+
+
+ 标题
+
+
+
+
+
+
+
+ 填写意见建议内容
+
+
+
+
+
+
+
+
+ 照片上传
+
+
+
+
+
+
+ 提 交
+
+
+ 更新人员不会改变是否会员数据，只会改变基础数据。会员是管理员邀请入会，在【数据更新记录】中新入职的人员会自动发送钉钉邀请入会
+
-
@@ -97,11 +97,6 @@ layout("/layouts/platform.html"){
pageSize: 5,
totalCount: 0,
},
- formRules: {
- title: [{required: true, message: '请输入发送标题', trigger: ['blur', 'change']}],
- sendTypes: [{required: true, message: '请输入发送方式', trigger: ['blur', 'change']}],
- content: [{required: true, message: '请输入发送内容', trigger: ['blur', 'change']}],
- }
}
},
components: {
@@ -155,6 +150,7 @@ layout("/layouts/platform.html"){
this.selectDialogVisible = true
},
async doAdd(flag) {
+ await this.$refs.msgNotifyRef.$refs.addform.validate()
this.formData = this.msgData
if (this.formData.sendMode === 'four' && !this.formData.existsLoginNameRedisKey) {
this.$notify.warning('请先上传文件核对人员在选择发送！')
diff --git a/src/main/resources/views/platform/msgNotify/sendList.html b/src/main/resources/views/platform/msgNotify/sendList.html
index 39704d0..7d896c3 100644
--- a/src/main/resources/views/platform/msgNotify/sendList.html
+++ b/src/main/resources/views/platform/msgNotify/sendList.html
@@ -35,6 +35,9 @@ layout("/layouts/platform.html"){
style="width: 80px;">
- 温馨提醒:该提案的承办单位【{{formData.auditUnderTakeName}}】是由您来分管的，只需要审批一次即可。
-
-
+ 温馨提醒:该提案的承办单位【{{formData.auditUnderTakeName}}】是由您来分管的，只需要审批一次即可。
+
+