diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index d20efd6e8..3f448ac59 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -25,6 +25,13 @@
+
+
+
-
+
- 责任部门对接人
+ 技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员
-
+
@@ -154,10 +161,10 @@
- 标准法规部部长
+ 标准法规部高级经理、责任部门高级经理
-
+
@@ -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' },
],
@@ -413,7 +424,7 @@
this.type2 = type
this.nodeList2 = []
if (type === '1') {
- this.drawerTitle2 = '选择责任部门对接人'
+ this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index fc7b6eba8..03c3ea5a9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -25,6 +25,13 @@
+
+
+
-
+
- 责任部门对接人
+ 技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员
-
+
@@ -154,10 +161,10 @@
- 标准法规部部长
+ 标准法规部高级经理、责任部门高级经理
-
+
@@ -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' },
],
@@ -403,7 +414,7 @@ export default {
this.type2 = type
this.nodeList2 = []
if (type === '1') {
- this.drawerTitle2 = '选择责任部门对接人'
+ this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index 4ed784cf6..add917463 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -25,6 +25,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
{
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 = []
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index b4d270393..3e22c57c3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -25,6 +25,14 @@
+
+
+
{
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
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index eb4bb3d93..ecb052e86 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -25,6 +25,14 @@
+
+
+
{
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
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 8b72495db..7cddfb044 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -25,6 +25,14 @@
+
+
+
{
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
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 986d67040..64879fd39 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -25,6 +25,14 @@
+
+
+
{
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
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 71426e24e..406c19d4b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -263,7 +263,6 @@
@@ -448,31 +446,6 @@ export default {
}, e => {
});
},
- //驳回
- beforeBack(){
- if(!this.commentText){
- this.$message.warning('请填写审批意见')
- }else{
- this.listForm.commentText = this.commentText
- this.listForm.stepFlag = '1'
- 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.isSubmit = false
- }, e => {
- });
- }
- },
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index d83905498..ff495dc8e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -12,81 +12,98 @@
-
-
-
- 标准法规工程师
-
-
-
-
-
-
-
-
-
-
- 标准法规工程师、事业部标准化员
-
-
+ ref="bzzqyjForm"
+ :model="form"
+ :rules="formRules"
+ class="label-input-form"
+ label-width="210px"
+ >
+
+ 基础信息
+
+
-
-
-
-
-
-
- 标准法规部高级经理、责任部门高级经理
-
-
+ disabled
+ v-model="form.cid"
+ placeholder="请输入标准编号"
+ clearable
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择附件
+
-
-
-
-
-
-
-
- 技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任
-
-
+ v-model="form.fjListId"
+ style="display: none;"
+ >
+
+
+ {{ item.fileName }}
+
+
+
+
+
-
-
-
-
-
-
-
- 工程研究院总院院长/标准法规业务主管副院长
-
-
-
-
-
-
-
+ disabled
+ style="display: none;"
+ v-model="form.modelNameList"
+ clearable
+ >
+
+
+ {{ item.name }}
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
@@ -107,76 +124,76 @@
-
+ ref="Form"
+ :model="roleForm"
+ :rules="roleFormRules"
+ class="label-input-form myForm">
+
- 流程发起人
+ 标准法规工程师
-
+
-
+
- 责任部门对接人
+ 标准法规工程师、事业部标准化员
+ v-model="roleForm.dockUserListName"
+ placeholder="选择标准法规工程师、事业部标准化员"
+ @click.native="choiceZRRS('1')">
-
+
- 标准法规部部长
+ 标准法规部高级经理、责任部门高级经理
-
+
- 技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任
+ 技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任
-
+
- 工程研究总院院长或标准法规主管副院长
+ 工程研究院总院院长/标准法规业务主管副院长
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 0ca722723..8ac700625 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -283,7 +283,7 @@ export default {
const prcType = row.prcType
switch(prcType) {
case '1':
- if (row.taskInfo === '标准法规业务经理审批') {
+ if (row.taskInfo === '批准') {
this.$router.push({
name: 'bzrkStep2',
query: {
@@ -294,7 +294,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '责任人会签'){
+ }else if (row.taskInfo === '会签'){
this.$router.push({
name: 'bzrkStep3',
query: {
@@ -305,7 +305,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '申请人修订'){
+ }else if (row.taskInfo === '修订'){
this.$router.push({
name: 'bzrkStep4',
query: {
@@ -1175,7 +1175,7 @@ export default {
break
//未符合项整改流程
case '8' :
- if(row.taskInfo === '下发至标准法规工程师'){
+ if(row.taskInfo === '审核'){
this.$router.push({
name: 'wfhxzgStep2',
query: {
@@ -1187,7 +1187,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '确认+选择责任人') {
+ } else if (row.taskInfo === '合规排查(上传合规举证材料)') {
this.$router.push({
name: 'wfhxzgStep3',
query: {
@@ -1199,7 +1199,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '上传佐证材料填写信息') {
+ }else if (row.taskInfo === '审定') {
this.$router.push({
name: 'wfhxzgStep4',
query: {