+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清空
+
+
+
+
@@ -229,6 +300,7 @@ export default {
name: "bzzqyjStep1",
data() {
return {
+ commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
listModel: false, // 新增抽屉开关
@@ -241,6 +313,17 @@ export default {
endTime: '', // 结束日期
cname: '', // 名称
},
+ formRules: {
+ cid: [
+ { required: true, message: '请输入标准编号', trigger: 'change' },
+ ],
+ endTime: [
+ { required: true, message: '请输入标准结束日期', trigger: 'change' },
+ ],
+ cname: [
+ { required: true, message: '请输入标准名称', trigger: 'change' },
+ ],
+ },
// 标准征求意见数据可库
standCommonlySearch: {
categorg: '',
@@ -259,15 +342,41 @@ export default {
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
- dockUser: '',
- dockUserName: '',
- mainUser: '',
- mainUserName: '',
- engineerUser: '',
- engineerUserName: '',
- checkUser: '',
- checkUserName: '',
- }
+ dockUserList: '',
+ dockUserListName: '',
+ ministerUser: '',
+ ministerUserName: '',
+ directorUser: '',
+ directorUserName: '',
+ presidentUser: '',
+ presidentUserName: '',
+ },
+ roleFormRules: {
+ dockUserList: [
+ { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+ ],
+ ministerUser: [
+ { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+ ],
+ directorUser: [
+ { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+ ],
+ presidentUser: [
+ { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+ ]
+ },
+ treeData: [],
+ nodeList: [],
+ nodeList2: [],
+ type: '',
+ drawerTitle: '',
+ modalshowflag: false,
+ modalshowflag2: false,
+ defaultProps: {
+ children: 'children',
+ label: 'name'
+ },
+ roleRow: {},
}
},
components: {
@@ -276,6 +385,7 @@ export default {
ProcessTitle
},
mounted () {
+ this.getTree()
this.sarStandCompareHis()
this.tableHeight = $('.content').height() - 44
window.onresize = () => {
@@ -287,7 +397,6 @@ export default {
this.title = '标准征求意见库'
this.listModel = true
},
-
/** 标准征求意见库方法*
* **********************************************/
// 清空
@@ -348,7 +457,6 @@ export default {
for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i]));
}
- console.log(bringData)
this.form.cid = bringData[0].cid
this.form.cname = bringData[0].cname;
this.form.endTime = bringData[0].endTime;
@@ -360,18 +468,107 @@ export default {
}
},
/*** **********************************************/
-
/** 流程节点负责人的选择 *****************************/
- choiceZRR() {
- // this.choice
+ choiceZRR (type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.type = type
+ this.drawerTitle = title
+ this.modalshowflag = true
+ },
+ getTree () {
+ this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+ this.treeData = res.data
+ })
+ },
+ saveUserInfo () {
+ if (this.type === 'ministerUser') {
+ this.roleForm.ministerUser = this.roleRow.id
+ this.roleForm.ministerUserName = this.roleRow.name
+ } else if (this.type === 'directorUser') {
+ this.roleForm.directorUser = this.roleRow.id
+ this.roleForm.directorUserName = this.roleRow.name
+ } else if (this.type === 'presidentUser') {
+ this.roleForm.presidentUser = this.roleRow.id
+ this.roleForm.presidentUserName = this.roleRow.name
+ }
+ this.modalshowflag = false
+ },
+ cancleUserInfo () {
+ this.modalshowflag = false
+ },
+ drawerCheck (data) {
+ var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+ if(getlist.length == 1) {
+ this.roleRow = getlist[0]
+ }else {
+ this.$refs.tree.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+ }
+ },
+ choiceZRRS () {
+ this.nodeList2 = []
+ if ( this.roleForm.dockUserList.length > 0) {
+ this.nodeList2 = this.roleForm.dockUserList.split(',')
+ }
+ this.modalshowflag2 = true
+ },
+ saveUserInfo2 () {
+ var idList = ''
+ var nameList = ''
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
+ })
+ this.roleForm.dockUserList = idList
+ this.roleForm.dockUserListName = nameList
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
},
-
handleTabs(name) {
this.active = name
},
- // 流程也的提交按钮和保存按钮操作
handleSave() {},
- handleSubmit() {}
+ handleSubmit() {
+ this.$refs['bzzqyjForm'].validate((valid) => {
+ if (valid) {
+ this.$refs['Form'].validate((valid) => {
+ if (valid) {
+ this.$http.get('lawss/activiti/startProcess', {
+ type: '3'
+ }, {}, res => {
+ if (res.ok) {
+ var json = Object.assign(this.form, this.roleForm)
+ json.commentText = this.commentText
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: res.data,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('流程发起成功')
+ this.$router.push('/processCenter')
+ }
+ })
+ } else {
+ this.$message.warning('流程启动失败')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善人员信息')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善基础信息')
+ }
+ })
+ }
}
}
@@ -412,7 +609,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
- height: calc(~'100% - 103px');
+ height: calc(~'100% - 107px');
overflow: auto;
}
.standardForComments {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 6258074e3..b3580f59a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -1,13 +1,300 @@
-
+
+
+
+ 标准征求意见流程
+ 对接人选择责任人
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index fe474ca29..5557de462 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -252,6 +252,7 @@ export default {
}
})
}
+ break
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
@@ -343,43 +344,59 @@ export default {
})
}
break;
+ break
+ case '3':
+ if (row.taskInfo === '责任对接人选择责任人') {
+ this.$router.push({
+ name: 'bzzqyjStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
//标准清单更新/发布流程
- case'4' :
- if (row.taskInfo === '进行会签，填写意见') {
- this.$router.push({
- name: 'bzqdfbStep2',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- } else if (row.taskInfo === '根据会签意见修订') {
- this.$router.push({
- name: 'bzqdfbStep3',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- }else if (row.taskInfo === '业务经理审批') {
- this.$router.push({
- name: 'bzqdfbStep4',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- }
- break;
+ case'4' :
+ if (row.taskInfo === '进行会签，填写意见') {
+ this.$router.push({
+ name: 'bzqdfbStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '根据会签意见修订') {
+ this.$router.push({
+ name: 'bzqdfbStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '业务经理审批') {
+ this.$router.push({
+ name: 'bzqdfbStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break;
+ break
//项目合规评估流程
case '5' :
if(row.taskInfo === ''){
@@ -394,6 +411,7 @@ export default {
}
})
}
+ break
}
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 5289fa24e..939b755e1 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -189,14 +189,14 @@
清单条目
- 上移
- 下移
删除
+
+
+ 上移
+ 下移
+
+