c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-08-13 08:39:26 +08:00
parent ec900e5b4d
commit e4485d7b02
218 changed files with 2471 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue
+11 -4
View File
@@ -1,7 +1,7 @@
<template>
<div class="user-audit-opinion-textarea">
<el-input type="textarea" :rows="3" v-model="content" v-bind="$attrs" @change="onChange" @blur="onBlur"></el-input>
<div class="opinion-wrap">
<div class="opinion-wrap" v-if="showCommonOpinion">
<div class="title">常用审核意见：</div>
<el-select v-model="selectOpinion" placeholder="可选择常用审核意见" size="small" @change="selectOpinionChange">
<el-option v-for="item in opinionOptions" :key="item.id" :label="item.text" :value="item.text"></el-option>
@@ -11,7 +11,7 @@
</div>
</div>
<el-dialog title="设置常用意见" :visible.sync="dialogVisible" width="50%" append-to-body>
<el-dialog v-if="showCommonOpinion" title="设置常用意见" :visible.sync="dialogVisible" width="50%" append-to-body>
<el-table :data="tableOpinionData" key="id">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="意见内容">
@@ -40,7 +40,11 @@
module.exports = {
name: "index",
props: {
value: String
value: String,
showCommonOpinion: {
type: Boolean,
default: true
}
},
data() {
return {
@@ -105,7 +109,10 @@ module.exports = {
}
},
created() {
this.listOpinion()
// 常用意见为公共可选能力；页面关闭该能力时不再发起无用的初始化查询。
if (this.showCommonOpinion) {
this.listOpinion()
}
}
}
</script>
src/main/resources/views/layouts/platform.html
+19 -19
View File
@@ -419,25 +419,6 @@ layout("/layouts/v4/baseLayout.html"){
},
defaultSelect() {
// 应用中心点击根菜单时会缓存完整应用信息，根菜单配置了href则应优先进入根菜单页面。
try {
const rootApp = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
const currentAppId = GetQueryString("appId")
const hasRootHref = rootApp && typeof rootApp.href === "string" && rootApp.href.trim() !== ""
// 校验缓存应用与当前URL一致，避免复用旧标签页缓存时跳转到其他应用。
if (hasRootHref && String(rootApp.id) === currentAppId) {
this.activeMenuIndex = rootApp.id
this.openedMenus = []
this.$nextTick(() => {
this.menuSelect(this.activeMenuIndex, this.openedMenus)
commonUtil.pjaxPush(getBaseSubAppPath(rootApp.href))
})
return
}
} catch (e) {
// 根菜单缓存缺失或格式异常时，继续使用子菜单href作为默认入口。
}
// 查找第一个有href的子菜单
function findFirstChildWithHref(menus) {
for (const menu of menus) {
@@ -479,6 +460,25 @@ layout("/layouts/v4/baseLayout.html"){
tempLink.click()
document.body.removeChild(tempLink)*/
})
return
}
// 没有已授权的可用子菜单时，才使用当前应用自身配置的地址作为兜底入口。
try {
const rootApp = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
const currentAppId = GetQueryString("appId")
const hasRootHref = rootApp && typeof rootApp.href === "string" && rootApp.href.trim() !== ""
// 校验缓存应用与当前URL一致，避免复用旧标签页缓存时跳转到其他应用。
if (hasRootHref && String(rootApp.id) === currentAppId) {
this.activeMenuIndex = rootApp.id
this.openedMenus = []
this.$nextTick(() => {
this.menuSelect(this.activeMenuIndex, this.openedMenus)
commonUtil.pjaxPush(getBaseSubAppPath(rootApp.href))
})
}
} catch (e) {
// 根菜单缓存缺失或格式异常时保持当前页面，不执行无权限地址跳转。
}
},
src/main/resources/views/platform/sys/union/branchUnionPartUnitManage.js
+5 -3
View File
@@ -16,11 +16,12 @@ const branchUnionPartUnitManage = {
</el-row>
</el-card>
<el-card shadow="never" style="border: 1px solid var(--border-color-lighter); margin-top: 10px">
<el-table :data="tableData" :height="table_height ? Math.max(200, table_height - 40) : null" border>
<el-table-column type="index" width="50" label="序号"></el-table-column>
<el-table :data="tableData" :height="table_height ? Math.max(200, table_height - 90) : null" border>
<el-table-column type="index" width="50" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="unitcode" label="单位编码"></el-table-column>
<el-table-column prop="name" label="单位名称"></el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<el-dialog title="设置组成单位" :visible.sync="dialogFormVisible" width="1000px" :close-on-click-modal="false">
@@ -101,7 +102,8 @@ const branchUnionPartUnitManage = {
pageData() {
$.get("/platform/sys/union/branchUnionPartUnitPageData", { ...this.pageForm, unionId: this.union_id }).then((res) => {
if (res.code === 0) {
this.tableData = res.data
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
}
})
}
src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
+3 -3
View File
@@ -122,10 +122,10 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</activity-culture-info-activity>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html
+3 -3
View File
@@ -106,10 +106,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html
+3 -3
View File
@@ -93,10 +93,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html
+3 -3
View File
@@ -113,10 +113,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html
+3 -3
View File
@@ -113,10 +113,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html
+3 -3
View File
@@ -126,10 +126,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html
+3 -3
View File
@@ -117,10 +117,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html
+3 -3
View File
@@ -130,10 +130,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html
+3 -3
View File
@@ -130,10 +130,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+3 -3
View File
@@ -131,10 +131,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+3 -3
View File
@@ -129,10 +129,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/leadthought/branchunionaudit/index.html
+3 -3
View File
@@ -73,10 +73,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/activity/leadthought/schoolunionaudit/index.html
+3 -3
View File
@@ -73,10 +73,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html
+3 -3
View File
@@ -83,10 +83,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</evaluate-info>
src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html
+3 -3
View File
@@ -83,10 +83,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</evaluate-info>
src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html
+3 -3
View File
@@ -83,10 +83,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</evaluate-info>
src/main/resources/views/platform/zhgh/club/examine/clubAudit/index.html
+3 -3
View File
@@ -84,10 +84,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</examine-info>
src/main/resources/views/platform/zhgh/club/examine/schoolAudit/index.html
+3 -3
View File
@@ -80,10 +80,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</examine-info>
src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html
+3 -3
View File
@@ -86,10 +86,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</examine-info>
src/main/resources/views/platform/zhgh/club/infoManage/auditManager/index.html
+3 -3
View File
@@ -82,10 +82,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditReport/index.html
+3 -3
View File
@@ -79,10 +79,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditRule/index.html
+3 -3
View File
@@ -79,10 +79,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+3 -3
View File
@@ -106,10 +106,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html
+3 -3
View File
@@ -90,10 +90,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/club/register/clubConfirm/index.html
+3 -3
View File
@@ -86,10 +86,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</register-info>
src/main/resources/views/platform/zhgh/club/register/officeAudit/index.html
+3 -3
View File
@@ -86,10 +86,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</register-info>
src/main/resources/views/platform/zhgh/club/register/schoolLeaderAudit/index.html
+3 -3
View File
@@ -86,10 +86,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</register-info>
src/main/resources/views/platform/zhgh/club/register/schoolReply/index.html
+3 -3
View File
@@ -86,10 +86,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</register-info>
src/main/resources/views/platform/zhgh/dayofficework/Tour/schoolUnionApproval/index.html
+3 -3
View File
@@ -127,10 +127,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</tour-approval-info>
src/main/resources/views/platform/zhgh/dayofficework/Tour/unionApproval/index.html
+3 -3
View File
@@ -127,10 +127,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</tour-approval-info>
src/main/resources/views/platform/zhgh/dayofficework/article/branchUnionApproval/index.html
+3 -3
View File
@@ -70,10 +70,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</article-info>
src/main/resources/views/platform/zhgh/dayofficework/article/clubApproval/index.html
+3 -3
View File
@@ -70,10 +70,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</article-info>
src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html
+3 -3
View File
@@ -70,10 +70,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</article-info>
src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html
+3 -3
View File
@@ -83,7 +83,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doApproval('PASS')">通过</el-button>
<!-- <el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>-->
<el-button type="danger" @click="doApproval('BACK_TO_START')">退回到投稿人</el-button>
<el-button type="danger" @click="doApproval('BACK_TO_UNION')"
v-if="currentRow.origin === 'ARTICLE_ORIGIN_UNION'">退回到分工会
@@ -91,8 +92,7 @@ layout("/layouts/platform.html"){
<el-button type="danger" @click="doApproval('BACK_TO_CLUB')"
v-if="currentRow.origin === 'ARTICLE_ORIGIN_CLUB'">退回到社团
</el-button>
<!-- <el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>-->
<el-button type="primary" @click="doApproval('PASS')">通过</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/dayofficework/article/schoolUnionApproval/index.html
+3 -3
View File
@@ -70,10 +70,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</article-info>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+3 -3
View File
@@ -108,10 +108,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</cadre-training-info>
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html
+3 -3
View File
@@ -107,10 +107,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</enrollment-registration-info>
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/unionAudit/index.html
+3 -3
View File
@@ -91,10 +91,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</enrollment-registration-info>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html
+3 -3
View File
@@ -82,10 +82,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html
+3 -3
View File
@@ -90,10 +90,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
+3 -3
View File
@@ -66,10 +66,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</fund-member-info>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
+3 -3
View File
@@ -77,10 +77,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</fund-member-info>
src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
+3 -3
View File
@@ -87,10 +87,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</leave-info>
src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
+3 -3
View File
@@ -87,10 +87,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</leave-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+3 -3
View File
@@ -127,10 +127,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</activity-budget-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html
+3 -3
View File
@@ -127,10 +127,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</activity-budget-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html
+3 -3
View File
@@ -91,10 +91,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubZxAudit/index.html
+3 -3
View File
@@ -91,10 +91,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html
+3 -3
View File
@@ -105,10 +105,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html
+3 -3
View File
@@ -123,10 +123,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="openAuditPass" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html
+3 -3
View File
@@ -123,10 +123,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/unionAudit/index.html
+3 -3
View File
@@ -91,10 +91,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</outlay-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html
+3 -3
View File
@@ -94,10 +94,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/dayofficework/siteCug/schoolUnionAudit/index.html
+3 -3
View File
@@ -156,10 +156,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" :loading="auditLoading" :disabled="auditLoading" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" :loading="auditLoading" :disabled="auditLoading" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" :loading="auditLoading" :disabled="auditLoading" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(2)" :loading="auditLoading" :disabled="auditLoading" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(6)" :loading="auditLoading" :disabled="auditLoading" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</info>
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html
+2 -2
View File
@@ -120,9 +120,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</union-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+3 -3
View File
@@ -122,10 +122,10 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(5)" size="small" type="info" :loading="formLoading">退回到发起人</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="danger" :loading="formLoading">拒绝申请</el-button>
<el-button @click="handleTaskAction(3)" size="small" type="primary" :loading="formLoading">同意申请</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="danger" :loading="formLoading">拒绝申请</el-button>
<el-button @click="handleTaskAction(5)" size="small" type="info" :loading="formLoading">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</union-reimburse-info>
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html
+1 -1
View File
@@ -113,8 +113,8 @@ layout("/layouts/platform.html"){
</el-form>
<div style="float: right;margin: 20px 0">
<el-button type="danger" @click="doReview(false)">拒绝</el-button>
<el-button type="primary" @click="doReview(true)">通过</el-button>
<el-button type="danger" @click="doReview(false)">拒绝</el-button>
</div>
</el-tab-pane>
</template>
src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html
+1 -1
View File
@@ -129,8 +129,8 @@ layout("/layouts/platform.html"){
</el-form>
<div style="float: right;margin: 20px 0">
<el-button @click="doReview(false)" type="danger">拒绝</el-button>
<el-button @click="doReview(true)" type="primary">通过</el-button>
<el-button @click="doReview(false)" type="danger">拒绝</el-button>
</div>
</el-tab-pane>
</template>
src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html
+3 -3
View File
@@ -105,12 +105,12 @@ layout("/layouts/platform.html"){
</el-form>
<div style="float: right;margin: 20px 0">
<el-button type="danger" @click="doReview(0)">
拒绝
</el-button>
<el-button type="primary" @click="doReview(1)">
通过
</el-button>
<el-button type="danger" @click="doReview(0)">
拒绝
</el-button>
</div>
</el-tab-pane>
</template>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/approval/index.html
+3 -3
View File
@@ -74,10 +74,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</grassroots-congress-material-info>
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/approval/index.html
+3 -3
View File
@@ -93,10 +93,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回修改</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回修改</el-button>
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
</el-row>
</div>
</grassroots-congress-meeting-info>
src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html
+20 -36
View File
@@ -19,41 +19,19 @@ layout("/layouts/platform.html"){
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -199,6 +177,8 @@ layout("/layouts/platform.html"){
businessNo: "",
tabActive: "0",
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
typeIds: [],
caseFilingResults: [],
unionId: null,
@@ -213,7 +193,7 @@ layout("/layouts/platform.html"){
{label: "届次", prop: "sessionName"},
{label: "代表团", prop: "delegationName"},
{label: "立案结果", prop: "caseFilingResult"},
{label: "立案类型", prop: "caseFilingType"},
{label: "立案类型", prop: "caseFilingType", visible: false},
{label: "是否并案", prop: "merge"},
{label: "案由", prop: "brief", visible: false},
{label: "建议措施", prop: "measures", visible: false},
@@ -338,12 +318,15 @@ layout("/layouts/platform.html"){
},
meetingChange(val) {
// 切换届次后旧类别不再适用，需清空选择并加载当前届次类别
// searchSessionId 是后端列表查询实际使用的单届次筛选参数，需与页面选择保持同步
this.$set(this.pageForm, "searchSessionId", val)
// 切换届次后旧类别和代表团不再适用，需清空选择并加载当前届次数据
this.$set(this.pageForm, "typeIds", [])
this.$set(this, "typeOptions", [])
this.listProposalType()
this.$set(this.pageForm, "delegationId", null)
this.listDelegation()
this.doSearch()
},
listDelegation() {
this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
@@ -358,6 +341,7 @@ layout("/layouts/platform.html"){
this.$set(this, "sessionOptions", res.data)
if (this.sessionOptions && this.sessionOptions.length > 0) {
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
this.$set(this.pageForm, "searchSessionId", this.sessionOptions[0].id)
this.listProposalType()
this.listDelegation()
this.pageData()
src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html
+40 -20
View File
@@ -17,23 +17,15 @@ layout("/layouts/platform.html"){
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable
@@ -80,13 +72,16 @@ layout("/layouts/platform.html"){
</search>
</el-card>
<el-card shadow="never">
<table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
<table-tool :columns="tableColumns" @update:columns="handleTableColumnsChange">
<el-button type="primary" size="small" @click="exportCustomAsExcel">自定义导出</el-button>
</table-tool>
<el-table :data="tableData" :key="tableKey" ref="tableRef" @sort-change="pageOrder"
header-align="center" style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
:key="column.key"
:key="column.prop"
:min-width="column.width"
:fixed="column.fixed"
sortable="custom"
@@ -128,6 +123,7 @@ layout("/layouts/platform.html"){
return {
tableColumns: [
{label: "提案编号", prop: "code"},
{label: "立案编号", prop: "caseFilingCode"},
{label: "提案名称", prop: "name", width: "200px"},
{label: "提案人", prop: "createUserName"},
{label: "代表团", prop: "delegationName"},
@@ -144,6 +140,8 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
typeIds: [],
caseFilingResults: [],
unionId: null,
@@ -153,6 +151,28 @@ layout("/layouts/platform.html"){
}
},
methods: {
/** 应用列设置后重新计算表格布局，保证右侧固定操作列保持可见。 */
handleTableColumnsChange(columns) {
this.$set(this, "tableColumns", columns)
this.$set(this, "tableKey", new Date().getTime())
this.$nextTick(() => {
if (this.$refs.tableRef) {
this.$refs.tableRef.doLayout()
}
})
},
/** 按当前筛选条件和可见字段顺序导出全部征集进度数据。 */
exportCustomAsExcel() {
var exportColumns = this.tableColumns.filter((item) => item.visible !== false)
if (!exportColumns.length) {
this.$message.warning("请至少选择一个导出字段")
return
}
this.$downLoad(loc() + "/exportCustomAsExcel", {
pageForm: JSON.stringify(this.pageForm),
tableColumns: JSON.stringify(exportColumns)
})
},
openView(row) {
this.$refs.guava.view(() => {
this.$refs.infoRef.onOpen(row)
src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
+44 -5
View File
@@ -195,15 +195,18 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" ref="tableRef"
<table-tool :columns="tableColumns" @update:columns="handleTableColumnsChange">
<el-button type="primary" size="small" @click="exportCustomAsExcel">自定义导出</el-button>
</table-tool>
<el-table :data="tableData" :key="tableKey" @sort-change="pageOrder" header-align="center" ref="tableRef"
v-loading="tableLoading"
style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
:key="column.key"
:key="column.prop"
:min-width="column.width"
:fixed="column.fixed"
sortable="custom"
@@ -262,12 +265,13 @@ layout("/layouts/platform.html"){
return {
tableColumns: [
{label: "提案编号", prop: "code"},
{label: "立案编号", prop: "caseFilingCode"},
{label: "提案名称", prop: "name", width: "200px"},
{label: "提案人", prop: "createUserName"},
{label: "提案类别", prop: "typeName"},
{label: "代表团", prop: "delegationName"},
{label: "立案结果", prop: "caseFilingResult"},
{label: "立案类型", prop: "caseFilingType"},
// {label: "立案类型", prop: "caseFilingType"},
{label: "是否并案", prop: "merge"},
{label: "承办单位", prop: "undertakeUnits", width: "260px"},
{label: "当前节点", prop: "curTaskName"},
@@ -309,6 +313,19 @@ layout("/layouts/platform.html"){
}
},
methods: {
/**
* 应用列设置后重建表格并重新计算固定列布局，
* 避免动态隐藏字段后右侧操作列继续使用旧宽度而被裁切。
*/
handleTableColumnsChange(columns) {
this.$set(this, "tableColumns", columns)
this.$set(this, "tableKey", new Date().getTime())
this.$nextTick(() => {
if (this.$refs.tableRef) {
this.$refs.tableRef.doLayout()
}
})
},
/**
* 查询列表按立案结果切换承办单位展示口径：
* 立案显示“主办/协办”，作为建议只显示“承办单位”。
@@ -345,6 +362,21 @@ layout("/layouts/platform.html"){
exportDocx(id) {
this.$downLoad("/platform/proposal/common/exportProposalAsDocx", {id})
},
/**
* 按列设置中当前可见的字段顺序导出全部筛选结果；
* 未选择任何数据列时不发起下载，避免生成无表头文件。
*/
exportCustomAsExcel() {
var exportColumns = this.tableColumns.filter((item) => item.visible !== false)
if (!exportColumns.length) {
this.$message.warning("请至少选择一个导出字段")
return
}
this.$downLoad(loc() + "/exportCustomAsExcel", {
pageForm: JSON.stringify(this.pageForm),
tableColumns: JSON.stringify(exportColumns)
})
},
tagToggle(key, val) {
if (this.pageForm[key].includes(val)) {
this.pageForm[key].splice(this.pageForm[key].indexOf(val), 1)
@@ -378,8 +410,10 @@ layout("/layouts/platform.html"){
}).then((res) => {
if (res.code === 0) {
this.sessionOptions = res.data
if (this.sessionOptions) {
if (this.sessionOptions && this.sessionOptions.length > 0) {
// 届次按开始时间倒序返回，首项作为页面默认选中的最新一届。
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
this.$set(this.pageForm, "sessionIds", [this.sessionOptions[0].id])
this.listDelegation()
this.pageData()
}
@@ -401,6 +435,7 @@ layout("/layouts/platform.html"){
this.$businessTool.listUnit(this.pageForm.unionId).then((res) => (this.unitOptions = res))
},
pageData() {
this.tableLoading = true
this.$axios
.post(loc() + "/pageData", {
pageForm: JSON.stringify(this.pageForm)
@@ -411,6 +446,10 @@ layout("/layouts/platform.html"){
this.pageForm.totalCount = res.data.totalCount
}
})
.finally(() => {
// 无论查询成功或异常都结束加载状态，避免列表持续显示加载动画
this.tableLoading = false
})
}
},
created() {
src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html
+32 -5
View File
@@ -13,8 +13,10 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="代表团列表" :columns.sync="tableColumns"></table-tool>
<el-table :data="tableData" ref="tableRef" header-align="center" style="width: 100%" row-key="id"
<table-tool label="代表团列表" :columns="tableColumns" @update:columns="handleTableColumnsChange">
<el-button type="primary" size="small" @click="exportCustomAsExcel">自定义导出</el-button>
</table-tool>
<el-table :data="tableData" :key="tableKey" ref="tableRef" header-align="center" style="width: 100%" row-key="id"
show-summary @sort-change="pageOrder">
<el-table-column
:index="indexMethod"
@@ -26,7 +28,7 @@ layout("/layouts/platform.html"){
<el-table-column
:label="column.label"
:prop="column.prop"
:key="column.key"
:key="column.prop"
:min-width="column.width"
:fixed="column.fixed"
sortable="custom"
@@ -112,6 +114,29 @@ layout("/layouts/platform.html"){
"proposal-info": PROPOSAL_INFO
},
methods: {
/** 应用列设置后重建表格，保证动态统计列宽和固定区域及时更新。 */
handleTableColumnsChange(columns) {
this.$set(this, "tableColumns", columns)
this.$set(this, "tableKey", new Date().getTime())
this.$nextTick(() => {
if (this.$refs.tableRef) {
this.$refs.tableRef.doLayout()
}
})
},
/** 按当前届次、排序条件和可见字段导出全部代表团统计。 */
exportCustomAsExcel() {
var exportColumns = this.tableColumns.filter((item) => item.visible !== false)
if (!exportColumns.length) {
this.$message.warning("请至少选择一个导出字段")
return
}
this.$downLoad(loc() + "/exportCustomAsExcel", {
pageForm: JSON.stringify(this.pageForm),
sessionId: this.sessionId,
tableColumns: JSON.stringify(exportColumns)
})
},
openView(row) {
this.delegationId = row.id
this.dialogTitle = row.dbtName + "所属提案"
@@ -139,16 +164,18 @@ layout("/layouts/platform.html"){
},
setTableColumnsByProposalResult() {
this.$businessTool.getDictOptions("PROPOSAL_CASE_FILING_RESULT").then((data) => {
var columns = this.tableColumns.filter((column) => ["dbtName", "TOTAL"].includes(column.prop))
data.forEach((item) => {
this.tableColumns.push({
columns.push({
label: item.name,
prop: item.code
})
})
this.tableColumns.push({
columns.push({
label: "立案率",
prop: "caseRate"
})
this.$set(this, "tableColumns", columns)
})
},
pageData() {
src/main/resources/views/platform/zhgh/democratic/proposal/query/history/index.html
+2 -2
View File
@@ -26,11 +26,11 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案编码">
<search-item label="提案编号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
placeholder="请输入提案编号"
v-model="pageForm.code"
style="width: 100%"
></el-input>
src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeReply/index.html
+72 -12
View File
@@ -24,19 +24,21 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<el-table :data="tableData" @sort-change="pageOrder">
<table-tool :columns="tableColumns" @update:columns="handleTableColumnsChange">
<el-button type="primary" size="small" @click="exportCustomAsExcel">自定义导出</el-button>
</table-tool>
<el-table :data="tableData" :key="tableKey" ref="tableRef" @sort-change="pageOrder">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="单位名称" prop="unitName" width="400" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案总数" prop="sum" sortable="custom"></el-table-column>
<el-table-column label="主办提案">
<el-table-column label="提案数量" prop="masterSum" sortable="custom"></el-table-column>
<el-table-column label="已答复" prop="masterReplySum" sortable="custom"></el-table-column>
<el-table-column label="未答复" prop="masterNoReplySum" sortable="custom"></el-table-column>
<el-table-column v-for="column in normalTableColumns" :key="column.prop" :label="column.label"
:prop="column.prop" :width="column.width" sortable="custom"
show-overflow-tooltip></el-table-column>
<el-table-column label="主办提案" v-if="masterTableColumns.length">
<el-table-column v-for="column in masterTableColumns" :key="column.prop" :label="column.tableLabel"
:prop="column.prop" sortable="custom"></el-table-column>
</el-table-column>
<el-table-column label="协办提案">
<el-table-column label="提案数量" prop="slaveSum" sortable="custom"></el-table-column>
<el-table-column label="已答复" prop="slaveReplySum" sortable="custom" v-if="slaveNeedReply"></el-table-column>
<el-table-column label="未答复" prop="slaveNoReplySum" sortable="custom" v-if="slaveNeedReply"></el-table-column>
<el-table-column label="协办提案" v-if="slaveTableColumns.length">
<el-table-column v-for="column in slaveTableColumns" :key="column.prop" :label="column.tableLabel"
:prop="column.prop" sortable="custom"></el-table-column>
</el-table-column>
</el-table>
</el-card>
@@ -54,12 +56,69 @@ layout("/layouts/platform.html"){
},
data() {
return {
tableColumns: [
{label: "单位名称", prop: "unitName", width: "400"},
{label: "提案总数", prop: "sum"},
{label: "主办提案数量", tableLabel: "提案数量", prop: "masterSum", group: "master"},
{label: "主办已答复", tableLabel: "已答复", prop: "masterReplySum", group: "master"},
{label: "主办未答复", tableLabel: "未答复", prop: "masterNoReplySum", group: "master"},
{label: "协办提案数量", tableLabel: "提案数量", prop: "slaveSum", group: "slave"},
{label: "协办已答复", tableLabel: "已答复", prop: "slaveReplySum", group: "slave", slaveReply: true},
{label: "协办未答复", tableLabel: "未答复", prop: "slaveNoReplySum", group: "slave", slaveReply: true}
],
sessionOptions: [],
underTakeOptions: [],
slaveNeedReply: false
}
},
computed: {
normalTableColumns() {
return this.tableColumns.filter((column) => !column.group && column.visible !== false)
},
masterTableColumns() {
return this.tableColumns.filter((column) => column.group === "master" && column.visible !== false)
},
slaveTableColumns() {
return this.tableColumns.filter((column) => column.group === "slave" && column.visible !== false)
}
},
methods: {
/** 应用列设置后重新计算多级表头布局，避免隐藏子列后表头宽度残留。 */
handleTableColumnsChange(columns) {
this.$set(this, "tableColumns", columns)
this.$set(this, "tableKey", new Date().getTime())
this.$nextTick(() => {
if (this.$refs.tableRef) {
this.$refs.tableRef.doLayout()
}
})
},
/** 根据协办答复配置增减可选字段，避免页面和导出出现不可用列。 */
syncSlaveReplyColumns(slaveNeedReply) {
var columns = this.tableColumns.slice()
if (!slaveNeedReply) {
columns = columns.filter((column) => !column.slaveReply)
} else if (!columns.some((column) => column.slaveReply)) {
columns.push({label: "协办已答复", tableLabel: "已答复", prop: "slaveReplySum", group: "slave", slaveReply: true})
columns.push({label: "协办未答复", tableLabel: "未答复", prop: "slaveNoReplySum", group: "slave", slaveReply: true})
}
this.$set(this, "tableColumns", columns)
},
/** 按当前筛选条件和列设置导出承办单位办理统计。 */
exportCustomAsExcel() {
var exportColumns = this.tableColumns.filter((column) => column.visible !== false)
if (!exportColumns.length) {
this.$message.warning("请至少选择一个导出字段")
return
}
this.$downLoad(loc() + "/exportCustomAsExcel", {
pageForm: JSON.stringify(this.pageForm),
sessionId: this.pageForm.sessionId,
undertakeUnitId: this.pageForm.undertakeUnitId,
caseFilingResult: this.pageForm.caseFilingResult,
tableColumns: JSON.stringify(exportColumns)
})
},
meetingChange() {
this.doSearch()
},
@@ -85,7 +144,8 @@ layout("/layouts/platform.html"){
this.$axios.post(loc() + "/data", this.pageForm).then((res) => {
if (res.code === 0) {
this.tableData = res.data.tableData
this.slaveNeedReply = res.data.slaveNeedReply
this.$set(this, "slaveNeedReply", res.data.slaveNeedReply)
this.syncSlaveReplyColumns(res.data.slaveNeedReply)
}
})
}
src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeSatisfaction/index.html
+48 -8
View File
@@ -22,15 +22,14 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<el-table :data="tableData" @sort-change="pageOrder">
<table-tool :columns="tableColumns" @update:columns="handleTableColumnsChange">
<el-button type="primary" size="small" @click="exportCustomAsExcel">自定义导出</el-button>
</table-tool>
<el-table :data="tableData" :key="tableKey" ref="tableRef" @sort-change="pageOrder">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="单位名称" prop="unitName" width="400" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案总数" prop="sum" sortable="custom"></el-table-column>
<el-table-column label="主办提案数" prop="masterSum" sortable="custom"></el-table-column>
<el-table-column label="协办提案数" prop="slaveSum" sortable="custom"></el-table-column>
<template v-for="dict in dict.type.PROPOSAL_FEEDBACK">
<el-table-column :label="dict.label" :prop="dict.code" sortable="custom"></el-table-column>
</template>
<el-table-column v-for="column in tableColumns" v-if="column.visible !== false" :key="column.prop"
:label="column.label" :prop="column.prop" :width="column.width"
sortable="custom" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>
</div>
@@ -47,11 +46,51 @@ layout("/layouts/platform.html"){
},
data() {
return {
tableColumns: [
{label: "单位名称", prop: "unitName", width: "400"},
{label: "提案总数", prop: "sum"},
{label: "主办提案数", prop: "masterSum"},
{label: "协办提案数", prop: "slaveSum"}
],
sessionOptions: [],
underTakeOptions: [],
}
},
methods: {
/** 应用列设置后重新计算动态满意度列的表格布局。 */
handleTableColumnsChange(columns) {
this.$set(this, "tableColumns", columns)
this.$set(this, "tableKey", new Date().getTime())
this.$nextTick(() => {
if (this.$refs.tableRef) {
this.$refs.tableRef.doLayout()
}
})
},
/** 从后端字典生成满意度列，列设置与统计接口使用同一组字段编码。 */
setFeedbackTableColumns() {
this.$businessTool.getDictOptions("PROPOSAL_FEEDBACK").then((data) => {
var fixedColumns = this.tableColumns.filter((column) => ["unitName", "sum", "masterSum", "slaveSum"].includes(column.prop))
data.forEach((item) => {
fixedColumns.push({label: item.name, prop: item.code})
})
this.$set(this, "tableColumns", fixedColumns)
})
},
/** 按当前筛选条件和可见字段导出承办单位满意度统计。 */
exportCustomAsExcel() {
var exportColumns = this.tableColumns.filter((column) => column.visible !== false)
if (!exportColumns.length) {
this.$message.warning("请至少选择一个导出字段")
return
}
this.$downLoad(loc() + "/exportCustomAsExcel", {
pageForm: JSON.stringify(this.pageForm),
sessionId: this.pageForm.sessionId,
undertakeUnitId: this.pageForm.undertakeUnitId,
tableColumns: JSON.stringify(exportColumns)
})
},
meetingChange() {
this.doSearch()
},
@@ -84,6 +123,7 @@ layout("/layouts/platform.html"){
created() {
this.listSession()
this.listUnderTake()
this.setFeedbackTableColumns()
}
})
</script>
src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html
+16 -40
View File
@@ -17,41 +17,19 @@ layout("/layouts/platform.html"){
<el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -83,11 +61,6 @@ layout("/layouts/platform.html"){
<el-option :key="item.code" :label="item.label" :value="item.code" v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"></el-option>
</el-select>
</search-item>
<search-item label="立案类型">
<el-select clearable filterable multiple placeholder="立案类型" v-model="pageForm.caseFilingTypes">
<el-option :key="item.code" :label="item.label" :value="item.code" v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
@@ -97,6 +70,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column label="提案编号" prop="code" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="立案编号" prop="caseFilingCode" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="提案名称" prop="name" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案人" prop="createUserName" sortable="custom"></el-table-column>
<el-table-column label="提案类别" prop="typeName" sortable="custom"></el-table-column>
@@ -143,7 +117,7 @@ layout("/layouts/platform.html"){
<!--#include("../../common/info.js"){}#-->
new Vue({
el: "#app",
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE"],
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT"],
store,
mixins: [initTableMixins],
components: {
@@ -158,6 +132,8 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
typeIds: [],
caseFilingResults: [],
unionId: null,
src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html
+15 -35
View File
@@ -15,41 +15,19 @@ layout("/layouts/platform.html"){
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -158,7 +136,7 @@ layout("/layouts/platform.html"){
disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提案类别" prop="typeId">
<el-select v-model="formData.typeId" style="width: 100%">
@@ -230,6 +208,8 @@ layout("/layouts/platform.html"){
unitOptions: [],
suggestUnitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
types: [],
caseFilingResults: [],
unionId: null,
src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html
+15 -34
View File
@@ -13,41 +13,19 @@ layout("/layouts/platform.html"){
<el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -71,6 +49,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column label="提案编号" prop="code" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="立案编号" prop="caseFilingCode" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="提案名称" prop="name" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案人" prop="createUserName" sortable="custom"></el-table-column>
<el-table-column label="提案类别" prop="typeName" sortable="custom"></el-table-column>
@@ -126,6 +105,8 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
types: [],
caseFilingResults: [],
unionId: null,
src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html
+17 -25
View File
@@ -13,31 +13,19 @@ layout("/layouts/platform.html"){
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案编号">
<el-input v-model="pageForm.code" placeholder="请输入提案编号" @keyup.enter.native="doSearch" clearable
style="width: 100%"></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案名称">
<el-input v-model="pageForm.name" placeholder="请输入提案名称" @keyup.enter.native="doSearch" clearable
style="width: 100%"></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
</search>
</el-card>
@@ -134,13 +122,17 @@ layout("/layouts/platform.html"){
},
data() {
return {
pageForm: {},
pageForm: {
proposalSearchField: "name",
proposalKeyword: ""
},
formData: {},
sessionOptions: [],
delegationOptions: [],
tableColumns: [
{prop: 'code', label: '提案编号'},
{prop: 'caseFilingCode', label: '立案编号'},
{prop: 'name', label: '提案名称'},
{prop: 'typeName', label: '提案类别'},
{prop: 'delegationName', label: '代表团'},
src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html
+15 -34
View File
@@ -15,41 +15,19 @@ layout("/layouts/platform.html"){
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -77,6 +55,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column label="提案编号" prop="code" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="立案编号" prop="caseFilingCode" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="提案名称" prop="name" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案人" prop="createUserName" sortable="custom"></el-table-column>
<el-table-column label="提案类别" prop="typeName" sortable="custom"></el-table-column>
@@ -169,6 +148,8 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
types: [],
caseFilingResults: [],
unionId: null,
src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html
+15 -34
View File
@@ -13,41 +13,19 @@ layout("/layouts/platform.html"){
<el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人姓名">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人姓名"
v-model="pageForm.createUserName"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案人工号">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案人工号"
v-model="pageForm.createUserLoginName"
style="width: 100%"
></el-input>
<search-item label="姓名/工号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
@@ -71,6 +49,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
<el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
<el-table-column label="提案编号" prop="code" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="立案编号" prop="caseFilingCode" sortable="custom" width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="提案名称" prop="name" sortable="custom" show-overflow-tooltip></el-table-column>
<el-table-column label="提案人" prop="createUserName" sortable="custom"></el-table-column>
<el-table-column label="提案类别" prop="typeName" sortable="custom"></el-table-column>
@@ -144,6 +123,8 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
proposalSearchField: "name",
proposalKeyword: "",
types: [],
caseFilingResults: [],
unionId: null,
src/main/resources/views/platform/zhgh/democratic/proposal/transact/caseCheck/index.html
+3 -3
View File
@@ -125,10 +125,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<!-- <el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>-->
<!-- <el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>-->
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<!-- <el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>-->
<!-- <el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>-->
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html
+1 -1
View File
@@ -101,8 +101,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="doSubmit" size="small" type="primary">提交</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+36 -17
View File
@@ -170,9 +170,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="info">退回到提案人(不审核)</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人(审核)</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -243,8 +244,16 @@ layout("/layouts/platform.html"){
/**
* “作为建议”不再区分主办/协办，只保留办理单位；
* 切到“不予立案”等结果时，同时清空已选单位，避免旧值被误提交。
* 每次切换立案结果时同步写入对应的默认审核意见，审核人仍可在提交前修改。
* @param caseFilingResult 当前选择的立案结果编码
*/
handleCaseFilingResultChange(caseFilingResult) {
const opinionMap = {
CONFIRM_FILING: "经提案委员会审理，该提案确定立案。",
SUGGESTION: "经提案委员会审理，该提案作为意见建议。",
NOT: "经提案委员会审理，该提案不予立案。"
}
this.$set(this.formData, "tf_opinion", opinionMap[caseFilingResult] || "")
if (caseFilingResult !== "CONFIRM_FILING") {
this.$set(this.formData, "tf_caseFilingType", "")
}
@@ -269,6 +278,7 @@ layout("/layouts/platform.html"){
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName,
taskKey: row.taskKey,
tf_masterUnitIds: [],
tf_slaveUnitIds: []
}
@@ -295,22 +305,30 @@ layout("/layouts/platform.html"){
tf_helpunitreply = "NO_HELP_UNIT"
}
const params = {
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
submitType: val,
taskName: "startTask",
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(","),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(","),
tf_helpunitreply: tf_helpunitreply
}
// 不审核退回时记录来源节点，提案人重新提交后由 WF 直接跳回当前审核节点。
if (val === 4) {
params.tf_sourceTaskKey = this.formData.taskKey
params.tf_audit = false
}
const loading = createLoading("提交中")
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
submitType: val,
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(","),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(","),
tf_helpunitreply: tf_helpunitreply
})
this.$axios.post("/platform/proposal/committeeFiling/executeTask", {
data: JSON.stringify(params)
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
@@ -336,6 +354,7 @@ layout("/layouts/platform.html"){
this.$refs.mergeRef.onOpen(selection, {
processTaskIds: selection.map(v => v.taskId),
taskName: selection[0].curTaskName,
taskKey: selection[0].taskKey,
tf_masterUnitIds: [],
tf_slaveUnitIds: []
})
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
+34 -17
View File
@@ -78,9 +78,10 @@ const merge = {
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$emit('close')" size="small">返回</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="info">退回到提案人(不审核)</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人(审核)</el-button>
<el-button @click="$emit('close')" size="small">返回</el-button>
</el-row>
</div>
</div>
@@ -106,8 +107,16 @@ const merge = {
/**
* 并案审核与单案审核保持同一口径：
* “作为建议”只录入办理单位，不再区分协办单位。
* 每次切换立案结果时同步写入对应的默认审核意见，审核人仍可在提交前修改。
* @param caseFilingResult 当前选择的立案结果编码
*/
handleCaseFilingResultChange(caseFilingResult) {
const opinionMap = {
CONFIRM_FILING: "经提案委员会审理，该提案确定立案。",
SUGGESTION: "经提案委员会审理，该提案作为意见建议。",
NOT: "经提案委员会审理，该提案不予立案。"
}
this.$set(this.formData, "tf_opinion", opinionMap[caseFilingResult] || "")
if (caseFilingResult !== "CONFIRM_FILING") {
this.$set(this.formData, "tf_caseFilingType", "")
}
@@ -160,23 +169,31 @@ const merge = {
tf_helpunitreply = "NO_HELP_UNIT"
}
const params = {
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
proposalIds: this.selection.map(v => v.id),
submitType: val,
taskName: "startTask",
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
}
// 不审核退回时记录来源节点，提案人重新提交后由 WF 直接跳回当前审核节点。
if (val === 4) {
params.tf_sourceTaskKey = this.formData.taskKey
params.tf_audit = false
}
const loading = createLoading('提交中')
this.$axios.post("/platform/proposal/committeeFiling/merge", {
data: JSON.stringify({
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
proposalIds: this.selection.map(v => v.id),
submitType: val,
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
})
data: JSON.stringify(params)
}).then((res) => {
if (res.code === 0) {
this.$emit('close')
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html
+36 -29
View File
@@ -123,14 +123,6 @@ layout("/layouts/platform.html"){
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 立案编号由审核人手工填写，仅确定立案时参与校验和保存。 -->
<el-form-item v-if="formData.tf_caseFilingResult === 'CONFIRM_FILING'"
label="立案编号"
prop="tf_caseFilingCode"
:rules="[{required:true,message:'请填写立案编号',trigger:['change','blur']}]">
<el-input v-model="formData.tf_caseFilingCode" clearable maxlength="20"
show-word-limit placeholder="请输入立案编号"></el-input>
</el-form-item>
<!-- <el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
prop="tf_caseFilingType"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
@@ -178,9 +170,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="info">退回到提案人(不审核)</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人(审核)</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -243,12 +236,18 @@ layout("/layouts/platform.html"){
})
},
/**
* “作为建议”场景下只保留办理单位，协办单位和立案类型都要及时清空，
* 避免旧表单值跟着一起提交到流程里。
* “作为建议”场景下只保留办理单位，其他结果继续清理不适用的单位字段。
* 每次切换立案结果时同步写入对应的默认审核意见，审核人仍可在提交前修改。
* @param caseFilingResult 当前选择的立案结果编码
*/
handleCaseFilingResultChange(caseFilingResult) {
const opinionMap = {
CONFIRM_FILING: "经提案委员会审理，该提案确定立案。",
SUGGESTION: "经提案委员会审理，该提案作为意见建议。",
NOT: "经提案委员会审理，该提案不予立案。"
}
this.$set(this.formData, "tf_opinion", opinionMap[caseFilingResult] || "")
if (caseFilingResult !== "CONFIRM_FILING") {
this.$set(this.formData, "tf_caseFilingCode", "")
this.$set(this.formData, "tf_caseFilingType", "")
}
if (caseFilingResult === "SUGGESTION") {
@@ -305,7 +304,6 @@ layout("/layouts/platform.html"){
// 当前页面需要回显上一环节“提案委员会立案”保存的主办/协办单位或办理单位。
var data = val[val.length - 1]
this.$set(this.formData, "tf_caseFilingResult", data.ext.tf_caseFilingResult)
this.$set(this.formData, "tf_caseFilingCode", data.ext.tf_caseFilingCode || "")
this.$set(this.formData, "tf_caseFilingType", data.ext.tf_caseFilingType)
this.$set(this.formData, "tf_masterUnitIds", this.normalizeUnitIds(data.ext.tf_masterUnitIds))
this.$set(this.formData, "tf_slaveUnitIds", this.normalizeUnitIds(data.ext.tf_slaveUnitIds))
@@ -318,7 +316,7 @@ layout("/layouts/platform.html"){
proposalId: row.id,
processTaskId: row.taskId,
taskName: row.curTaskName,
tf_caseFilingCode: "",
taskKey: row.taskKey,
tf_masterUnitIds: [],
tf_slaveUnitIds: []
}
@@ -345,22 +343,30 @@ layout("/layouts/platform.html"){
tf_helpunitreply = 'NO_HELP_UNIT'
}
const params = {
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
submitType: val,
taskName: "startTask",
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
}
// 不审核退回时记录来源节点，提案人重新提交后由 WF 直接跳回当前审核节点。
if (val === 4) {
params.tf_sourceTaskKey = this.formData.taskKey
params.tf_audit = false
}
const loading = createLoading('提交中')
this.$axios.post("/platform/proposal/committeeFilingUnit/executeTask", {
data: JSON.stringify({
...this.formData,
tf_masterUnitIds: masterUnitIds,
tf_slaveUnitIds: slaveUnitIds,
submitType: val,
// 兼容旧流程仍按单个主办单位字段取值的场景，这里保留第一个主办单位ID和名称。
tf_masterUnitId: masterUnitIds.length ? masterUnitIds[0] : "",
tf_masterUnitName: masterUnitIds.length ? this.underTakeOptions.find(v => v.id === masterUnitIds[0])?.name : "",
tf_masterUnitNames: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_masterUnitNameStr: masterUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_slaveUnitNames: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
})
data: JSON.stringify(params)
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
@@ -385,6 +391,7 @@ layout("/layouts/platform.html"){
this.$refs.mergeRef.onOpen(selection, {
processTaskIds: selection.map(v => v.taskId),
taskName: selection[0].curTaskName,
taskKey: selection[0].taskKey,
tf_masterUnitIds: [],
tf_slaveUnitIds: []
})
src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html
+15 -3
View File
@@ -10,8 +10,15 @@ layout("/layouts/platform.html"){
<el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>
<search-item label="名称/编号">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
v-model="pageForm.proposalKeyword">
<el-select slot="prepend" style="width: 110px" v-model="pageForm.proposalSearchField">
<el-option label="提案名称" value="name"></el-option>
<el-option label="提案编号" value="code"></el-option>
<el-option label="立案编号" value="caseFilingCode"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
@@ -26,7 +33,7 @@ layout("/layouts/platform.html"){
<el-table-column
:label="column.label"
:prop="column.prop"
:key="column.key"
:key="column.prop"
:min-width="column.width"
:fixed="column.fixed"
sortable="custom"
@@ -85,6 +92,7 @@ layout("/layouts/platform.html"){
return {
tableColumns: [
{label: "提案编号", prop: "code"},
{label: "立案编号", prop: "caseFilingCode"},
{label: "提案名称", prop: "name", width: "220px"},
{label: "提案人", prop: "createUserName", width: "90px"},
{label: "提案类别", prop: "typeName"},
@@ -93,6 +101,10 @@ layout("/layouts/platform.html"){
{label: "当前节点", prop: "curTaskName"},
{label: "流程状态", prop: "instanceState"}
],
pageForm: {
proposalSearchField: "name",
proposalKeyword: ""
},
jumpDialogVisible: false,
jumpNodeOptions: [],
jumpCurrentRow: null,
src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html
+3 -13
View File
@@ -25,7 +25,6 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool :columns.sync="tableColumns">
<el-button type="primary" size="small" @click="exportList">导出</el-button>
<el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
@@ -83,10 +82,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -124,15 +123,6 @@ layout("/layouts/platform.html"){
}
},
methods: {
exportList() {
this.$downLoad(loc() + "/exportList", {
pageForm: JSON.stringify(this.pageForm),
approval: this.pageForm.approval,
tableColumns: JSON.stringify(this.tableColumns.filter(function (item) {
return item.visible !== false
}))
})
},
openView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html
+8 -15
View File
@@ -26,10 +26,9 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool :columns.sync="tableColumns">
<el-button type="primary" size="small" @click="exportList">导出</el-button>
<el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
<el-radio-button :label="true">已反馈</el-radio-button>
<el-radio-button :label="false">未反馈</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
@@ -90,14 +89,17 @@ layout("/layouts/platform.html"){
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审批意见" prop="tf_opinion"
<el-form-item label="反馈意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
<user-opinion-textarea
v-model="formData.tf_opinion"
:show-common-opinion="false">
</user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -137,15 +139,6 @@ layout("/layouts/platform.html"){
}
},
methods: {
exportList() {
this.$downLoad(loc() + "/exportList", {
pageForm: JSON.stringify(this.pageForm),
approval: this.pageForm.approval,
tableColumns: JSON.stringify(this.tableColumns.filter(function (item) {
return item.visible !== false
}))
})
},
openView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html
+3 -3
View File
@@ -87,11 +87,11 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(4)" size="small" type="info">退回到提案人(不审核)</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人(审核)</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html
+2 -2
View File
@@ -121,9 +121,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction('back')" size="small" type="danger">退回提委会立案</el-button>
<el-button @click="handleTaskAction('agree')" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction('back')" size="small" type="danger">退回提委会立案</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html
+6 -6
View File
@@ -82,14 +82,14 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end" v-if="row.curTaskCode ==='second'">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
<el-row type="flex" justify="end" v-else>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="updateSecond(2)" size="small" type="danger">不同意</el-button>
<el-button @click="updateSecond(1)" size="small" type="primary">同意</el-button>
<el-button @click="updateSecond(2)" size="small" type="danger">不同意</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
handleTaskAction(val) {
this.$refs.formRef.validate(valid => {
if (!valid) return
this.$confirm("您确定要提交吗？", "提示", {
this.$confirm("提案一旦提交，后续将无法自行修改或撤回。请您在提交前仔细确认。", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -180,7 +180,7 @@ layout("/layouts/platform.html"){
},
updateSecond(submitType) {
this.$confirm("您确定要提交吗？", "提示", {
this.$confirm("提案一旦提交，后续将无法自行修改或撤回。请您在提交前仔细确认。", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
src/main/resources/views/platform/zhgh/democratic/proposal/transact/suggestion/index.html
+1 -1
View File
@@ -161,8 +161,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="onAudit()" size="small" type="primary">提交</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html
+4 -4
View File
@@ -19,7 +19,7 @@ layout("/layouts/platform.html"){
<el-select placeholder="查询类型" slot="prepend" style="width: 110px;"
v-model="pageForm.searchName">
<el-option label="提案名称" value="proposalName"></el-option>
<el-option label="编号" value="proposalCode"></el-option>
<el-option label="提案编号" value="proposalCode"></el-option>
</el-select>
</el-input>
</search-item>
@@ -84,10 +84,10 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
+1 -1
View File
@@ -128,8 +128,8 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">返回</el-button>
<el-button type="primary" @click="doApproval('DYNAMIC')">提交</el-button>
<el-button plain @click="$refs.guava.index()">返回</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html
+7 -15
View File
@@ -97,10 +97,9 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool :columns.sync="tableColumns">
<el-button type="primary" size="small" @click="exportList">导出</el-button>
<el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
<el-radio-button :label="true">已答复</el-radio-button>
<el-radio-button :label="false">未答复</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
@@ -125,7 +124,9 @@ layout("/layouts/platform.html"){
<el-tag v-else type="warning" size="small">否</el-tag>
</template>
<template v-else-if="column.prop === 'underTakeIsMaster'" scope="{row}">
<el-tag v-if="row.underTakeIsMaster" size="small">主办</el-tag>
<!-- 工作建议不区分主办、协办，承办类型统一展示为“承办”。 -->
<el-tag v-if="row.caseFilingResult === 'SUGGESTION'" size="small">承办</el-tag>
<el-tag v-else-if="row.underTakeIsMaster" size="small">主办</el-tag>
<el-tag v-else type="warning" size="small">协办</el-tag>
</template>
<template v-else-if="column.prop === 'instanceState'" scope="{row}">
@@ -202,9 +203,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
<!-- <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>-->
<el-button @click="handleTaskAction(1)" size="small" type="primary">提交</el-button>
<!-- <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>-->
<el-button @click="$refs.guava.index()" size="small">返回</el-button>
</el-row>
</div>
</proposal-info>
@@ -321,15 +322,6 @@ layout("/layouts/platform.html"){
}
},
methods: {
exportList() {
this.$downLoad(loc() + "/exportList", {
pageForm: JSON.stringify(this.pageForm),
approval: this.pageForm.approval,
tableColumns: JSON.stringify(this.tableColumns.filter(function (item) {
return item.visible !== false
}))
})
},
openView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html
+3 -3
View File
@@ -143,9 +143,9 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button type="primary" @click="doApproval('PASS')">提交</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
@@ -217,8 +217,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doConsolidationApproval('PASS')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html
+2 -2
View File
@@ -151,8 +151,8 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doApproval('DYNAMIC')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
@@ -224,8 +224,8 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doConsolidationApproval('PASS')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html
+3 -3
View File
@@ -100,10 +100,10 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button type="danger" @click="doApproval('REJECT')">建议撤销</el-button>
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
<el-button type="danger" @click="doApproval('REJECT')">建议撤销</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html
+2 -2
View File
@@ -127,9 +127,9 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="danger" @click="doApproval('BACK_OTHER_NODE')">退回重新答复</el-button>
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
<el-button type="danger" @click="doApproval('BACK_OTHER_NODE')">退回重新答复</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html
+2 -2
View File
@@ -95,9 +95,9 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html
+1 -1
View File
@@ -132,8 +132,8 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doApproval('DYNAMIC')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html
+1 -1
View File
@@ -149,8 +149,8 @@ layout("/layouts/platform.html"){
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doApproval('DYNAMIC')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html
+3 -3
View File
@@ -143,9 +143,9 @@ layout("/layouts/platform.html"){
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button type="primary" @click="doApproval('PASS')">提交</el-button>
<el-button type="danger" @click="doApproval('BACK')">退回重新填写</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</div>
</template>
@@ -217,8 +217,8 @@ layout("/layouts/platform.html"){
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<el-button type="primary" @click="doConsolidationApproval('PASS')">提交</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
</template>

Some files were not shown because too many files have changed in this diff Show More