sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-07-04 23:23:47 +08:00
parent e6da0628fa
commit 1957fcde25
2 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -40,7 +40,11 @@
>
</el-option>
</el-select> -->
<el-tag v-for="(item, index) in projectOptions" v-if="item.id==form.businessKey">{{item.projectName}}</el-tag>
<el-tag
v-for="(item, index) in projectOptions"
v-if="item.id == form.businessKey"
>{{ item.projectName }}</el-tag
>
</el-form-item>
<el-form-item label="发起单位">
{{ deptName }}
@ -103,11 +107,7 @@
placeholder="请输入分包单位项目经理"
/>
</el-form-item>
<el-form-item
v-if="fbAptitude"
label="身份证号"
prop="subDeptCustodianCardId"
>
<el-form-item v-if="fbAptitude" label="身份证号" prop="subDeptCustodianCardId">
<el-input
v-model="form.subDeptCustodianCardId"
placeholder="请输入分包单位项目经理身份证号"
@ -149,7 +149,7 @@
type="warning"
show-icon
>
</el-alert>
</el-alert>
</el-form-item>
<el-form-item label="申请说明" prop="remark">
<el-input
@ -159,7 +159,7 @@
rows="5"
/>
</el-form-item>
<div style="text-align: center;margin-bottom: 20px;">
<div style="text-align: center; margin-bottom: 20px">
<el-button type="primary" @click="submitForm">提交流程</el-button>
<el-button @click="doCanel">取 消</el-button>
</div>
@ -197,7 +197,7 @@ export default {
projectName: "",
files: "",
remark: "",
subDeptScope:[],
subDeptScope: [],
},
// 表单校验
rules: {
@ -275,10 +275,10 @@ export default {
taskOpen: false,
daterangeMarksTime: [],
fbAptitude: false,
persChangeList1: ['flow_xmglzdl_xmzbdwrybg','flow_xmglzdl_xmjldwrybg'],
persChangeList2: ['flow_xmglzdl_xmjlzjrybg','flow_xmglzdl_xmzbjlrybg'],
persChangeList1: ["flow_xmglzdl_xmzbdwrybg", "flow_xmglzdl_xmjldwrybg"],
persChangeList2: ["flow_xmglzdl_xmjlzjrybg", "flow_xmglzdl_xmzbjlrybg"],
persChange1: false,
persChange2: false
persChange2: false,
};
},
computed: {},
@ -295,7 +295,6 @@ export default {
return;
}
});
},
doCanel() {
this.onOpen = false;
@ -303,17 +302,25 @@ export default {
show(options) {
this.options = options;
this.onOpen = true;
this.fbAptitude = false;
this.persChange1 = false;
this.persChange2 = false;
this.title = options.procDefName;
//初始化流程类型
if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
this.fbAptitude = true;
}
if (this.persChangeList1.indexOf(options.flowKey)){
}else if (
options.procDefKey == "flow_xmglzdl_xmzbdwrybg" ||
options.procDefKey == "flow_xmglzdl_xmjldwrybg"
) {
this.persChange1 = true;
}
if (this.persChangeList2.indexOf(options.flowKey)){
}else if (
options.procDefKey == "flow_xmglzdl_xmjlzjrybg" ||
options.procDefKey == "flow_xmglzdl_xmzbjlrybg"
) {
this.persChange2 = true;
}
console.log("procDefKey==>"+options.procDefKey);
this.initFormDate(options.procInsId);
flowXmlAndNode({ procInsId: options.procInsId, deployId: options.deployId }).then(
(res) => {
@ -346,8 +353,8 @@ export default {
const params = { procInsId: procInsId };
findFormDatasByProcInsId(params)
.then((res) => {
if(res.data.subDeptScope){
res.data.subDeptScope = res.data.subDeptScope.split(',');
if (res.data.subDeptScope) {
res.data.subDeptScope = res.data.subDeptScope.split(",");
}
this.form = res.data;
this.deptName = this.options.startDeptName;
@ -378,22 +385,22 @@ export default {
this.$refs["form"].validate((valid) => {
if (valid) {
let fbAptitudeParams = {};
if(this.fbAptitude){
if(this.form.subDeptScope.length==0){
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
}
} 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;
@ -403,7 +410,7 @@ export default {
files: this.form.files,
remark: this.form.remark,
INITIATOR: this.form.INITIATOR,
...fbAptitudeParams
...fbAptitudeParams,
};
complete(this.form).then((res) => {
this.$store.dispatch("settingAwaitNum");

28
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -128,16 +128,16 @@
title="请至少上传报审表，营业执照，安全生产许可证，资质证书，人员证书等！缺少相关附件可能被驳回申请。"
type="warning"
show-icon
/>
</el-alert>
>
</el-alert>
<el-alert
v-if="persChange1"
title="请至少上传变更申请、人员证件等。"
type="warning"
show-icon
>
</el-alert>
<el-alert
</el-alert>
<el-alert
v-if="persChange2"
title="请至少上传变更申请/变更原因说明、新到人员无其他项任职承诺书、任命/调令文件、人员证件等。"
type="warning"
@ -269,10 +269,8 @@ export default {
daterangeMarksTime: [],
//分包资质审批
fbAptitude: false,
persChangeList1: ['flow_xmglzdl_xmzbdwrybg','flow_xmglzdl_xmjldwrybg'],
persChangeList2: ['flow_xmglzdl_xmjlzjrybg','flow_xmglzdl_xmzbjlrybg'],
persChange1: false,
persChange2: false
persChange2: false,
};
},
computed: {},
@ -311,18 +309,26 @@ export default {
this.options = options;
this.initMyProject();
this.title = options.name;
this.fbAptitude = false;
this.persChange1 = false;
this.persChange2 = false;
this.deptName = store.getters.dept.deptName;
this.nickName = store.getters.name;
//初始化流程类型
if (options.flowKey == "flow_fbzzsp_fbszzsp") {
this.fbAptitude = true;
}
if (this.persChangeList1.indexOf(options.flowKey)){
}else if (
options.flowKey == "flow_xmglzdl_xmzbdwrybg" ||
options.flowKey == "flow_xmglzdl_xmjldwrybg"
) {
this.persChange1 = true;
}
if (this.persChangeList2.indexOf(options.flowKey)){
}else if (
options.flowKey == "flow_xmglzdl_xmjlzjrybg" ||
options.flowKey == "flow_xmglzdl_xmzbjlrybg"
) {
this.persChange2 = true;
}
console.log("flowKey==>"+options.flowKey);
const self = this;
this.onOpen = true;
flowXmlAndNode({ deployId: options.deploymentId }).then((res) => {