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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!316
This commit is contained in:
王夏晖
2022-02-16 09:00:26 +08:00
parent 3e8a9b16cf 01c5f13d37
commit 119744a167
25 changed files with 446 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/onlineEdit/index.js
+1 -1
View File
@@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => {
editFileInfo.pId = editFileInfo.pid
}
const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
}
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+11
View File
@@ -25,6 +25,13 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
v-model="form.title"
@@ -288,6 +295,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '', // 流程名称
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
@@ -296,6 +304,9 @@
modelNameList: ''
},
formRules: {
processName: [
{ required: true, message: '请输入流程名称', trigger: 'blur' },
],
title: [
{ required: true, message: '请输入调研标题', trigger: 'blur' },
],
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+11
View File
@@ -25,6 +25,13 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
v-model="form.title"
@@ -292,6 +299,7 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
processName: '', // 流程名称
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
@@ -300,6 +308,9 @@ export default {
modelNameList: ''
},
formRules: {
processName: [
{ required: true, message: '请输入流程名称', trigger: 'blur' },
],
title: [
{ required: true, message: '请输入调研标题', trigger: 'blur' },
],
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -213,6 +221,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
modelList: [],
@@ -357,6 +366,7 @@
this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.responUserList = data.form? data.form.responUserList : ''
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -265,6 +273,7 @@
acceptShow: false,
todoId: '',
form: {
processName: '',
fileList: [],
dyhz: '',
title: '', // 调研标题
@@ -479,6 +488,7 @@
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.fjList = data.fjList || data.form.fjList
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -242,6 +250,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
dyhz: '',
title: '', // 调研标题
date: '', // 完成时间
@@ -377,6 +386,7 @@
let data = JSON.parse(res.mesg)
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.form ? data.form.fileId : data.fileId
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -255,6 +263,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -419,6 +428,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
let arr = data.responUserList || data.form.responUserList
let newArr = []
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -412,6 +421,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -413,6 +422,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -413,6 +422,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+10
View File
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -412,6 +421,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+9 -25
View File
@@ -263,7 +263,6 @@
</div>
</div>
<ProcessFooter
show-back
show-transfer
show-submit
:transfer-loading="isTransfer"
@@ -271,7 +270,6 @@
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -426,35 +424,21 @@ export default {
},
//提交
handleSubmit(){
let comFlag = false
this.dataList.map(item => {
delete item.termsConditions
})
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
this.dataList.forEach(item => {
if(item.implementer){
comFlag = true
return
}
this.isSubmit = false
}, e => {
});
},
//驳回
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
})
if(!comFlag){
this.$message.warning('请选择落实人')
}else{
this.listForm.commentText = this.commentText
this.listForm.stepFlag = '1'
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+98 -11
View File
@@ -192,14 +192,8 @@
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model="form.DYBXHBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
@@ -229,6 +223,9 @@
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -297,6 +294,67 @@
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">复审结果</template>
</ProcessTitle>
<!-- reviewResults 1 修订、2 废止、3 继续有效-->
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-select v-model="form.reviewResults" filterable clearable>
<el-option
v-for="item in opinionsReviewResultsOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="verifySort() !== '' && !verifySort()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.draftTime"
:editable="false"
placeholder="请选择初稿完成日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<el-form-item v-show="verifySort() !== '' && verifySort()" label="截止日期" prop="releaseTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.releaseTime"
:editable="false"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="opinionsShow2" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-show="!opinionsShow2" v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
<el-input v-show="opinionsShow2"
v-model="form.QCRBUSS"
placeholder="选择主起草人"
readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择主起草人', form.QCRBUSS)">
</el-input>
</el-form-item>
<el-form-item v-show="verifySort() !== '' && !verifySort()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.releaseTime"
:editable="false"
placeholder="请选择计划标准发布日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
</el-col>
</el-row>
<el-form-item v-show="form.reviewResults === '2' || form.reviewResults === '3'" label="复审理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入复审理由"
v-model="form.reviewResultsContent">
</el-input>
</el-form-item>
</div>
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
@@ -452,10 +510,10 @@ export default {
ProcessTitle,
},
props: {
form: {
formSub: {
type: Object,
required: true
},
},
FBGBUSSFileList: {
type: Array,
required: true
@@ -488,6 +546,10 @@ export default {
type: Boolean,
default: false
},
opinionsShow2: {
type: Boolean,
default: false
},
opinionsShow: {
type: Boolean,
default: false
@@ -513,6 +575,12 @@ export default {
{value: '2',label: '部分采纳'},
{value: '3',label: '不采纳'},
],
opinionsReviewResultsOptions:[
{value: '1',label: '修订'},
{value: '2',label: '废止'},
{value: '3',label: '继续有效'},
],
form:{},
countryOptions:[],//国家地区
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
@@ -551,6 +619,16 @@ export default {
...mapGetters(['userInfo'])
},
methods: {
verifySort(){
if(this.form.reviewResults && this.form.reviewResults === '1'){
return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
}else {
return ""
}
},
choiceZRRList (type, title, id) {
this.$emit('formChoiceZRRListCancel',type,title,id)
},
filterOp(data){
if(!data){
return ""
@@ -607,8 +685,7 @@ export default {
},
},
mounted () {
console.log(this.form.infoList)
console.log(this.form)
this.form = this.formSub
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -642,7 +719,17 @@ export default {
})
this.busVsFunc()
this.modelFunc()
}
},
watch: {
form: {
handler: function (val) {
if(val){
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList);
}
},
deep: true //对象的深度验证
},
}
}
</script>
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+60 -11
View File
@@ -69,7 +69,7 @@
label="起草单位"
width="120">
<template slot-scope="scope">
<span v-if="scope.row.qcdw" class="table-jump" :title="scope.row.qcdw">{{ scope.row.qcdw | ellipsis2 }}</span>
<span v-if="scope.row.qcdw" :title="scope.row.qcdw">{{ scope.row.qcdw | ellipsis2 }}</span>
</template>
</el-table-column>
<el-table-column
@@ -77,7 +77,7 @@
label="起草人"
width="120">
<template slot-scope="scope">
<span v-if="scope.row.qcrbuss" class="table-jump" :title="scope.row.qcrbuss">{{ scope.row.qcrbuss | ellipsis2 }}</span>
<span v-if="scope.row.qcrbuss" :title="scope.row.qcrbuss">{{ scope.row.qcrbuss | ellipsis2 }}</span>
</template>
</el-table-column>
<el-table-column
@@ -111,7 +111,7 @@
style="margin-left: 0;margin-bottom:0;"
:rules="formRules.bussFsSubUser1Name"
>
<el-input v-model="scope.row.bussFsSubUser1Name" placeholder="请选择对接人" @click.native="choiceZRRS(scope.row.bussFsSubUser1, 1, scope.$index)" />
<el-input v-model="scope.row.bussFsSubUser1Name" placeholder="请选择对接人" :title="scope.row.bussFsSubUser1Name" @click.native="choiceZRRS(scope.row.bussFsSubUser1, 1, scope.$index)" />
</el-form-item>
</template>
</el-table-column>
@@ -604,6 +604,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
@@ -686,6 +692,7 @@ export default {
saveLoading: false,
isSubmit: false,
modalShowFlag: false,
modalShowRoleFlag: false,
standardSearch: {
standCode: "",
standName: ""
@@ -792,26 +799,30 @@ export default {
this.type = type
if (type === 1) {
this.drawerTitle = '选择对接人'
this.nodeList = []
this.nodeList2 = []
this.zrIndex = index
this.zrType = type
this.nodeList.push(row)
this.modalShowFlag = true
if(type === 'bussFsSubUser1'){
if ( row.bussFsSubUser1.length > 0) {
this.nodeList2 = row.bussFsSubUser1.split(',')
}
}
this.modalShowRoleFlag = true
} else if (type === 2) {
// 批量
if (this.zrIdList.length > 0) {
this.zrType = type
this.nodeList = []
this.modalShowFlag = true
this.nodeList2 = []
this.modalShowRoleFlag = true
this.drawerTitle = '批量选择对接人'
} else {
this.$message.warning('请选择要编辑的数据')
}
} else {
this.nodeList = []
this.nodeList.push(row)
this.nodeList2 = []
this.nodeList2.push(row)
this.drawerTitle = ''
this.modalShowFlag = true
this.modalShowRoleFlag = true
}
},
selectReplaceStandNumRowChange(val) {
@@ -1199,6 +1210,44 @@ export default {
this.drawerTitle = title;
this.modalShowFlag = true;
},
checkedRole2 (data) {
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
this.roleForm.deptUserIdName = data[0].name
} else if (this.type === 1) {
this.qbfsForm.modelData[this.zrIndex].bussFsSubUser1 = idList
this.qbfsForm.modelData[this.zrIndex].bussFsSubUser1Name = nameList
} else {
this.qbfsForm.modelData.forEach(item => {
this.zrIdList.forEach(items => {
if (item.id === items) {
item.bussFsSubUser1 = idList
item.bussFsSubUser1Name = nameList
}
})
})
}
// if(data !== undefined && data && data.length > 0){
// const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
// const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
// this.form.QCDWID = institutionIdList
// this.form.QCDW = institutionNameList
// }
this.modalShowRoleFlag = false
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+7 -1
View File
@@ -133,6 +133,7 @@
></Role-tree>
<!-- 选择责任人-->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
@@ -317,7 +318,12 @@ export default {
}
this.modalshowflag = true;
},
checkedRole(data) {
checkedRole (data) {
this.qbfsForm.bussFsSubUser2 = data[0].id;
this.qbfsForm.bussFsSubUser2Name = data[0].name;
this.modalShowFlag = false;
},
checkedRole2(data) {
let idList = "";
let nameList = "";
data.forEach(item => {
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+134 -7
View File
@@ -19,14 +19,19 @@
>
<div style="flex: auto; overflow: auto" v-show="active === '1'">
<formList
:form = "qbfsForm"
:key = "formKey"
:formSub = "qbfsForm"
:FBGBUSSFileList = "FBGBUSSFileList"
:LSBBBUSSFileList = "LSBBBUSSFileList"
:BZSMBUSSFileList = "BZSMBUSSFileList"
:QTWJBUSSFileList = "QTWJBUSSFileList"
:GLWJBUSSFileList = "GLWJBUSSFileList"
:disabledState = "disabledState"
:verifySarStandard = "verifySarStandard"></formList>
:opinionsShow2 = "false"
:verifySarStandard = "verifySarStandard"
@formCancel="formCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
></formList>
<div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
@@ -113,9 +118,13 @@
</el-form>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
@submit="handleSubmit"
v-show="verifySarStandard"
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
@@ -133,6 +142,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
@@ -140,7 +155,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst } from "api/process";
import formList from './common/formList.vue'
export default {
@@ -153,7 +168,10 @@ export default {
},
data() {
return {
bpnId: '',
formKey:1,
active: '1',
modalShowRoleFlag:false,
disabledState:true,
verifySarStandard:true,
FBGBUSSFileList: [],
@@ -203,10 +221,65 @@ export default {
}
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDataS()
}
this.processTable()
this.getData()
},
methods:{
checkedRole2 (data) {
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if(this.userType === 'QCRBUSS'){
this.qbfsForm.QCRBUSSID=idList;
this.qbfsForm.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
choiceZRRList (type, title, id) {
this.nodeList2 = []
if(type === 'QCRBUSS'){
if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) {
this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
formCancel (form, list1,list2,list3,list4,list5) {
this.qbfsForm = form
this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -243,6 +316,27 @@ export default {
})
})
},
getDataS(){
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.standardDrawer = false
this.verifySarStandard = true
this.commentText = mes.commentText
this.formKey++
this.$forceUpdate()
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -264,7 +358,12 @@ export default {
let standObj = await this.getStandInfoUpdateById(item.standId)
this.$nextTick(() => {
const bringData = standObj.data
const json = Object.assign(bringData, bringData.attrInfoMap,item);
const obj = {
reviewResultsContent:"",
draftTime:"",
releaseTime:"",
}
const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
@@ -276,12 +375,33 @@ export default {
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.standardDrawer = false
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
})
},
handleTabs(name) {
this.active = name;
},
//流程保存
handleSave(){
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
qbfsForm: this.qbfsForm,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
//流程提交
handleSubmit(){
this.$refs['qbfsForm'].validate((valid) => {
@@ -299,6 +419,13 @@ export default {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
if (this.bpnId !== undefined && this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
})
}
}
this.isSubmit = false
}, e => {
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+4
View File
@@ -1380,6 +1380,10 @@
this.form.QCDW = institutionNameList
}
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+4
View File
@@ -1472,6 +1472,10 @@
this.form.QCDW = institutionNameList
}
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+4
View File
@@ -1381,6 +1381,10 @@
this.form.QCDW = institutionNameList
}
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+4
View File
@@ -1472,6 +1472,10 @@
this.form.QCDW = institutionNameList
}
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+4
View File
@@ -1349,6 +1349,10 @@
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+4
View File
@@ -1692,6 +1692,10 @@
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+4
View File
@@ -1349,6 +1349,10 @@
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+4
View File
@@ -1692,6 +1692,10 @@
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+3 -1
View File
@@ -564,7 +564,9 @@ export default {
this.qcdwOptions = res.data.QCDW // 起草单位
})
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
this.$http.get('/lawss/activiti/saveEditFile', '',{
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_lx'
},{
_this: this
}, res => {
console.log(res)