diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 3cb38c8ea..311db7d4f 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -87,7 +87,7 @@ export default { }, labelWidth: { type: String, - default: '150px' + default: '210px' } }, components: {}, diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue new file mode 100644 index 000000000..79c384bdf --- /dev/null +++ b/src/components/treeSelect/treeSelectStand.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue index e9036a7f7..b4d34386a 100644 --- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue +++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue @@ -450,7 +450,7 @@ export default { this.page = 1 } this.peopleType = 2; - this.$http.post('SarInstitution/institution/user', { + this.$http.post('SarInstitution/institution/userUnderInstitution', { current: this.page, size: this.pageSize, uname: this.searchForm.uname, @@ -475,7 +475,7 @@ export default { }, getData() { this.peopleType = 1; - this.$http.post('SarInstitution/institution/user', { + this.$http.post('SarInstitution/institution/userUnderInstitution', { current: this.page, size: this.pageSize, institutionId: this.id, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue new file mode 100644 index 000000000..e0cb7145e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -0,0 +1,1191 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue new file mode 100644 index 000000000..eb3a7428d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -0,0 +1,500 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue new file mode 100644 index 000000000..9ead05378 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -0,0 +1,660 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 445310332..a07cb7537 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -160,19 +160,31 @@ clearable > - + + + + + + @@ -566,33 +578,6 @@ v-model="form['nylx']" > - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ '手动查找' }} - - - - - - - - - - - - - - - - - - - - - + @@ -1179,38 +1164,6 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - 1) { @@ -2307,6 +2268,37 @@ export default { }, e => { }) }, + + /** 归档位置树结构查询 */ + getListTree(bringData) { + this.$http.get('sarResource/ts-resource/getListStand', { + sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.ok) { + this.treeListOptions = res.data + this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', { + standId: bringData.id, + }, {}, reson => { + if (reson.ok) { + let treeList = '' + let treeListId = '' + reson.data.forEach(item=>{ + this.treeCheckedKeys.push(item.menuId) + if (treeList.length > 0) { + treeList += ',' + treeListId += ',' + } + treeList += item.menuName + treeListId += item.menuId + }) + this.form.treeListName = treeList + this.form.treeListId = treeListId + } + }) + } + }) + }, handleStandardPageChange(page) { this.standardSearchForm.page = page this.handleSearchStandard() @@ -2464,6 +2456,13 @@ export default { this.urlChild = "sarModelTree/childByList" this.key3++ }, + + choiceTree(type, title, id) { + this.drawerTitle = title + this.getListTree(this.form) + this.modalShowTree = true + this.key++ + }, getTree() { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res => { @@ -2925,6 +2924,23 @@ export default { popoverHideCancel() { this.modalShowFlag1 = false }, + + treeHide(checkedIds, checkedData) { + if (checkedData) { + if (checkedData.length > 0 && checkedData.length != 0) { + this.form.treeListName = checkedData.map(item => item.menuName).join(",") + this.form.treeListId = checkedData.map(item => item.id).join(",") + } else { + this.form.treeListName = checkedData.menuName + this.form.treeListId = checkedData.id + } + this.modalShowTree = false + } + + }, + treeHideCancel() { + this.modalShowTree = false + }, popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { if (checkedData && checkedData.length != 0) { if (checkedData.length > 0 && checkedData.length != 0) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 86a37b849..31130d429 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1,1400 +1,1381 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 9c77d2db4..e1da8dbe3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -142,6 +142,20 @@ clearable > + + + + + + + @@ -158,7 +172,6 @@ :disabled="true" > + + + + + + + + @@ -1452,10 +1477,11 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; - +import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; export default { name: "bzrkStep4", components: { + TreeSelectStand, CusTomDataPickerGroup, TreeSelectModule, ProcessHeader, @@ -1520,10 +1546,13 @@ export default { defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + treeCheckedKeys: [], + treeListOptions: [], modalShowFlag1: false, // drawer开关 modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowTree: false, // 归档位置drawer开关 url: '', urlChild: '', drawerTitle: '', //drawer标题 @@ -1610,6 +1639,8 @@ export default { standSystem: '',// 标准体系 standSystemName: '',// 标准体系 gxhbq: '', // 标签 + treeListName: '', + treeListId: '', // 实施日期 ssrq: '', // 实施日期(标准文本) xcxssrq: '', // 新车型实施日期(标准文本) @@ -1884,6 +1915,12 @@ export default { this.key3++ }, + choiceTree(type, title, id) { + this.drawerTitle = title + this.getListTree(this.form) + this.modalShowTree = true + this.key++ + }, busVsFunc() { this.$http.get('sarVppsTree/list', '', { _this: this @@ -2370,6 +2407,22 @@ export default { popoverHideCancel() { this.modalShowFlag1 = false }, + treeHide(checkedIds, checkedData) { + if (checkedData) { + if (checkedData.length > 0 && checkedData.length != 0) { + this.form.treeListName = checkedData.map(item => item.menuName).join(",") + this.form.treeListId = checkedData.map(item => item.id).join(",") + } else { + this.form.treeListName = checkedData.menuName + this.form.treeListId = checkedData.id + } + this.modalShowTree = false + } + + }, + treeHideCancel() { + this.modalShowTree = false + }, popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { if (checkedData && checkedData.length != 0) { if (checkedData.length > 0 && checkedData.length != 0) { @@ -2462,6 +2515,7 @@ export default { this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; this.defaultCheckedKeys3 = [this.form.dybxh]; + this.treeCheckedKeys = this.form.treeListId.split(',') this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.prcNum = this.prcNum @@ -2538,6 +2592,17 @@ export default { }, e => { }) }, + /** 归档位置树结构查询 */ + getListTree(bringData) { + this.$http.get('sarResource/ts-resource/getListStand', { + sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.ok) { + this.treeListOptions = res.data + } + }) + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 011c25da2..0b54282f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -1,1051 +1,1048 @@ diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 84af9e5d8..1e32ad45f 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -467,9 +467,9 @@ }) break case '7': - //项目评估流程 - 标准 + //标准合规评估流程 this.$router.push({ - name: 'xmpgStep1' + name: 'bzpgStep1' }) break case '8': diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 40f0209ab..9b9d45fad 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -467,9 +467,9 @@ export default { }) break case '7': - //项目评估流程 - 标准 + //标准合规评估 this.$router.push({ - name: 'xmpgStep1' + name: 'bzpgStep1' }) break case '8': diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 3611a6938..334b7b9c1 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -876,11 +876,11 @@ export default { }) } break - //项目合规评估流程 + //标准合规评估 case '5' : - if(row.taskInfo === '标准法规部业务经理审批'){ + if(row.taskInfo === '审核(标准法规业务经理)'){ this.$router.push({ - name: 'xmpgStep2', + name: 'bzpgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -889,9 +889,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '标准评估任务下发'){ + }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){ this.$router.push({ - name: 'xmpgStep3', + name: 'bzpgStep3', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/router/index.js b/src/router/index.js index b12ff7caa..5c112b253 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -520,6 +520,33 @@ const routes = [ title: '重点认证标准/政策合规性项目审查流程' } }, + { + path: '/bzpgStep1', + name: 'bzpgStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step1.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/bzpgStep2', + name: 'bzpgStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step2.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/bzpgStep3', + name: 'bzpgStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step3.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, { path: '/xmpgStep1', name: 'xmpgStep1',