diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue index 786b6a48..8c759f8b 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue @@ -116,7 +116,7 @@ /> - diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue index 0c10f609..0db7c4b2 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue @@ -23,8 +23,8 @@
- - + + {{item.projectName}} {{ deptName }} @@ -128,6 +129,13 @@ v-model="form.files" :fileType="['pdf', 'png', 'jpg', 'jpeg']" /> + + { - if ((item.id = val)) { - projectName = item.projectName; + if (item.id == val) { + this.form.projectName = item.projectName; return; } }); - this.form.projectName = projectName; + }, doCanel() { this.onOpen = false; @@ -314,6 +322,9 @@ export default { const params = { procInsId: procInsId }; findFormDatasByProcInsId(params) .then((res) => { + if(res.data.subDeptScope){ + res.data.subDeptScope = res.data.subDeptScope.split(','); + } this.form = res.data; this.deptName = this.options.startDeptName; this.nickName = this.options.startUserName; @@ -342,6 +353,25 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + let fbAptitudeParams = {}; + if(this.fbAptitude){ + if(this.form.subDeptScope.length==0){ + this.$modal.msgError("请至少选择一个分包范围!"); + return false; + }else{ + fbAptitudeParams={ + subDeptType:this.form.subDeptType, + subDeptScope:this.form.subDeptScope.toString(), + subDeptName:this.form.subDeptName, + subDeptAptitude:this.form.subDeptAptitude, + subDeptChairman:this.form.subDeptChairman, + subDeptSafetyCertificate:this.form.subDeptSafetyCertificate, + subDeptCustodian:this.form.subDeptCustodian, + subDeptCustodianCardId:this.form.subDeptCustodianCardId, + subDeptApproachDate:this.form.subDeptApproachDate + } + } + } this.loading = true; this.form.variables = { businessKey: this.form.businessKey, @@ -349,6 +379,7 @@ export default { files: this.form.files, remark: this.form.remark, INITIATOR: this.form.INITIATOR, + ...fbAptitudeParams }; complete(this.form).then((res) => { this.$store.dispatch("settingAwaitNum"); diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue index 878f22ac..18617e18 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue @@ -102,11 +102,7 @@ placeholder="请输入分包单位项目经理" /> - + + + -
+
提交流程 取 消
@@ -173,6 +176,7 @@ export default { projectName: "", files: "", remark: "", + subDeptScope: [], }, // 表单校验 rules: { @@ -275,14 +279,12 @@ export default { }, // 项目选择 projectChage(val) { - let projectName = ""; this.projectOptions.forEach((item) => { - if ((item.id = val)) { - projectName = item.projectName; + if (item.id == val) { + this.form.projectName = item.projectName; return; } }); - this.form.projectName = projectName; }, doCanel() { this.onOpen = false; @@ -294,7 +296,7 @@ export default { this.deptName = store.getters.dept.deptName; this.nickName = store.getters.name; //初始化流程类型 - if (options.procDefKey == "flow_fbzzsp_fbszzsp") { + if (options.flowKey == "flow_fbzzsp_fbszzsp") { this.fbAptitude = true; } const self = this; @@ -330,6 +332,14 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + if (this.fbAptitude) { + if (this.form.subDeptScope.length == 0) { + this.$modal.msgError("请至少选择一个分包范围!"); + return false; + } else { + this.form.subDeptScope = this.form.subDeptScope.toString(); + } + } this.loading = true; definitionStart(this.options.id, JSON.stringify(this.form)).then((res) => { this.$modal.msgSuccess(res.msg); diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue index 7e4b9c51..6b5a2fa6 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue @@ -121,7 +121,7 @@ /> - diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index 3ead176e..6213a797 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -312,7 +312,7 @@ show-overflow-tooltip >