@@ -469,6 +482,8 @@ export default {
nodeListOne: [],
isSubmit: false,
saveLoading: false,
+
+ commentText: '',
}
},
@@ -530,6 +545,7 @@ export default {
this.fileTextList.splice(index, 1)
}
})
+ this.rh_pageData.infoSources = this.fileTextList
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
@@ -547,6 +563,7 @@ export default {
})
}
this.fileListData.fileText = this.newDataList
+ this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -663,7 +680,8 @@ export default {
_formData.append('prcType', '20')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
- rh_pageData: this.rh_pageData
+ rh_pageData: this.rh_pageData,
+ commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -675,41 +693,46 @@ export default {
},
// 提交按钮
handleSubmit() {
- let json = {
- prcCreateUser: this.$store.getters.userInfo.userId,
- prcCreateUserName: this.$store.getters.userInfo.userName,
- roleList: this.roleForm,
- rh_pageData: this.rh_pageData,
- directorList: this.rh_pageData.comityInRoleId,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.$refs['roleForm'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const paramsInfo = {
- type: '20'
- }
- startProcess(paramsInfo).then(res => {
- this.taskID = res.data
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskID)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- })
- })
- } else {
- this.$message.warning('请完成流程信息的人员选择')
- }
- })
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ prcCreateUser: this.$store.getters.userInfo.userId,
+ prcCreateUserName: this.$store.getters.userInfo.userName,
+ roleList: this.roleForm,
+ rh_pageData: this.rh_pageData,
+ commentText: this.commentText,
+ directorList: this.rh_pageData.comityInRoleId,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.$refs['roleForm'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const paramsInfo = {
+ type: '20'
+ }
+ startProcess(paramsInfo).then(res => {
+ this.taskID = res.data
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskID)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ })
+ })
+ } else {
+ this.$message.warning('请完成流程信息的人员选择')
+ }
+ })
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 746fbfade..93313835a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -15,18 +15,6 @@
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -75,8 +63,18 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
-
+
{
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('退回成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '0',
+ commentText: this.commentText,
+ rh_pageData: this.rh_pageData,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('退回成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- memberId: this.$store.getters.userInfo.userId,
- passFlag: '1',
- commentText: this.commentText,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '1',
+ commentText: this.commentText,
+ rh_pageData: this.rh_pageData,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index fb8e342a1..5898f8ed8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -14,19 +14,7 @@
基础信息
+
+
+
+
-
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
+
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
+
+
+
+
+
@@ -303,6 +315,7 @@ export default {
workPath: '',
comityTel: [],
fillPeople: '',
+ fillPeopleId: '',
fillUnit: '',
fillDept: '',
fillPost: '',
@@ -312,6 +325,13 @@ export default {
fillLeaderId: '',
fillFile: '',
},
+ rh_rules: {
+ fillLeader: [
+ {required: true, message: "请选择参与人部门领导", trigger: 'blur'},
+ { trigger: 'change' }
+ ]
+
+ },
roleForm: {},
unqualidiedData: [],
roleShowflag: false,
@@ -324,6 +344,8 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ commentText: '',
+ infoSourcesLength: ''
}
},
computed: {
@@ -364,7 +386,9 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+ this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
@@ -409,29 +433,41 @@ export default {
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- selfUser: this.$store.getters.userInfo.userId,
- charge: this.rh_pageData.fillLeaderId,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ selfUser: this.$store.getters.userInfo.userId,
+ charge: this.rh_pageData.fillLeaderId,
+ rh_pageData: this.rh_pageData,
}
- })
- }
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 6148c73ab..e1b2a0e03 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -15,18 +15,6 @@
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
@@ -116,7 +114,7 @@
+
+
+
+
@@ -294,6 +305,10 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ deleteDataList: [],
+
+ infoSourcesLength: '',
+ commentText: ''
}
},
computed: {
@@ -338,6 +353,7 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
@@ -356,7 +372,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.rh_pageData.myPartRole.findIndex(items => {
- return items.id === item;
+ return items === item;
});
if (index > -1) {
this.rh_pageData.myPartRole.splice(index, 1);
@@ -374,13 +390,32 @@ export default {
},
// 保存按钮
handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm,
+ commentText: this.commentText
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
},
// 提交按钮
handleSubmit() {
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
let json = {
leader: this.roleForm.leaderUserId,
rh_pageData: this.rh_pageData,
roleList: this.roleForm,
+ commentText: this.commentText
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -398,7 +433,17 @@ export default {
});
}
})
- }
+ }
+
+ },
+
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
new file mode 100644
index 000000000..dbf22f849
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -0,0 +1,507 @@
+
+
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -78,8 +66,18 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
-
+
+
+ 外部标准化协会入会流程
+ 批准
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index f46729998..3a8594b69 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -18,18 +18,6 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ rh_pageData.comityName || '-' }}
+
+
+
+
+ {{ rh_pageData.comityState || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityKind || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeQualification || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeRole || '' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeCost || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeDuties || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeTime || '-' }}
+
+
+
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
-
- 批量删除
-
-
+
+
+
+
@@ -277,6 +279,11 @@ export default {
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ infoSourcesLength: '',
+
+ textTitle: '审批意见',
+ textHolder: '请输入审批意见'
}
},
computed: {
@@ -308,6 +315,10 @@ export default {
},
getData() {
+ if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+ this.textTitle = '回执说明'
+ this.textHolder = '请输入回执说明'
+ }
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -321,114 +332,107 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
- /** 批量删除 */
- del_paryForm() {
- if (this.deleteDataList.length < 1) {
- this.$message.warning("请选择一条数据进行删除");
- } else {
- this.$confirm("您确认删除这些数据?", "提示", {
- confirmButtonText: "确认",
- confirmButtonClass: "common-button-primary",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- let exits = [];
- this.deleteDataList.map(item => {
- let index;
- index = this.rh_pageData.myPartRole.findIndex(items => {
- return items.id === item;
- });
- if (index > -1) {
- this.rh_pageData.myPartRole.splice(index, 1);
- }
- exits.push(item);
- });
- this.deleteDataList = [];
- }).catch(() => {
- });
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
-
selectedDelete(val) {
this.deleteDataList = val
},
// 退回按钮
handleSubmitNo() {
- let json = {
- passFlag: '0',
- rh_pageData: this.rh_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '标准法规部主管领导审核') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ this.$message.warning('请输入反馈意见')
} else {
- json = {
+ let json = {
+ passFlag: '0',
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.taskInfo === '标准法规部主管领导审核') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- passFlag: '1',
- rh_pageData: this.rh_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '标准法规部主管领导审核') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ this.$message.warning('请输入反馈意见')
+ }
} else {
- json = {
+ let json = {
+ passFlag: '1',
rh_pageData: this.rh_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.taskInfo === '标准法规部主管领导审核') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 6e269cd45..ce7cc3e85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -97,7 +97,8 @@
-
+
@@ -170,6 +171,19 @@
+
+
+
+