bug优化、提案催办
This commit is contained in:
Paidax
@@ -365,7 +365,7 @@ module.exports = {
|
||||
}
|
||||
return this.panes.includes(name)
|
||||
},
|
||||
async openView(id) {
|
||||
async openView(id, activeName = "1") {
|
||||
this.loading = true
|
||||
this.viewData = await proposal.getProposalInfo(id)
|
||||
|
||||
@@ -404,7 +404,7 @@ module.exports = {
|
||||
})
|
||||
}
|
||||
|
||||
this.activeName = this.handle ? "999" : "1"
|
||||
this.activeName = this.handle ? "999" : activeName
|
||||
this.loading = false
|
||||
}
|
||||
},
|
||||
|
||||
@@ -617,7 +617,7 @@ layout("/mobile/platform.html"){
|
||||
await this.getWelfareCheckSelfAgenda()
|
||||
await this.getCompletes();
|
||||
await this.getMsg()
|
||||
this.listActivity();
|
||||
await this.listActivity();
|
||||
this.needCount = this.needItems.length
|
||||
},
|
||||
async setNeedItems() {
|
||||
@@ -705,12 +705,11 @@ layout("/mobile/platform.html"){
|
||||
this.perfectPersonInfo = resp.data
|
||||
}
|
||||
},
|
||||
listActivity() {
|
||||
$.get("/platform/sys/homeActivity/listHomeActivity").then((resp) => {
|
||||
if (resp.code === 0) {
|
||||
this.activityList = resp.data
|
||||
}
|
||||
})
|
||||
async listActivity() {
|
||||
const resp = await $.get("/platform/sys/homeActivity/listHomeActivity")
|
||||
if (resp.code === 0) {
|
||||
this.activityList = resp.data
|
||||
}
|
||||
},
|
||||
},
|
||||
beforeMount() {
|
||||
@@ -720,12 +719,14 @@ layout("/mobile/platform.html"){
|
||||
await this.getMenus();
|
||||
this.getAllMonth();
|
||||
this.createYearList();
|
||||
this.initData();
|
||||
await this.initData();
|
||||
const active = sessionStorage.getItem("zhgh-mobile-home-active")
|
||||
this.active = active ? parseInt(active) : 0
|
||||
|
||||
this.clickIndex = 2
|
||||
this.clickMenu = this.moduleMenus.find(o => o.moduleName === '职工权益')
|
||||
if (!this.activityList || !this.activityList.length > 0) {
|
||||
this.clickIndex = 2
|
||||
this.clickMenu = this.moduleMenus.find(o => o.moduleName === '职工权益')
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
@@ -72,66 +72,63 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
|
||||
<template #edit>
|
||||
<proposal-info ref="audit" label="分管校领导审批" handle>
|
||||
<template #handle>
|
||||
<proposal-info ref="audit"></proposal-info>
|
||||
|
||||
<el-form :model="formData" ref="auditForm" :rules="formRules" label-width="120px">
|
||||
<!-- <vi-title :title="proTableData.length > 1 ? '并案信息' : '提案信息'"></vi-title>-->
|
||||
<!-- <el-form-item>-->
|
||||
<el-form style="margin-top: 20px" :model="formData" ref="auditForm" :rules="formRules" label-width="120px">
|
||||
<!-- <vi-title :title="proTableData.length > 1 ? '并案信息' : '提案信息'"></vi-title>-->
|
||||
<!-- <el-form-item>-->
|
||||
|
||||
<!-- <el-table :data="proTableData" tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%">-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="proposalCode"-->
|
||||
<!-- label="提案编号"></el-table-column>-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="username"-->
|
||||
<!-- label="提案人"-->
|
||||
<!-- show-overflow-tooltip></el-table-column>-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="proposalName" label="提案名称"-->
|
||||
<!-- show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span @click="openView(row)"-->
|
||||
<!-- style="color: #236eb4; cursor: pointer; text-decoration: underline">{{row.proposalName}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- </el-form-item>-->
|
||||
<vi-title title="审核信息"></vi-title>
|
||||
<div style="text-align: center;margin-top: -40px;"
|
||||
v-if="formData.auditUnderTakeList && formData.auditUnderTakeList.length>1">
|
||||
<span class="text-danger">温馨提醒:该提案的承办单位【{{formData.auditUnderTakeName}}】是由您来分管的，只需要审批一次即可。</span>
|
||||
</div>
|
||||
<el-row gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="username" label="审核人">
|
||||
<el-input v-model="formData.username" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="auditTime" label="审核时间">
|
||||
<el-input v-model="formData.auditTime" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="审批意见" prop="opinion">
|
||||
<el-input type="textarea" v-model="formData.opinion" rows="4" maxlength="1000"
|
||||
placeholder="请填写您的审批意见"></el-input>
|
||||
<!-- <el-table :data="proTableData" tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%">-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="proposalCode"-->
|
||||
<!-- label="提案编号"></el-table-column>-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="username"-->
|
||||
<!-- label="提案人"-->
|
||||
<!-- show-overflow-tooltip></el-table-column>-->
|
||||
<!-- <el-table-column align="left" header-align="left" prop="proposalName" label="提案名称"-->
|
||||
<!-- show-overflow-tooltip>-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span @click="openView(row)"-->
|
||||
<!-- style="color: #236eb4; cursor: pointer; text-decoration: underline">{{row.proposalName}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- </el-form-item>-->
|
||||
<vi-title title="分管校领导审批信息"></vi-title>
|
||||
<div style="text-align: center;margin-top: -40px;"
|
||||
v-if="formData.auditUnderTakeList && formData.auditUnderTakeList.length>1">
|
||||
<span class="text-danger">温馨提醒:该提案的承办单位【{{formData.auditUnderTakeName}}】是由您来分管的，只需要审批一次即可。</span>
|
||||
</div>
|
||||
<el-row gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="username" label="审核人">
|
||||
<el-input v-model="formData.username" readonly></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isSign()" prop="sign" label="签  字">
|
||||
<sign prefix="proposal" :qz.sync="formData.sign"></sign>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="auditTime" label="审核时间">
|
||||
<el-input v-model="formData.auditTime" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="审批意见" prop="opinion">
|
||||
<el-input type="textarea" v-model="formData.opinion" rows="4" maxlength="1000"
|
||||
placeholder="请填写您的审批意见"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isSign()" prop="sign" label="签  字">
|
||||
<sign prefix="proposal" :qz.sync="formData.sign"></sign>
|
||||
</el-form-item>
|
||||
|
||||
<el-row style="margin: 40px 0;text-align: right">
|
||||
<el-button @click="$refs.guava.index()">
|
||||
取消
|
||||
</el-button>
|
||||
<el-button type="primary" :disabled="submitDisabled" @click="doAudit(true)">
|
||||
提交
|
||||
</el-button>
|
||||
</el-row>
|
||||
<el-row style="margin: 40px 0;text-align: right">
|
||||
<el-button @click="$refs.guava.index()">
|
||||
取消
|
||||
</el-button>
|
||||
<el-button type="primary" :disabled="submitDisabled" @click="doAudit(true)">
|
||||
提交
|
||||
</el-button>
|
||||
</el-row>
|
||||
|
||||
</el-form>
|
||||
</template>
|
||||
</proposal-info>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
@@ -244,7 +241,7 @@ layout("/layouts/platform.html"){
|
||||
this.$refs['auditForm'].resetFields()
|
||||
}
|
||||
this.$refs.guava.edit()
|
||||
this.$refs.audit.openView(row.id)
|
||||
this.$refs.audit.openView(row.id, "11")
|
||||
|
||||
this.formData.pblsaId = row.pblsaId
|
||||
this.formData.underTakeId = row.underTakeId
|
||||
@@ -279,8 +276,16 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
this.isNode = await proposal.getProposalIsNodeState(600)
|
||||
await proposal.initData(this)
|
||||
if (window.innerWidth < 768 && location.pathname === "/platform/proposal/transact/branchLeaderSuffixAudit") {
|
||||
this.$confirm("请您使用电脑端访问此界面，以获取更好的体验！", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonTest: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
} else {
|
||||
this.isNode = await proposal.getProposalIsNodeState(600)
|
||||
await proposal.initData(this)
|
||||
}
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -16,8 +16,14 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="提案列表" :app="this">
|
||||
<template #func>
|
||||
<el-button v-if="pageForm.listButtonTypeAdmin" type="primary" @click="openSendMsg" size="small">一键提醒</el-button>
|
||||
<el-button type="warning" @click="changeListType" size="small">切换成“{{pageForm.listButtonTypeAdmin ? '承办单位' : '管理员'}}”列表</el-button>
|
||||
<el-button v-if="pageForm.listButtonTypeAdmin && $auth.hasRole('sysadmin')" type="primary"
|
||||
@click="openSendMsg" size="small">
|
||||
一键提醒
|
||||
</el-button>
|
||||
<el-button type="warning" @click="changeListType" size="small"
|
||||
v-if="$auth.hasRoleOr('sysadmin')">
|
||||
切换成“{{pageForm.listButtonTypeAdmin ? '承办单位' : '管理员'}}”列表
|
||||
</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
<el-table ref="proTable"
|
||||
@@ -29,59 +35,79 @@ layout("/layouts/platform.html"){
|
||||
@selection-change="handleSelectionChange"
|
||||
:size="tableSize"
|
||||
@sort-change="pageOrder">
|
||||
<el-table-column
|
||||
v-if="${@shiro.hasRole('T01') || @shiro.hasRole('sysadmin')}"
|
||||
:selectable="(row)=>{return !row.isReply}"
|
||||
reserve-selection
|
||||
type="selection"
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- v-if="${@shiro.hasRole('T01') || @shiro.hasRole('sysadmin')}"-->
|
||||
<!-- :selectable="(row)=>{return !row.isReply}"-->
|
||||
<!-- reserve-selection-->
|
||||
<!-- type="selection"-->
|
||||
<!-- width="55">-->
|
||||
<!-- </el-table-column>-->
|
||||
|
||||
<el-table-column align="center" header-align="center" label="序号" type="index" width="80">
|
||||
<el-table-column align="center" header-align="center" label="序号" type="index" width="60">
|
||||
<template scope="scope">
|
||||
<span>{{ scope.$index + (pageForm.pageNumber - 1) * pageForm.pageSize + 1 }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
:align="column.align?column.align:'center'"
|
||||
header-align="center"
|
||||
v-for="column in tableColumns"
|
||||
show-overflow-tooltip
|
||||
:label="column.label"
|
||||
:prop="column.prop"
|
||||
:key="column.prop"
|
||||
:width="column.width"
|
||||
:sortable="column.sortable"
|
||||
:align="column.align?column.align:'center'"
|
||||
header-align="center"
|
||||
v-for="column in tableColumns"
|
||||
show-overflow-tooltip
|
||||
:label="column.label"
|
||||
:prop="column.prop"
|
||||
:key="column.prop"
|
||||
:width="column.width"
|
||||
:sortable="column.sortable"
|
||||
>
|
||||
<template v-if="column.prop=='proposalName'" scope="{row}">
|
||||
<el-link type="primary" @click="openView(row)">{{ row.proposalName }}</el-link>
|
||||
</template>
|
||||
<template v-else-if="column.prop=='isReply'" scope="{row}">
|
||||
<span v-if="row.isReply" class="text-success">已办理</span>
|
||||
<span v-else class="text-danger">未办理</span>
|
||||
<template v-if="$auth.hasRole('proxyT01')">
|
||||
<span v-if="row.isProxyReply" class="text-success">已办理</span>
|
||||
<span v-else class="text-danger">未办理</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<span v-if="row.isReply" class="text-success">已办理</span>
|
||||
<span v-else-if="row.isProxyReply" class="text-warning">转交已办理，待提交</span>
|
||||
<span v-else class="text-danger">未办理</span>
|
||||
</template>
|
||||
</template>
|
||||
<!-- <template v-else-if="column.prop=='determineTypeCode'" scope="{row}">-->
|
||||
<!-- {{row.determineTypeCode === 'emphasis' ? '重点' :row.determineTypeCode === 'ordinary'?-->
|
||||
<!-- '普通':'否'}}-->
|
||||
<!-- </template>-->
|
||||
<!-- <template v-else-if="column.prop=='isConjoin'" scope="{row}">-->
|
||||
<!-- {{row.isConjoin?'是':'否'}}-->
|
||||
<!-- </template>-->
|
||||
<template v-else-if="column.prop==='isForward'" scope="{row}">
|
||||
<span v-if="row.isForward" class="text-primary">是（{{row.proxyReplyUserName}}）</span>
|
||||
<span v-else>否</span>
|
||||
</template>
|
||||
<!-- <template v-else-if="column.prop=='determineTypeCode'" scope="{row}">-->
|
||||
<!-- {{row.determineTypeCode === 'emphasis' ? '重点' :row.determineTypeCode === 'ordinary'?-->
|
||||
<!-- '普通':'否'}}-->
|
||||
<!-- </template>-->
|
||||
<!-- <template v-else-if="column.prop=='isConjoin'" scope="{row}">-->
|
||||
<!-- {{row.isConjoin?'是':'否'}}-->
|
||||
<!-- </template>-->
|
||||
<!-- <template v-else-if="column.prop==='isForward'" scope="{row}">-->
|
||||
<!-- <span v-if="row.isForward" class="text-primary">是（{{row.proxyReplyUserName}}）</span>-->
|
||||
<!-- <span v-else>否</span>-->
|
||||
<!-- </template>-->
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :width="250" align="center" fixed="right"
|
||||
<el-table-column :width="300" align="center" fixed="right"
|
||||
header-align="center"
|
||||
label="操作">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="!row.isReply && $auth.hasRoleOr('sysadmin, A06, tamange, jdh10')"
|
||||
type="warning" @click="openSendMsg(row)" size="mini">催办</el-button>
|
||||
<el-button v-if="!row.isReply" type="primary" @click="openAudit(row)" size="mini">办理
|
||||
type="warning" @click="openSendMsg(row)" size="mini">催办
|
||||
</el-button>
|
||||
<el-button v-if="!row.isReply && $auth.hasRoleOr('sysadmin,T01') && !row.isProxyReply" type="primary"
|
||||
@click="openProxy(row)" size="mini">
|
||||
转交
|
||||
</el-button>
|
||||
<template v-if="row.isForward">
|
||||
<el-button v-if="!row.isProxyReply && $auth.hasRoleOr('proxyT01')" type="primary" @click="openAudit(row)" size="mini">办理
|
||||
</el-button>
|
||||
<el-button v-else-if="!row.isReply && !$auth.hasRoleOr('proxyT01')" type="primary" @click="openAudit(row)" size="mini">办理
|
||||
</el-button>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button v-if="!row.isReply" type="primary" @click="openAudit(row)" size="mini">办理
|
||||
</el-button>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -126,7 +152,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-form-item prop="replyContent" label="办理内容" class="is-required">
|
||||
<text-editor v-model="formData.replyContent"></text-editor>
|
||||
<!-- <div id="replyContentEditor"></div>-->
|
||||
<!-- <div id="replyContentEditor"></div>-->
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="files" label="附件上传">
|
||||
@@ -143,7 +169,6 @@ layout("/layouts/platform.html"){
|
||||
<el-button :disabled="submitDisabled" @click="doReply(false)" type="primary">提交
|
||||
</el-button>
|
||||
</el-row>
|
||||
|
||||
</el-form>
|
||||
</template>
|
||||
</proposal-info>
|
||||
@@ -171,19 +196,19 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<vi-title title="转交用户" class="mt10"></vi-title>
|
||||
<el-select
|
||||
v-model="forwardUserSelection"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="请输入关键词"
|
||||
:remote-method="findSameUnitUser"
|
||||
v-model="forwardUserSelection"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="请输入关键词"
|
||||
:remote-method="findSameUnitUser"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in forwardUserList"
|
||||
:key="item.id"
|
||||
:label="item.username+'('+item.loginname+')'"
|
||||
:value="item.id">
|
||||
v-for="item in proxyUserList"
|
||||
:key="item.id"
|
||||
:label="item.username+'('+item.loginname+')'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-row type="flex" justify="end" class="mt10">
|
||||
@@ -208,7 +233,6 @@ layout("/layouts/platform.html"){
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="sendMsgDialogVisible"
|
||||
@@ -246,6 +270,38 @@ layout("/layouts/platform.html"){
|
||||
<el-button @click="sendMsg" type="primary">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="proxyDialog" title="转交答复" width="30%">
|
||||
<el-form :model="proxyFormData" label-width="80px" ref="proxyForm">
|
||||
<el-form-item
|
||||
:rules="[{required: true, message: '请选择转交用户', trigger: ['blur', 'change']}]"
|
||||
label="转交用户"
|
||||
prop="proxyUserId">
|
||||
<el-select
|
||||
v-model="proxyFormData.proxyUserId"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="请输入关键词"
|
||||
:remote-method="findSameUnitUser"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in proxyUserList"
|
||||
:key="item.id"
|
||||
:value="item.id"
|
||||
:label="item.username+'('+item.loginname+')'"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span class="dialog-footer" slot="footer">
|
||||
<el-button @click="proxyDialog = false">取 消</el-button>
|
||||
<el-button @click="confirmProxyReply" type="primary">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@@ -255,22 +311,22 @@ layout("/layouts/platform.html"){
|
||||
// let replyContentEditor = null
|
||||
|
||||
const vue = new Vue({
|
||||
el: '#app',
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
|
||||
'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue?v=1.0.1'),
|
||||
'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'),
|
||||
'proposal-table': httpVueLoader('/components/proposal/ProposalTable.vue')
|
||||
"file-upload": httpVueLoader("/components/plugins/FileUpload.vue"),
|
||||
"proposal-info": httpVueLoader("/components/proposal/ProposalInfo.vue?v=1.0.1"),
|
||||
"proposal-search": httpVueLoader("/components/proposal/ProposalSearch.vue"),
|
||||
"proposal-table": httpVueLoader("/components/proposal/ProposalTable.vue")
|
||||
},
|
||||
data() {
|
||||
let replyContentBrief = (rule, value, callback) => {
|
||||
if (!this.formData.replyContent || !dd3s.html2txt(this.formData.replyContent)) {
|
||||
callback(new Error('请填写办理内容'));
|
||||
callback(new Error("请填写办理内容"))
|
||||
} else {
|
||||
callback();
|
||||
callback()
|
||||
}
|
||||
};
|
||||
}
|
||||
return {
|
||||
proTableData: [],
|
||||
isSign: () => {
|
||||
@@ -279,46 +335,50 @@ layout("/layouts/platform.html"){
|
||||
conJoinProposalName: "",
|
||||
conJoinProposal: [],
|
||||
tableColumns: [
|
||||
{prop: 'proposalCode', label: '提案编号', width: "120", sortable: true, disabled: true},
|
||||
{prop: 'proposalName', label: '提案名称', width: "300", disabled: true},
|
||||
{prop: 'username', label: '提案人', disabled: true},
|
||||
{prop: 'typeCode', label: '提案类型编码', sortable: true, checked: 0},
|
||||
{prop: 'typeName', label: '提案类型', sortable: true, checked: 0},
|
||||
{prop: 'mannerCode', label: '提案方式编码', sortable: true, checked: 0},
|
||||
{prop: 'mannerName', label: '提案方式', sortable: true, checked: 0},
|
||||
{prop: 'meetingName', label: '届次', sortable: true, checked: 0},
|
||||
{prop: 'delegationCode', label: '代表团编码', sortable: true, checked: 0},
|
||||
{prop: 'delegationName', label: '代表团', sortable: true, checked: 0},
|
||||
{prop: 'resultName', label: '立案结果', sortable: true},
|
||||
{ prop: "proposalCode", label: "提案编号", width: "100", sortable: true, disabled: true },
|
||||
{ prop: "proposalName", label: "提案名称", width: "300", disabled: true },
|
||||
{ prop: "username", label: "提案人", disabled: true },
|
||||
{ prop: "typeCode", label: "提案类型编码", sortable: true, checked: 0 },
|
||||
{ prop: "typeName", label: "提案类型", sortable: true, checked: 0 },
|
||||
{ prop: "mannerCode", label: "提案方式编码", sortable: true, checked: 0 },
|
||||
{ prop: "mannerName", label: "提案方式", sortable: true, checked: 0 },
|
||||
{ prop: "meetingName", label: "届次", sortable: true, checked: 0 },
|
||||
{ prop: "delegationCode", label: "代表团编码", sortable: true, checked: 0 },
|
||||
{ prop: "delegationName", label: "代表团", sortable: true, checked: 0 },
|
||||
{ prop: "resultName", label: "立案结果", sortable: true },
|
||||
// {prop: 'isConjoin', label: '是否并案'},
|
||||
// {prop: 'determineTypeCode', label: '是否重点'},
|
||||
{prop: 'underTakeName', label: '承办单位', sortable: false},
|
||||
{prop: 'undertakeType', label: '承办类型', sortable: false},
|
||||
{prop: 'replyNumber', label: '办理次数', width: "80", sortable: false},
|
||||
{prop: 'stateName', label: '提案状态', sortable: true},
|
||||
// {prop: 'isForward', label: '转交办理', sortable: true},
|
||||
{ prop: "underTakeName", label: "承办单位", sortable: false },
|
||||
{ prop: "undertakeType", label: "承办类型", sortable: false },
|
||||
{ prop: "replyNumber", label: "办理次数", width: "80", sortable: false },
|
||||
{ prop: "stateName", label: "提案状态", sortable: true },
|
||||
{ prop: "isForward", label: "转交办理", sortable: true },
|
||||
// {prop: 'proxyReplyUserName', label: '转交办理人', sortable: true},
|
||||
{prop: 'isReply', label: '办理状态', sortable: false},
|
||||
{ prop: "isReply", label: "办理状态", sortable: false }
|
||||
],
|
||||
submitDisabled: false,
|
||||
pageForm: {
|
||||
searchName: 'proposalName',
|
||||
searchName: "proposalName",
|
||||
isAudit: false,
|
||||
listButtonTypeAdmin: true
|
||||
},
|
||||
formData: {
|
||||
username: "${@shiro.getPrincipalProperty('username')}",
|
||||
replyTime: moment().format('YYYY-MM-DD'),
|
||||
implementState: '',
|
||||
replySign: '',
|
||||
proposalName: '',
|
||||
proposalCode: '',
|
||||
createUser: ''
|
||||
replyTime: moment().format("YYYY-MM-DD"),
|
||||
implementState: "",
|
||||
replySign: "",
|
||||
proposalName: "",
|
||||
proposalCode: "",
|
||||
createUser: ""
|
||||
},
|
||||
formRules: {
|
||||
replyContent: [{validator: replyContentBrief, trigger: ['blur', 'change']}],
|
||||
implementState: [{required: true, message: '请选择落实情况', trigger: ['blur', 'change']}],
|
||||
sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}]
|
||||
replyContent: [{ validator: replyContentBrief, trigger: ["blur", "change"] }],
|
||||
implementState: [{ required: true, message: "请选择落实情况", trigger: ["blur", "change"] }],
|
||||
sign: [{
|
||||
required: true,
|
||||
message: "请使用【手机钉钉】扫描二维码进行签字",
|
||||
trigger: ["blur", "change"]
|
||||
}]
|
||||
},
|
||||
proTableSelection: [],
|
||||
forwardDialog: false,
|
||||
@@ -333,12 +393,16 @@ layout("/layouts/platform.html"){
|
||||
*/
|
||||
sendMsgDialogVisible: false,
|
||||
sendFormData: {
|
||||
sessionId: '',
|
||||
proposalId: '',
|
||||
proposalName: '',
|
||||
title: '提案承办通知',
|
||||
content: '您部门有新交办的提案，请及时查收处理，并按规定于收到此信息之日起2个月内办结。'
|
||||
sessionId: "",
|
||||
proposalId: "",
|
||||
proposalName: "",
|
||||
title: "提案承办通知",
|
||||
content: "您部门有新交办的提案，请及时查收处理，并按规定于收到此信息之日起2个月内办结。"
|
||||
},
|
||||
|
||||
proxyDialog: false,
|
||||
proxyFormData: {},
|
||||
proxyUserList: []
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -348,23 +412,23 @@ layout("/layouts/platform.html"){
|
||||
this.sendMsgDialogVisible = true
|
||||
},
|
||||
async sendMsg() {
|
||||
const valid = await this.$refs['sendForm'].validate()
|
||||
const valid = await this.$refs["sendForm"].validate()
|
||||
if (!valid) return
|
||||
const confirm = await this.$confirm('您确定要向发送信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonTest: '取消',
|
||||
type: 'warning'
|
||||
const confirm = await this.$confirm("您确定要向发送信息吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonTest: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
|
||||
if (confirm === "confirm") {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '加载中，请稍后...',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
});
|
||||
text: "加载中，请稍后...",
|
||||
spinner: "el-icon-loading",
|
||||
background: "rgba(0, 0, 0, 0.7)"
|
||||
})
|
||||
|
||||
const resp = await $.post('/platform/proposal/transact/reply/sendNotify', {
|
||||
const resp = await $.post("/platform/proposal/transact/reply/sendNotify", {
|
||||
sessionId: this.pageForm.meetingId,
|
||||
proposalId: this.sendFormData.proposalId,
|
||||
title: this.sendFormData.title,
|
||||
@@ -381,17 +445,17 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
|
||||
// 列表类型切换
|
||||
changeListType(){
|
||||
changeListType() {
|
||||
this.pageForm.listButtonTypeAdmin = !this.pageForm.listButtonTypeAdmin
|
||||
this.pageData()
|
||||
},
|
||||
async oneKeyRemind() {
|
||||
const {meetingId} = this.pageForm
|
||||
const { meetingId } = this.pageForm
|
||||
if (!meetingId) {
|
||||
this.$message.warning('请先选择教代会届次')
|
||||
this.$message.warning("请先选择教代会届次")
|
||||
return
|
||||
}
|
||||
const resp = await $.get(loc() + '/selectReadySendMsgUsers', {meetingId})
|
||||
const resp = await $.get(loc() + "/selectReadySendMsgUsers", { meetingId })
|
||||
if (resp.code === 0) {
|
||||
this.oneKeyRemindDialogVisible = true
|
||||
this.oneKeyTableData = resp.data
|
||||
@@ -403,22 +467,22 @@ layout("/layouts/platform.html"){
|
||||
async confirmOneKeyRemind() {
|
||||
const selection = this.$refs.oneKeyRemindTable.selection
|
||||
if (selection.length === 0) {
|
||||
this.$message.warning('请选择需要提醒的提案')
|
||||
this.$message.warning("请选择需要提醒的提案")
|
||||
return
|
||||
}
|
||||
// if (this.oneKeyTableData.length === 0) {
|
||||
// this.$message.warning('没有可提醒的记录')
|
||||
// return
|
||||
// }
|
||||
const {meetingId} = this.pageForm
|
||||
const confirm = await this.$confirm('确认要一键提醒未答复的承办单位负责人吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
const { meetingId } = this.pageForm
|
||||
const confirm = await this.$confirm("确认要一键提醒未答复的承办单位负责人吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (!confirm) return
|
||||
const proposalIds = selection.map(v => v.id)
|
||||
const resp = await $.post(loc() + '/oneKeyRemind', {proposalIds: JSON.stringify(proposalIds)})
|
||||
const resp = await $.post(loc() + "/oneKeyRemind", { proposalIds: JSON.stringify(proposalIds) })
|
||||
if (resp.code === 0) {
|
||||
this.oneKeyRemindDialogVisible = false
|
||||
this.oneKeyTableData = []
|
||||
@@ -431,9 +495,10 @@ layout("/layouts/platform.html"){
|
||||
this.proTableSelection = val
|
||||
},
|
||||
async findSameUnitUser(val) {
|
||||
const resp = await $.get(loc() + '/findSameUnitUser/' + val)
|
||||
const resp = await $.get(loc() + "/findSameUnitUser", { key: val })
|
||||
if (resp.code === 0) {
|
||||
this.forwardUserList = resp.data
|
||||
this.proxyUserList = resp.data
|
||||
// const d = resp.data.filter(x => {
|
||||
// return !this.forwardUserList.map(v => v.id).includes(x.id)
|
||||
// })
|
||||
@@ -445,12 +510,12 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
async confirmForwardReply() {
|
||||
const params = this.proTableSelection.map(v => {
|
||||
return {replyId: v.replyId, proposalId: v.id, proxyReplyUserId: this.forwardUserSelection}
|
||||
return { replyId: v.replyId, proposalId: v.id, proxyUserId: this.forwardUserSelection }
|
||||
})
|
||||
const resp = await $.post(loc() + '/doForwardReply', {data: JSON.stringify(params)})
|
||||
const resp = await $.post(loc() + "/doForwardReply", { data: JSON.stringify(params) })
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.$refs['proTable'].clearSelection()
|
||||
this.$refs["proTable"].clearSelection()
|
||||
this.doSearch()
|
||||
this.forwardDialog = false
|
||||
} else {
|
||||
@@ -463,13 +528,16 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
async doRollBack(row) {
|
||||
const confirm = await this.$confirm('正在撤回该提案的办理信息，请确认?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
const confirm = await this.$confirm("正在撤回该提案的办理信息，请确认?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm) {
|
||||
const resp = await $.post(loc() + "/doRollBack", {proposalId: row.id, replyUnitId: row.replyUnitId})
|
||||
const resp = await $.post(loc() + "/doRollBack", {
|
||||
proposalId: row.id,
|
||||
replyUnitId: row.replyUnitId
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.doSearch()
|
||||
@@ -481,14 +549,14 @@ layout("/layouts/platform.html"){
|
||||
this.$refs.info.openView(row.id)
|
||||
},
|
||||
async checkCanReply(proposalId, underTakeId) {
|
||||
return await $.get(loc() + '/checkCanReply', {proposalId, underTakeId})
|
||||
return await $.get(loc() + "/checkCanReply", { proposalId, underTakeId })
|
||||
},
|
||||
|
||||
async openAudit(row) {
|
||||
this.$refs.guava.edit()
|
||||
this.$refs.audit.openView(row.id)
|
||||
if (this.$refs['auditForm']) {
|
||||
this.$refs['auditForm'].resetFields()
|
||||
if (this.$refs["auditForm"]) {
|
||||
this.$refs["auditForm"].resetFields()
|
||||
}
|
||||
|
||||
const {
|
||||
@@ -552,25 +620,25 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
|
||||
if (!isSave && dd3s.html2txt(this.formData.replyContent).length < 200) {
|
||||
this.$notify.warning({title: '警告', message: '办理内容不能少于200字'});
|
||||
this.$notify.warning({ title: "警告", message: "办理内容不能少于200字" })
|
||||
return
|
||||
}
|
||||
|
||||
const msg = this.conJoinProposal.length > 1 ? '提案' + this.conJoinProposalName + '已并案您只需办理一次,请确认？' : '您是否' + (isSave ? '保存' : '提交') + '该提案的办理内容，请确认?'
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
const msg = this.conJoinProposal.length > 1 ? "提案" + this.conJoinProposalName + "已并案您只需办理一次,请确认？" : "您是否" + (isSave ? "保存" : "提交") + "该提案的办理内容，请确认?"
|
||||
const confirm = await this.$confirm(msg, "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if ('confirm' !== confirm) {
|
||||
if ("confirm" !== confirm) {
|
||||
return
|
||||
}
|
||||
|
||||
this.submitDisabled = true
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '正在提交...',
|
||||
spinner: 'el-icon-loading',
|
||||
text: "正在提交...",
|
||||
spinner: "el-icon-loading",
|
||||
background: COVER_LAYER_COLOR
|
||||
})
|
||||
|
||||
@@ -583,11 +651,11 @@ layout("/layouts/platform.html"){
|
||||
replySign: this.formData.replySign
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
this.$notify.success({ title: "成功", message: resp.msg })
|
||||
this.pageData()
|
||||
this.$refs.guava.index()
|
||||
} else {
|
||||
this.$notify.error({title: '失败', message: resp.msg});
|
||||
this.$notify.error({ title: "失败", message: resp.msg })
|
||||
}
|
||||
loading.close()
|
||||
this.submitDisabled = false
|
||||
@@ -596,18 +664,57 @@ layout("/layouts/platform.html"){
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
|
||||
// 转交答复
|
||||
openProxy(row) {
|
||||
this.proxyDialog = true
|
||||
this.proxyFormData = {
|
||||
proposalId: row.id,
|
||||
replyId: row.replyId,
|
||||
proxyUserId: row.proxyReplyUserId
|
||||
}
|
||||
if (row.proxyReplyUserId) {
|
||||
this.findSameUnitUser(row.proxyReplyUserName)
|
||||
}
|
||||
},
|
||||
|
||||
// 确认转交
|
||||
confirmProxyReply() {
|
||||
this.$confirm("您是否确认转交该提案，请确认?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(async () => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: "正在转交...",
|
||||
spinner: "el-icon-loading",
|
||||
background: COVER_LAYER_COLOR
|
||||
})
|
||||
$.post(loc() + "/setProxyUser", this.proxyFormData).then(res => {
|
||||
loading.close()
|
||||
if (res.code === 0) {
|
||||
this.proxyDialog = false
|
||||
this.$message.success(res.msg)
|
||||
this.pageData()
|
||||
} else {
|
||||
this.$message.error(res.msg)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
if (window.innerWidth < 768 && location.pathname === '/platform/proposal/transact/reply') {
|
||||
this.$confirm('请您使用电脑端访问此界面，以获取更好的体验！', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonTest: '取消',
|
||||
type: 'warning'
|
||||
if (window.innerWidth < 768 && location.pathname === "/platform/proposal/transact/reply") {
|
||||
this.$confirm("请您使用电脑端访问此界面，以获取更好的体验！", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonTest: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
} else {
|
||||
await proposal.initData(this)
|
||||
this.implementStateOptions = await getDictByCode('proposal_reply_result')
|
||||
this.implementStateOptions = await getDictByCode("proposal_reply_result")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user