- 邀请
-
-
- 
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}（{{item.loginName}}）
+
+
+ {{item.unitName}}
+
+
+
+
+
+
+
+
+
+
+
+ `,
+ props: {
+ visible: {
+ type: Boolean,
+ default: false
+ },
+ confirmVisible: {
+ type: Boolean,
+ default: false
+ }
+ },
data() {
return {
- visible: false,
secondedNum: 0,
record: {},
tableData: [],
@@ -71,72 +110,86 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
},
config: {},
isInvite: "0",
- tableSelection: []
+ tableSelection: [],
+ confirmMessage: ""
+ }
+ },
+ watch: {
+ visible(value) {
+ if (!value || !this.record.id) return
+ this.getConfig().then(() => {
+ this.pageData()
+ })
}
},
methods: {
- async onOpen(record) {
- this.visible = true
- this.record = record
- await this.getConfig()
- this.pageData()
-
-
- },
- detail(id) {
+ /**
+ * 准备邀请附议弹框数据。
+ * record 为列表当前提案对象，至少包含 id 和 sessionId；该方法只缓存提案并重置查询条件，无返回值。
+ */
+ prepare(record) {
+ this.$set(this, "record", record || {})
+ this.$set(this, "isInvite", "0")
+ this.$set(this, "tableSelection", [])
+ this.$set(this.pageForm, "pageNumber", 1)
+ this.$set(this.pageForm, "isInvite", false)
+ this.$set(this.pageForm, "searchKeyword", null)
},
+
+ // 校验勾选结果后打开确认 Dialog，实际提交在确认并回退 Dialog 历史层后执行。
invite() {
if (this.tableSelection.length === 0) {
- this.$toast("请先选择附议人后在点击邀请")
+ this.$toast("请先选择附议人后再点击邀请")
return
}
+ const userNames = [...new Set(this.tableSelection.map((item) => item.userName))]
+ this.$set(this, "confirmMessage", "您确定要邀请" + userNames.join("、") + "代表附议吗？")
+ this.$emit("open-confirm")
+ },
- const loginNames = [...new Set(this.tableSelection.map((s) => s.loginName))]
- const userName = [...new Set(this.tableSelection.map((s) => s.userName))]
-
- console.log(this.tableSelection)
-
- this.$dialog.confirm({
- title: '提示',
- message: "您确定要邀请" + userName.join("、") + "代表附议吗？",
- }).then(() => {
- this.$axios.post("/platform/proposal/mine/inviteSeconder", {
- proposalId: this.record.id,
- seconders: JSON.stringify(loginNames)
- }).then((res) => {
- if (res.code === 0) {
- this.pageData()
- this.$toast.success(res.msg)
- this.tableSelection = []
- // this.visible = false
- this.$emit("refresh", null)
- }
- })
- }).catch(() => {
-
+ /**
+ * 提交邀请附议人。
+ * 参数 proposalId 为当前提案主键，seconders 为已勾选人员工号数组；接口返回 Result，code 为 0 表示邀请成功。
+ */
+ submitInvite() {
+ const loginNames = [...new Set(this.tableSelection.map((item) => item.loginName))]
+ this.$axios.post("/platform/proposal/mine/inviteSeconder", {
+ proposalId: this.record.id,
+ seconders: JSON.stringify(loginNames)
+ }).then((res) => {
+ if (res.code === 0) {
+ this.pageData()
+ this.$toast.success(res.msg)
+ this.$set(this, "tableSelection", [])
+ this.$emit("refresh")
+ }
})
},
+
+ /**
+ * 查询邀请附议人列表。
+ * 参数包含当前提案 ID、届次 ID、邀请状态、关键词及分页条件；返回分页对象并更新列表和总数。
+ */
pageData() {
this.$axios.post("/platform/proposal/mine/listSeconder", {
...this.pageForm,
sessionId: this.record.sessionId,
proposalId: this.record.id
+ }).then((res) => {
+ if (res.code === 0) {
+ this.$set(this, "tableData", res.data.list || [])
+ this.$set(this.pageForm, "totalCount", res.data.totalCount || 0)
+ this.echoCheckBox()
+ }
})
- .then((res) => {
- if (res.code === 0) {
- this.tableData = res.data.list
- this.pageForm.totalCount = res.data.totalCount
- this.echoCheckBox()
- }
- })
},
- // 翻页回显勾选
+ // 翻页后回显当前已勾选的附议人。
echoCheckBox() {
this.$nextTick(() => {
this.tableData.forEach((item) => {
- const checkboxRef = this.$refs['checkboxes' + item.loginName]
- if (checkboxRef && this.tableSelection.map((s) => s.loginName).includes(item.loginName)) {
+ const checkboxRef = this.$refs["checkboxes" + item.loginName]
+ if (checkboxRef && this.tableSelection.map((selected) => selected.loginName).includes(item.loginName)) {
checkboxRef[0].toggle()
}
})
@@ -144,24 +197,29 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
},
doSearch() {
- this.pageForm.pageNumber = 1
+ this.$set(this.pageForm, "pageNumber", 1)
this.pageData()
},
- isInviteClick(index, title) {
- this.pageForm.isInvite = index === "1"
+ isInviteClick(name) {
+ this.$set(this.pageForm, "isInvite", name === "1")
this.doSearch()
},
tableRowToggle(index) {
- console.log(index)
+ if (this.pageForm.isInvite || index < 0) return
},
- async getConfig() {
- const {code, data} = await this.$axios.post("/platform/proposal/common/config")
- if (code === 0) {
- this.config = data
- }
+ /**
+ * 查询提案附议配置。
+ * 接口无业务参数，返回 ProposalConfig 配置对象；Promise 用于确保配置完成后再查询人员列表。
+ */
+ getConfig() {
+ return this.$axios.post("/platform/proposal/common/config").then((res) => {
+ if (res.code === 0) {
+ this.$set(this, "config", res.data || {})
+ }
+ })
}
}
}
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html
index 742f7ee0..dd090341 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html
@@ -212,6 +212,9 @@ layout("/layouts/platform_h5.html"){
}
}
+
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
index 2a38cbd6..a923b847 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
@@ -1,131 +1,58 @@
+
- 暂无附议人
-
- {{ isInvite === "1" ? "当前暂无已邀请的附议人" : "当前暂无可邀请的附议人" }}
-
+ template: /*language=HTML*/ `
+
+
+
+
+ 邀请
+
-
- `,
+
+
+
+
+
+ 暂无附议人
+
+ {{ isInvite === "1" ? "当前暂无已邀请的附议人" : "当前暂无可邀请的附议人" }}
+
+
-
+
-
+
-
+
@@ -303,11 +306,15 @@ layout("/layouts/platform_h5.html"){
-
-
-
-
-
+
-
-
-
- {{row.code}}
- {{row.typeName}}
- {{row.createUserName}}
- {{row.delegationName}}
- {{row.curTaskName}}
-
-
-
+ {{row.code}} {{row.typeName}} {{row.createUserName}} {{row.delegationName}} {{row.curTaskName}}
+
+
-
+
+
+ 退回答复 同意答复
+
+
+
+
+
-
-
-
- 查看
-
-
-
- 审核
-
-
-
- 撤回
-
+ 审批意见*
-
-
-
-
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
index cdbdd191..f51a693b 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
@@ -2,6 +2,8 @@
layout("/layouts/platform_h5.html"){
#-->
-
-
-
- {{formData.taskName}}
-
- 退回答复
- 同意答复
-
-
-
@@ -309,16 +355,15 @@ layout("/layouts/platform_h5.html"){
{{row.curTaskName || '--'}}
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html
deleted file mode 100644
index bca06262..00000000
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
-
@@ -326,13 +371,75 @@ layout("/layouts/platform_h5.html"){
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 提案附议 + * +
+
+ 不同意
+ 同意
+
+
-
-
-
-
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html
index 9fa8b981..459e45bd 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html
@@ -7,9 +7,12 @@ layout("/layouts/platform_h5.html"){
height: 26px;
}
+
-
-
-
- 提案附议
-
- 不同意
- 同意
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html
deleted file mode 100644
index 42e2d48a..00000000
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
+
@@ -76,14 +81,19 @@ layout("/layouts/platform_h5.html"){
+
-
+ {{ '意见' + (index + 1) }}
- 删除
+
-
-
-
-
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
index 336c20a1..acd5d1cf 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
@@ -229,6 +229,9 @@ layout("/layouts/platform_h5.html"){
}
}
+
-
-
-
-
-
- 承办单位意见
-
- 取消
- 提交
-
-
-
-
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js
index 78e9bb72..1decf96d 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js
@@ -1,147 +1,49 @@
const transfer = {
template: /*language=HTML*/ `
-
-
-
- 请搜索需要转办的用户
-
-
-
-
-
-
-
- {{transferForm.code}}
- {{transferForm.name}}
- {{transferForm.delegationName}}
-