FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

布局政策征求意见流程

Browse Source
This commit is contained in:
范强强
2023-10-18 15:35:01 +08:00
parent a001162dda
commit 7c3c229485
7 changed files with 2649 additions and 2543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessMixin.vue
+4
View File
@@ -115,6 +115,10 @@ export default {
{
label: "问答流程",
value: "27"
},
{
label: "政策征求意见流程",
value: "29"
}
],
formDisableFlag: false,
src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue
+1 -1
View File
@@ -181,7 +181,7 @@
fileName: '',
accept: '',
fileMax_M: 0,
taskKey: this.$route.query.taskKey,
taskKey: this.$route.query.taskDefinitionKey,
}
},
src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue
+3 -1
View File
@@ -64,7 +64,9 @@
}
},
mounted() {
// this.getHistoryData()
if (this.$route.query.prcNum) {
this.getHistoryData()
}
},
methods: {
getHistoryData() {
src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue
+32
View File
@@ -285,6 +285,38 @@
}
})
},
getData(item) {
let row = item ? JSON.parse(JSON.stringify(item)) : {}
this.roleForm = {
djrUserIds: row.djrUserIds,
djrUserNames: row.djrUserNames,
glyUserId: row.glyUserId,
glyUserName: row.glyUserName,
pzr1UserId: row.pzr1UserId,
pzr1UserName: row.pzr1UserName,
pzr2UserId: row.pzr2UserId,
pzr2UserName: row.pzr2UserName,
sdr1UserIds: row.sdr1UserIds,
sdr1UserNames: row.sdr1UserNames,
sdr2UserIds: row.sdr2UserIds,
sdr2UserNames: row.sdr2UserNames,
shr1UserIds: row.shr1UserIds,
shr1UserNames: row.shr1UserNames,
shr2UserIds: row.shr2UserIds,
shr2UserNames: row.shr2UserNames,
startUser: row.startUser,
startUserName: row.startUserName,
}
this.roleForm = {...this.roleForm}
},
}
}
</script>
src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue
+1 -1
View File
@@ -183,7 +183,7 @@
editNum: 0,
selectList: [],
deleteList: [],
taskKey: this.$route.query.taskKey,//流程节点key
taskKey: this.$route.query.taskDefinitionKey,//流程节点key
}
},
computed: {
src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue
+69 -20
View File
@@ -271,7 +271,7 @@
import solicitationList from "./components/solicitationList";//征求意见列表
import policySolicitingOpinions from "./components/policySolicitingOpinions";
import processFile from "../../components/processFile";
import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew} from "api/process";
import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew, inboundLiaisonDetail} from "api/process";
import axios from "axios";
export default {
@@ -332,11 +332,12 @@
commentText: '',
fileListName: '',
fileName: '',
taskKey: this.$route.query.taskKey,
taskKey: this.$route.query.taskDefinitionKey,
title: '',
checkBox: false,
selectType: '',
roleForm: {},
bpnId: '',
}
},
computed: {
@@ -437,6 +438,9 @@
return true
},
},
mounted() {
this.getData()
},
methods: {
handlePreview(file) {
let attId = ""
@@ -484,16 +488,22 @@
//保存事件
handleSave() {
this.saveLoading = true;
if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') {
this.draftSaving()
}
},
//草稿保存
draftSaving() {
let _formData = new FormData();
let json = this.form
let json = this.dataForm
json.commentText = this.commentText
_formData.append('id', this.bpnId || '')
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "laws2");
_formData.append("prcType", "29");
_formData.append("json", JSON.stringify({
form: json,
roleForm: this.roleForm,
roleForm: this.$refs.personnelInformationRef.roleForm,
commentText: this.commentText
}));
saveTaskFirst(_formData).then(res => {
@@ -508,13 +518,23 @@
handleSubmit() {
this.$refs['zczqyjForm'].validate((valid) => {
if (valid) {
if (this.showPersonnel) {
if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') {
this.$refs.personnelInformationRef.submit((row) => {
this.isSubmit = true
this.saveLoading = true;
this.roleForm = row
this.startProcessRollBack()
this.startProcessRollBack(row)
})
} else if (this.taskKey == 'PolicySolicitOpinionProcessKey2') {
this.isSubmit = true
this.saveLoading = true;
const json = Object.assign(this.dataForm);
json.commentText = this.commentText
json.approvalFlag = 0
let query = {
form: json,
commentText: this.commentText
}
this.completeTask(this.$route.query.taskIds, query)
}
} else {
return this.$message.warning('请完善基础信息')
@@ -523,23 +543,33 @@
},
handleReject() {
// approvalFlag value：0通过 1驳回
if (this.taskKey == 'PolicySolicitOpinionProcessKey2') {
const json = Object.assign(this.dataForm);
json.commentText = this.commentText
json.approvalFlag = 1
let query = {
form: json,
commentText: this.commentText
}
this.completeTask(this.$route.query.taskIds,query)
}
},
//启动流程
startProcessRollBack() {
const json = Object.assign(this.dataForm, this.roleForm);
startProcessRollBack(roleForm) {
const json = Object.assign(this.dataForm, roleForm);
json.commentText = this.commentText
let query = {
form: json,
commentText: this.commentText
}
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '29',
json: JSON.stringify({
form: json,
roleForm: this.roleForm,
commentText: this.commentText
})
json: JSON.stringify(query)
}, {_this: this}, res => {
if (res.ok) {
this.completeTask(res.data)
this.completeTask(res.data, query)
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
@@ -548,11 +578,9 @@
})
},
//提交流程
completeTask(taskId) {
const json = Object.assign(this.dataForm, this.roleForm);
json.commentText = this.commentText
completeTask(taskId, query) {
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
json: JSON.stringify(query),
taskId: taskId || this.taskId,
userId: this.$store.getters.userInfo.userId
}, {_this: this}, res => {
@@ -641,6 +669,27 @@
this.dataForm.zrdwUserName = ''
this.dataForm = {...this.dataForm}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.formProcessing(processForm)
}
}).catch(e => {
});
});
},
formProcessing(row) {
this.dataForm = row
this.dataForm = {...this.dataForm}
if (this.showPersonnel) {
this.$refs.personnelInformationRef.getData(row)
}
},
}
}
</script>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+55 -36
View File
@@ -41,12 +41,14 @@
class="common-button-primary"
size="mini"
v-btn-permission="'5eb720bb99553de7ae77a977a6276d7c'"
@click="selectProcessBtn">查询</el-button>
@click="selectProcessBtn">查询
</el-button>
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'8e354f43e928886eee08817b71b3df65'"
@click="resetSelect">清空</el-button>
@click="resetSelect">清空
</el-button>
</el-form-item>
</div>
<div class="search-area-item">
@@ -77,7 +79,8 @@
width="150"
>
<template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ scope.row.prcNum }}</a>
<a @click="dealWith(scope.row)" class="table-jump"
v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ scope.row.prcNum }}</a>
</template>
</el-table-column>
<el-table-column
@@ -87,7 +90,8 @@
width="180"
>
<template slot-scope="scope">
<span @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
<span @click="dealWith(scope.row)" class="table-jump"
v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -98,7 +102,9 @@
min-width="250"
><!--scope.row.prcName-->
<template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcNameFilter(scope.row) }}</a>
<a @click="dealWith(scope.row)" class="table-jump"
v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcNameFilter(scope.row)
}}</a>
</template>
</el-table-column>
<el-table-column
@@ -131,11 +137,16 @@
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
<el-dropdown trigger="click" @command="handleCommand"
v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'" :command="[scope.row, '办理']">办理</el-dropdown-item>
<el-dropdown-item v-btn-permission="'5cf95d4e0eaae6118e1375f677a0a08d'":command="[scope.row, '转办']">转办</el-dropdown-item>
<el-dropdown-item v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'"
:command="[scope.row, '办理']">办理
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'5cf95d4e0eaae6118e1375f677a0a08d'"
:command="[scope.row, '转办']">转办
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -169,6 +180,7 @@ import {mapMutations, mapActions} from 'vuex'
import {changeAssigneeNew} from 'api/process'
import ProcessMixin from '../../../components/ProcessMixin'
import axios from 'axios'
export default {
name: 'ProcessCenter',
mixins: [ProcessMixin],
@@ -1413,8 +1425,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '责任对接人审核'){
} else if (row.taskInfo === '责任对接人审核') {
this.$router.push({
name: 'zczqyjStep4',
query: {
@@ -1425,8 +1436,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规工程师单条审核'){
} else if (row.taskInfo === '法规工程师单条审核') {
this.$router.push({
name: 'zczqyjStep5',
query: {
@@ -1437,8 +1447,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规工程师修订'){
} else if (row.taskInfo === '法规工程师修订') {
this.$router.push({
name: 'zczqyjStep6',
query: {
@@ -1449,8 +1458,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规认证部长审核'){
} else if (row.taskInfo === '法规认证部长审核') {
this.$router.push({
name: 'zczqyjStep7',
query: {
@@ -1461,8 +1469,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规认证部副总监审核'){
} else if (row.taskInfo === '法规认证部副总监审核') {
this.$router.push({
name: 'zczqyjStep8',
query: {
@@ -1473,8 +1480,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规认证部总监批准'){
} else if (row.taskInfo === '法规认证部总监批准') {
this.$router.push({
name: 'zczqyjStep9',
query: {
@@ -1510,8 +1516,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '责任部门领导任务下发'){
} else if (row.taskInfo === '责任部门领导任务下发') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep4',
query: {
@@ -1522,8 +1527,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '责任人反馈情况'){
} else if (row.taskInfo === '责任人反馈情况') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep5',
query: {
@@ -1534,8 +1538,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '责任部门领导批准'){
} else if (row.taskInfo === '责任部门领导批准') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep6',
query: {
@@ -1546,8 +1549,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规管理员审核'){
} else if (row.taskInfo === '法规管理员审核') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep7',
query: {
@@ -1558,8 +1560,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规认证部长审定'){
} else if (row.taskInfo === '法规认证部长审定') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep8',
query: {
@@ -1570,8 +1571,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '法规认证部副总监批准'){
} else if (row.taskInfo === '法规认证部副总监批准') {
this.$router.push({
name: 'zdrzbzORzchgxxmscStep9',
query: {
@@ -2147,8 +2147,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '审定') {
} else if (row.taskInfo === '审定') {
this.$router.push({
name: 'qbfzStep6',
query: {
@@ -2229,8 +2228,7 @@ export default {
prcType: row.prcType
}
})
}
else if(row.taskInfo === '技术标准起草') {
} else if (row.taskInfo === '技术标准起草') {
this.$router.push({
name: 'qbzxdjhgkStep6',
query: {
@@ -2255,6 +2253,19 @@ export default {
}
})
case '29':
this.$router.push({
path: 'policyConsultation',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
taskDefinitionKey: row.taskDefinitionKey
}
})
break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
@@ -2273,32 +2284,39 @@ export default {
background: #fff;
display: flex;
flex-direction: column;
.el-form-item {
}
.label-input-form {
display: flex;
justify-content: space-between;
}
.content {
width: 100%;
flex: auto;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: auto;
overflow: hidden;
display: flex;
flex-direction: column;
}
.pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
}
.clearfix:after { /*伪元素是行内元素 正常浏览器清除浮动方法*/
content: "";
display: block;
@@ -2306,6 +2324,7 @@ export default {
clear: both;
visibility: hidden;
}
.clearfix {
*zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
}