diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 3643f6062..307ae7832 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -55,8 +55,6 @@ -
-
选择项目 - + - + + + + + label="乘用车VPPS编码"> + label="乘用车vpps中文名称"> @@ -134,7 +143,7 @@
@@ -155,19 +164,22 @@

审批责任人

- +
- +

工程经理

- +
@@ -178,7 +190,8 @@

标准法规部部长

- +
@@ -194,6 +207,111 @@ :nodeList="nodeList" >
+ + + + +
+
+
+
+ + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + +
+ +
+
+
+ 取消 + 带入 +
+ @@ -202,22 +320,28 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { saveTaskFirst } from "api/process"; + export default { name: "xmpg2Step1", components: { ProcessFooter, ProcessHeader, - ProcessTitle, + ProcessTitle }, - data(){ + data() { return { - active: '1', //当前选中的type + active: "1", //当前选中的type + isSubmit: false, + saveLoading: false, //表单的数据 listForm: { - projectNumber:'', //项目编号 - projectName:'', //项目名称 + projectNumber: "", //项目编号 + projectName: "", //项目名称 + dataList: [], //项目下的标准数据 + breakdownList: [], //标准下的分解单数据 }, - dataList:[], //下面标准的数据 + dataList: [], //下面标准的数据 + breakdownList: [], //标准下的条款数据 //表单的验证 formRules: { projectNumber: [ @@ -225,68 +349,220 @@ export default { ], projectName: [ { required: true, message: "请填写项目名称", trigger: "change" } - ], + ] }, //选人的验证 - roleFormRules:{ - serviceManagerName:[ - {required: true, message:"请选择业务经理", trigger:"change"} + roleFormRules: { + serviceManagerName: [ + { required: true, message: "请选择业务经理", trigger: "change" } ], engineeringManagerName: [ - {required: true, message:"请选择工程经理", trigger:"change"} + { required: true, message: "请选择工程经理", trigger: "change" } ], statuteMinisterName: [ - {required: true, message:"请选择法规部部长", trigger:"cahnge"} - ], + { required: true, message: "请选择法规部部长", trigger: "cahnge" } + ] }, //选择人的数据 roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, - serviceManager:'', //业务经理 - serviceManagerName:'', - engineeringManager:'', //工程经理 - engineeringManagerName:'', - statuteMinister:'', //标准法规部部长 - statuteMinisterName:'', + serviceManager: "", //业务经理 + serviceManagerName: "", + engineeringManager: "", //工程经理 + engineeringManagerName: "", + statuteMinister: "", //标准法规部部长 + statuteMinisterName: "" }, modalshowflag: false, // drawer开关 - drawerTitle: '', //drawer标题 + drawerTitle: "", //drawer标题 nodeList: [], - } - }, + projectModel: false, //项目抽屉开关 + projectId: "", //项目id 用来查询标准 + standId: [], //标准id 用来条款 + searching: false, + //项目检索条件 + projectSearch: { + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + projectNumber: "", + projectName: "" + }, + //项目数据 + ProjectDatas: [], + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + //存放被勾选的项目的数据 + selectedList: [] + }; + }, methods: { //tab发生变化 - handleTabs(type){ - this.active = type + handleTabs(type) { + this.active = type; }, //点击选择项目事件 - choiceShow(){ + choiceShow() { + this.projectModel = true; + }, + //获取项目数据 + getProjectData() { + this.$http.get("sarStandProjectLibrary/queryProject", { + ...this.projectSearch + }, { + _this: this + }, res => { + this.ProjectDatas = res.data.Maintenance.records; + }); }, - //标准的多选框改变 - selectStandChange(){ - + //点击清空按钮事件 + clearSearch() { + this.projectSearch = { + projectName: "", + projectNumber: "" + }; + this.getProjectData(); }, - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - checkedRole (data) { - if (this.type === 'serviceManager') { - this.roleForm.serviceManager = data[0].id - this.roleForm.serviceManagerName = data[0].name - } else if (this.type === 'engineeringManager') { - this.roleForm.engineeringManager = data[0].id - this.roleForm.engineeringManagerName = data[0].name - } else if (this.type === 'statuteMinister') { - this.roleForm.statuteMinister = data[0].id - this.roleForm.statuteMinisterName = data[0].name + //带入项目确定事件 + OkDrawer() { + if (this.selectedList.length > 1) { + this.$message.warning("您只能选择一条数据进行带入"); + } else if (this.selectedList.length === 0) { + this.$message.warning("请选择一条数据进行带入"); + } else { + this.projectId = this.selectedList[0].id; + this.listForm.projectNumber = this.selectedList[0].projectNumber; + this.listForm.projectName = this.selectedList[0].projectName; + this.getStandData(); + this.projectModel = false; } }, + //带入项目取消事件 + closeDrawer() { + this.projectModel = false; + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { + _this: this + }, res => { + this.listForm.dataList = res.data.records; + this.dataList = res.data.records; + let ids = []; + this.dataList.forEach(item => { + ids.push(item.standId); + }); + this.standId = ids.join(","); + this.getClauseData(); + }); + }, + //查询标准下的条款 + getClauseData() { + this.$http.get("SarStandItems/sar-stand-items/findAllItems", { + ids: this.standId, + type: "FBGBJBD" + }, + { + _this: this + }, res => { + this.listForm.breakdownList = res.data + }); + }, + //标准的多选框改变 + selectStandChange(data) { + }, + //项目的多选框改变 + selectListChange(data) { + this.selectedList = data; + }, + pageChange(page) { + + }, + pageSizeChange(pageSize) { + + }, + //流程保存事件 + handleSave(){ + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '2') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, + //流程提交事件 + handleSubmit(){ + var json = Object.assign(this.listForm, this.roleForm) + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.account; + json.standId = this.listForm.standId; + this.$refs['listForm'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + }, + choiceZRR(type, title, id) { + this.nodeList = []; + this.nodeList.push(id); + this.type = type; + this.drawerTitle = title; + this.modalshowflag = true; + }, + checkedRole(data) { + if (this.type === "serviceManager") { + this.roleForm.serviceManager = data[0].id; + this.roleForm.serviceManagerName = data[0].name; + } else if (this.type === "engineeringManager") { + this.roleForm.engineeringManager = data[0].id; + this.roleForm.engineeringManagerName = data[0].name; + } else if (this.type === "statuteMinister") { + this.roleForm.statuteMinister = data[0].id; + this.roleForm.statuteMinisterName = data[0].name; + } + } + }, + mounted() { + this.getProjectData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index a61c3a4a4..d94d6d0a7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -1,13 +1,440 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue new file mode 100644 index 000000000..90639dc8e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue new file mode 100644 index 000000000..d72a29695 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue new file mode 100644 index 000000000..aadb150b8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue new file mode 100644 index 000000000..60a93e5dc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 81daee6cb..1e44638e8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -216,6 +216,7 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType + console.log(prcType); switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { @@ -542,6 +543,21 @@ export default { }) } break + //项目评估流程-项目 + case '6': + if(row.taskInfo === '标准法规部业务经理审批'){ + this.$router.push({ + name: 'xmpg2Step2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break //未符合项整改流程 case '8' : if(row.taskInfo === '下发至标准法规工程师'){ diff --git a/src/router/index.js b/src/router/index.js index 3e7dd9d26..1e81556bc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -357,6 +357,42 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step3', + name: 'xmpg2Step3', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step3.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step4', + name: 'xmpg2Step4', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step4.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step5', + name: 'xmpg2Step5', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step5.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step6', + name: 'xmpg2Step6', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step6.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',