diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 47e6fdc7c..8adf3eb0d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -122,17 +122,12 @@ - - + :nodeKey="nodeKey" @popoverHide="popoverHide"> - - + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> - - + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> - - + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - - - {{'手动查找'}} - + + + + + + + + + + + + + + @@ -1127,17 +1104,9 @@ import ProcessTitle from '../../components/ProcessTitle' import {saveTaskFirst} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; - import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; export default { name: "bzrkStep1", - components: { - ProcessHeader, - ProcessFooter, - ProcessTitle, - TreeSelect, - TreeSelectNew - }, data () { return { standardDrawer: false, @@ -1222,12 +1191,6 @@ key3:4, treeData: [], // 人员数据 modalShowFlag: false, // drawer开关 - modalShowFlag1: false, // drawer开关 - modalShowFlag2: false, // drawer开关 - modalShowFlag3: false, // drawer开关 - modalShowFlag4: false, // drawer开关 - url:'', - urlChild:'', drawerTitle: '', //drawer标题 nodeKey: 'id', defaultCheckedKeys: [], @@ -1367,9 +1330,7 @@ standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 - busVppsChildOptions: [], // 车系体系架构子集合 modelOptions: [], // 模块体系架构 - modelChildOptions: [], // 模块体系架构子集合 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 @@ -1437,6 +1398,12 @@ }, }, }, + components: { + ProcessHeader, + ProcessFooter, + ProcessTitle, + TreeSelect + }, methods: { clearFormData(data){ this.form = { @@ -1661,6 +1628,7 @@ this.zrUserIds.push(data) } + console.log(this.zrUserIds) }else { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); if(getlist.length == 1) { @@ -1678,38 +1646,6 @@ this.drawerTitle = title this.modalShowFlag = true }, - choiceZRR1 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag1 = true - this.key++ - }, - choiceZRR2 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag2 = true - this.url = '' - this.urlChild = '' - this.url="sarVppsTree/list" - this.urlChild="sarVppsTree/childByList" - this.key1++ - }, - choiceZRR3 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag3 = true - this.url = '' - this.urlChild = '' - this.url="sarVppsTree/list" - this.urlChild="sarVppsTree/childByList" - this.key2++ - }, - choiceZRR4 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag4 = true - this.url = '' - this.urlChild = '' - this.url="sarModelTree/list" - this.urlChild="sarModelTree/childByList" - this.key3++ - }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { this.treeData = res.data @@ -1953,51 +1889,29 @@ this.fileMadel = true this.fileType = type; }, - popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { + popoverHide (checkedIds, checkedData) { if(checkedData) { - if(checkedData.length > 0){ - this.form.standSystem = checkedData.map(item => item.menuName).join(",") - }else { - this.form.standSystem = checkedData.menuName - } + this.form.standSystem = checkedData.id + this.form.standSystemName = checkedData.menuName } - this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.cycvppsbm = checkedData.map(item => item.code).join(",") - this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName - } + popoverHideBusVs (checkedIds, checkedData) { + if(checkedData){ + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName } - this.modalShowFlag2 = false }, - popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.kccvppsbm = checkedData.map(item => item.code).join(",") - this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName - } + popoverHideCarVs (checkedIds, checkedData) { + if(checkedData){ + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName } - this.modalShowFlag3 = false }, - popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.dybxh = checkedData.map(item => item.model).join(",") - this.form.dymc = checkedData.map(item => item.name).join(",") - }else { - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name - } + popoverHideModel (checkedIds, checkedData) { + if(checkedData){ + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name } - this.modalShowFlag4 = false }, closeDrawer() { this.ListModel = false @@ -2092,14 +2006,6 @@ this.busVppsOptions = res.data }) }, - busVsChildFunc(id){ - this.$http.get('sarVppsTree/childByList', {id:id}, { - _this: this - }, res => { - this.busVppsChildOptions = [] - this.busVppsChildOptions = res.data - }) - }, modelFunc(){ this.$http.get('sarModelTree/list', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index a26e77563..d3f680706 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -413,36 +413,6 @@ export default { zcCompletionTime: "" //在产的完成时间 }] }, - // listForm: { - // standNumber: "", //标准编号 - // standName: "",//标准名称 - // certifiedEngineer: "", //认证工程师 - // qualityEngineer: "", //质量工程师 - // dataList: [{ - // certifiedEngineer: '', - // projectManager: '', - // standNumber: '', - // itemsName: '', - // uname: '', - // projectNumber: '', - // implementer: '', - // implementerId: '', - // productLine: '', - // itemNum:'', - // qualityEngineer: '', - // distributePerson:'', - // projectName:'', - // standName:'', - // distributePersonId:'', - // complianceReasons:'', //在研合规原因 - // noCompliance:'', //在研不合规项目 - // countermeasures:'', //在研应对措施 - // completionTime:'', //在研完成时间 - // zcComplianceReasons: '', //在产的合规原因 - // zcCountermeasures:'', //在产的应对措施 - // zcCompletionTime:'', //在产的完成时间 - // }] - // }, choiceForm: {}, //选择标准清单列表 countryOptions: [], //适用区域下拉框数据 user1: "", @@ -477,7 +447,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -492,11 +461,18 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - console.log(item.fenFlag); if (item.fenFlag === undefined ) { + item.step3DTOS.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) this.dataList = item.step3DTOS; } else { this.dataList = item.dataList; + this.dataList.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) } this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; @@ -524,6 +500,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); + console.log(json); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue new file mode 100644 index 000000000..5ef4d2c7b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -0,0 +1,368 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue new file mode 100644 index 000000000..a61c3a4a4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 709ebe063..3ac149a2f 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -10,7 +10,8 @@
标准清单发布/更新流程
-
项目合规评估流程
+
项目合规评估流程-标准
+
项目合规评估流程-项目
未符合项整改流程
标准解读流程
@@ -87,11 +88,17 @@ export default { }) break case '7': - //项目评估流程 + //项目评估流程 - 标准 this.$router.push({ name: 'xmpgStep1' }) break + case '10': + //项目评估流程- 项目 + this.$router.push({ + name: 'xmpg2Step1' + }) + break case '8': //未符合项整改流程 this.$router.push({ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index fd1aa542f..dd246d9a4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -764,13 +764,13 @@ + @keyup.enter.native="searchConfiguraStand(true)" clearable> {{ opt.label }} - diff --git a/src/router/index.js b/src/router/index.js index 5c93b42a3..3e7dd9d26 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -339,6 +339,24 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpg2Step1', + name: 'xmpg2Step1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step2', + name: 'xmpg2Step2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step2.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',