From 223c42141f76f3904d6d6d3a17611eece3f85c36 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 22 Jan 2022 20:58:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/DatePickerGroup.vue | 2 +- src/components/treeSelect/treeSelectStand.vue | 308 ++++++++++++++++++ .../pages/creatProcess/bzrk/step1.vue | 207 ++++++------ .../pages/creatProcess/bzrk/step2.vue | 14 + .../pages/creatProcess/bzrk/step3.vue | 16 +- .../pages/creatProcess/bzrk/step4.vue | 67 +++- 6 files changed, 512 insertions(+), 102 deletions(-) create mode 100644 src/components/treeSelect/treeSelectStand.vue 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..0e5e9db88 --- /dev/null +++ b/src/components/treeSelect/treeSelectStand.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 445310332..4748b0395 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 +2266,34 @@ 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 = '' + reson.data.forEach(item=>{ + this.treeCheckedKeys.push(item.menuId) + if (item.menuId.length > 0) { + treeList += ',' + } + treeList = item.menuName + this.treeListName = treeList + }) + } + }) + this.form.treeListId = this.treeCheckedKeys.join(',') + } + }) + }, handleStandardPageChange(page) { this.standardSearchForm.page = page this.handleSearchStandard() @@ -2464,6 +2451,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 +2919,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..7f1d4843d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -143,6 +143,20 @@ clearable > + + + + + + + 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 }, From ba3a0f969833be690524be0ef005ea7cdb726653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 23 Jan 2022 16:59:55 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 1191 +++++++++++++++++ .../pages/creatProcess/bzpg/step2.vue | 462 +++++++ .../pages/creatProcess/bzpg/step3.vue | 13 + .../processCenter/pages/newProcess/index.vue | 4 +- .../tabComponents/newProcess/index.vue | 4 +- src/router/index.js | 27 + 6 files changed, 1697 insertions(+), 4 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step3.vue 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..97ca8a8a8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -0,0 +1,462 @@ + + + + + + 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..bd421b4c4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -0,0 +1,13 @@ + + + + + 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/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', From 6fa409b0275231e49225bf4143230c218e9f9185 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 11:21:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectStand.vue | 2 +- .../pages/creatProcess/bzrk/step1.vue | 13 +- .../pages/creatProcess/bzrk/step2.vue | 2821 +++++++++-------- 3 files changed, 1431 insertions(+), 1405 deletions(-) diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue index 0e5e9db88..79c384bdf 100644 --- a/src/components/treeSelect/treeSelectStand.vue +++ b/src/components/treeSelect/treeSelectStand.vue @@ -167,7 +167,7 @@ export default { methods: { filterNode(value, data) { if (!value) return true; - return data.label.indexOf(value) !== -1; + return data.menuName.indexOf(value) !== -1; }, loadNode(node, resolve) { const that = this; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4748b0395..a07cb7537 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1505,6 +1505,7 @@ export default { fileType: '', countryArr: '', form: { + standId: '', // 基础信息 country: '', textStatus: '', // 文本状态 @@ -2156,6 +2157,7 @@ export default { const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) this.getListTree(bringData) + this.form.standId = bringData.id this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : '' this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : '' this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : '' @@ -2280,17 +2282,20 @@ export default { }, {}, reson => { if (reson.ok) { let treeList = '' + let treeListId = '' reson.data.forEach(item=>{ this.treeCheckedKeys.push(item.menuId) - if (item.menuId.length > 0) { + if (treeList.length > 0) { treeList += ',' + treeListId += ',' } - treeList = item.menuName - this.treeListName = treeList + treeList += item.menuName + treeListId += item.menuId }) + this.form.treeListName = treeList + this.form.treeListId = treeListId } }) - this.form.treeListId = this.treeCheckedKeys.join(',') } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 7f1d4843d..a444b9566 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1,1414 +1,1435 @@ From 96ae51cece1e4b4c91768ced6d4bd7582b5f3d24 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 11:29:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=9C=A8=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E9=A1=B5=E9=9D=A2=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 54 - .../pages/creatProcess/bzrk/step5.vue | 2075 ++++++++--------- 2 files changed, 1036 insertions(+), 1093 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a444b9566..31130d429 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -178,24 +178,6 @@ v-model="form.zccssrq" :disabled="true" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ From ab046bd463e306630f41a2be05fd7cdd352a2a65 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 11:31:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/pages/mechanism.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, From b8af2079f5a232a258f4895ed0fe76061458ce05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 24 Jan 2022 13:23:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step2.vue | 42 +- .../pages/creatProcess/bzpg/step3.vue | 653 +++++++++++++++++- .../tabComponents/processCenter/index.vue | 10 +- 3 files changed, 695 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index 97ca8a8a8..eb3a7428d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -312,11 +312,49 @@ export default { }, //提交 handleSubmit(){ - + this.listForm.commentText = this.commentText + this.listForm.stepFlag = '0' + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, //驳回 beforeBack(){ - + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.commentText = this.commentText + this.listForm.stepFlag = '1' + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, //确认转办 checkedRole (data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index bd421b4c4..9ead05378 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -1,13 +1,660 @@ + - 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,