From bf110dfc6b55a3ed9f2443821cc45ca2c28ca155 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 11:02:43 +0800 Subject: [PATCH 01/11] =?UTF-8?q?bug:=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 9 ++++++--- .../foreignStandardsAndRegulations/index.vue | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index dd246d9a4..6d3099de8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -116,7 +116,7 @@ 导出 @@ -4256,5 +4257,8 @@ export default { border-radius: 0 !important; } } + .classDisplay{ + display: none; + } } From 6ed583b8140581788f71ef670c95ee48139be2dd Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 13:18:03 +0800 Subject: [PATCH 02/11] bug --- .../domesticStandardsAndRegulations/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 6d3099de8..e49258c22 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2698,6 +2698,7 @@ export default { }, // 表格排序 sortChange (sortObj) { + debugger if (sortObj.column.order !== 'normal') { switch (sortObj.column.property) { case 'issueTime' : @@ -3109,6 +3110,7 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable (item) { + debugger if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } From 56e99637df44dbd4e3cf977a38394d7e5d98db1a Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 14:22:09 +0800 Subject: [PATCH 03/11] bug --- src/components/navMenu/index.vue | 2 +- .../domesticStandardsAndRegulations/index.vue | 64 +++++++++++++++---- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index bbdbd002c..51a708a74 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -303,7 +303,7 @@ export default { { title: '菜单管理', path: '/menuManage', - menuId: '82665e94d406c6fc0d1f627e5880230b' + menuId: '87b8b4f5817a7829696e63185c744d52' }, { title: '链接管理', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e49258c22..c1a4705e5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1915,7 +1915,9 @@ export default { synopsis: '', // replaceStandNumCope: '', replacedStandNum: '', - orderBy:'' + orderBy:'', + nowOrder: '', + nowOrderBy: '', }, // 分页查询过程中用到的对象 configStandList: [], configStandtotal: 0, @@ -1931,6 +1933,8 @@ export default { delLoading: false, standState: '', orderBy :'', + nowOrder: '', + nowOrderBy: '', textStatusMap: {} // 文本状态id与name对应 } }, @@ -2698,17 +2702,37 @@ export default { }, // 表格排序 sortChange (sortObj) { + console.log(sortObj, '升降序') debugger if (sortObj.column.order !== 'normal') { - switch (sortObj.column.property) { + switch (sortObj.prop) { case 'issueTime' : // 后台联调 - this.orderBy = 'issueTime ' + sortObj.order - break + this.nowOrderBy = '1' + break; + case 'xcxssrq' : + // 后台联调 + this.nowOrderBy = '2' + break; + case 'zccssrq' : + // 后台联调 + this.nowOrderBy = '3' + break; + case 'textStatus' : + // 后台联调 + this.nowOrderBy = '4' + break; + } + switch (sortObj.order) { + case 'ascending' : + this.nowOrder = '2' + break; + case 'descending' : + this.nowOrder = '1' + break; } } this.getDomesticStandardTable(this.tableFlag) - }, // 修改成表格样式后，选择项勾选改变 standSelectChange (data) { @@ -3128,7 +3152,9 @@ export default { } // 排序 - formData.orderBy = this.orderBy + formData.nowOrder = this.nowOrder + formData.nowOrderBy = this.nowOrderBy + // formData.orderBy = this.orderBy // 处理我的收藏和个性化标签传参 if (this.selectSarMenu.id === 'wdsc') { formData.menuId = undefined @@ -3831,12 +3857,28 @@ export default { switch (sortObj.prop) { case 'issueTime' : // 后台联调 - this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order - break - case 'XCXSSRQ' : + this.sarConfigStandSearch.nowOrderBy = '1' + break; + case 'xcxssrq' : // 后台联调 - this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order - break + this.sarConfigStandSearch.nowOrderBy = '2' + break; + case 'zccssrq' : + // 后台联调 + this.sarConfigStandSearch.nowOrderBy = '3' + break; + case 'textStatus' : + // 后台联调 + this.sarConfigStandSearch.nowOrderBy = '4' + break; + } + switch (sortObj.order) { + case 'ascending' : + this.sarConfigStandSearch.nowOrder = '2' + break; + case 'descending' : + this.sarConfigStandSearch.nowOrder = '1' + break; } } this.selectConfiguraStand() From e2fdbccd0b13e7fd1efd9a8b9ea6de6d1c3502dc Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 14:37:11 +0800 Subject: [PATCH 04/11] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/postManage/index.vue | 2 +- .../domesticStandardsAndRegulations/index.vue | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 0f19d2965..e3853293a 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -45,7 +45,7 @@ width="170px"> diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index c1a4705e5..7419e3753 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2703,7 +2703,6 @@ export default { // 表格排序 sortChange (sortObj) { console.log(sortObj, '升降序') - debugger if (sortObj.column.order !== 'normal') { switch (sortObj.prop) { case 'issueTime' : @@ -3134,7 +3133,6 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable (item) { - debugger if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } From 56194ba300e52a77f128f3f1a14237561cc7e179 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 22 Jul 2021 15:12:20 +0800 Subject: [PATCH 05/11] feat: 1111111111111111111111111 --- .../pages/creatProcess/bzrk/step1.vue | 566 ++++++++++-------- 1 file changed, 330 insertions(+), 236 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 8adf3eb0d..2c9309d46 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -17,7 +17,7 @@ class="label-input-form" label-width="210px" > -
+
@@ -122,12 +122,17 @@ - + + :nodeKey="nodeKey" @popoverHide="popoverHide"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> - + + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - - - + + + @@ -655,13 +678,13 @@ - - - - - - - + + + + + + + - - - {{'手动查找'}} - - - - - + - - + + @@ -716,67 +718,88 @@ - + - - - - - - - + + + + + + {{'手动查找'}} + + + + + + + +
-
-
+
+
- - - -

流程发起人

-
- -
- - - - - - -

会签责任人

-
- -
- - - - - - -

修订申请人

-
- -
- - - - - - -

标准法规业务经理

-
- -
- - - + + + +

流程发起人

+
+ +
+ + + + + + +

会签责任人

+
+ +
+ + + + + + +

修订申请人

+
+ +
+ + + + + + +

标准法规业务经理

+
+ +
+ + +
@@ -1104,15 +1127,23 @@ 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, - loadSarStandard: false, - verifySarStandard: false, - standardSearchForm: { + standardDrawer: false, + loadSarStandard: false, + verifySarStandard: false, + standardSearchForm: { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, @@ -1133,9 +1164,9 @@ }, selectedList: [], standardCheckedList: [], - activeName:'1', - roleRow: {}, - commentText: '', // 意见 + activeName:'1', + roleRow: {}, + commentText: '', // 意见 title: '', // 新增编辑抽屉标题 config: { attrName : '', @@ -1191,6 +1222,12 @@ 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: [], @@ -1248,15 +1285,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1330,7 +1367,9 @@ standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 + busVppsChildOptions: [], // 车系体系架构子集合 modelOptions: [], // 模块体系架构 + modelChildOptions: [], // 模块体系架构子集合 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 @@ -1398,84 +1437,78 @@ }, }, }, - components: { - ProcessHeader, - ProcessFooter, - ProcessTitle, - TreeSelect - }, methods: { clearFormData(data){ this.form = { // 基础信息 textStatus: '', // 文本状态 - standYear: '', // 标准年份 - standInData: data.standInData ? data.standInData : '0', // 标准类型 - standSort: data.standSort ? data.standSort : '', // 标准类别 - standNumber: data.standNumber ? data.standNumber : '', // 标准编号 - standNature: data.standNature ? data.standNature : '', // 标准性质 - standEnName: data.standEnName ? data.standEnName : '', // 英文名称 - standName: data.standName ? data.standName : '', // 中文名称 - signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 - issueTime: '', // 发布时间 - isRelateAccess: '', // 是否纳入认证清单 - standSystem: '',// 标准体系 - standSystemName: '',// 标准体系名称 - gxhbq: '', // 标签 - // 实施日期 - ssrq: '', // 实施日期(标准文本) - xcxssrq: '', // 新车型实施日期(标准文本) - zccssrq: '', // 在产车实施日期(标准文本) - ssrqgj: '', // 实施日期(国际) - xcxssrqgj: '', // 新车型实施日期(国际) - zccssrqgj: '', // 在产车实施日期(国际) - // 文本信息 - ca: '', // 草案 - fbgbjbd: '', // 发布稿 - xgd: '', // 修改单 - bpg: '', // 报批稿 - ssg: '', // 送审稿 - zqyjg: '', // 征求意见稿 - jdwj: '', // 解读文件 - zbjbd: '', // 增补件 - kwj: '', // 勘误件 - caName: '', // 草案 - fbgbjbdName: '', // 发布稿 - xgdName: '', // 修改单 - bpgName: '', // 报批稿 - ssgName: '', // 送审稿 - zqyjgName: '', // 征求意见稿 - jdwjName: '', // 解读文件 - zbjbdName: '', // 增补件 - kwjName: '', // 勘误件 - glwjName: '', // 关联文件 - // 适用范围 - txlb: '', // 体系类别 - gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 - cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 - cycvppsbm: '', // 关联模块--乘用车VPPS编码 - cycvppscn: '', // 关联模块--乘用车vpps中文名称 - kccvppsbm: '', // 关联模块--卡车VPPS编码 - kccvppscn: '', // 关联模块--卡车vpps中文名称 - dybxh: '', // 模块结构单元变型号 - dymc: '', // 模块结构单元名称 - // 关联信息 - dtbjh: '', // 代替标准号 - cbbh: '', // 采标编号 - cbcd: '', // 采标程度 - yybj: '', // 引用标准 - byybj: '', // 被引用标准 - glwj: '', // 关联文件 - xglc: '', // 相关流程 - chjl: '', // 参会记录 + standYear: '', // 标准年份 + standInData: data.standInData ? data.standInData : '0', // 标准类型 + standSort: data.standSort ? data.standSort : '', // 标准类别 + standNumber: data.standNumber ? data.standNumber : '', // 标准编号 + standNature: data.standNature ? data.standNature : '', // 标准性质 + standEnName: data.standEnName ? data.standEnName : '', // 英文名称 + standName: data.standName ? data.standName : '', // 中文名称 + signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + issueTime: '', // 发布时间 + isRelateAccess: '', // 是否纳入认证清单 + standSystem: '',// 标准体系 + standSystemName: '',// 标准体系名称 + gxhbq: '', // 标签 + // 实施日期 + ssrq: '', // 实施日期(标准文本) + xcxssrq: '', // 新车型实施日期(标准文本) + zccssrq: '', // 在产车实施日期(标准文本) + ssrqgj: '', // 实施日期(国际) + xcxssrqgj: '', // 新车型实施日期(国际) + zccssrqgj: '', // 在产车实施日期(国际) + // 文本信息 + ca: '', // 草案 + fbgbjbd: '', // 发布稿 + xgd: '', // 修改单 + bpg: '', // 报批稿 + ssg: '', // 送审稿 + zqyjg: '', // 征求意见稿 + jdwj: '', // 解读文件 + zbjbd: '', // 增补件 + kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 + // 适用范围 + txlb: '', // 体系类别 + gkdw: '', // 归口管理部门 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 + cysd: '', // 我司参与深度 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 + cycvppsbm: '', // 关联模块--乘用车VPPS编码 + cycvppscn: '', // 关联模块--乘用车vpps中文名称 + kccvppsbm: '', // 关联模块--卡车VPPS编码 + kccvppscn: '', // 关联模块--卡车vpps中文名称 + dybxh: '', // 模块结构单元变型号 + dymc: '', // 模块结构单元名称 + // 关联信息 + dtbjh: '', // 代替标准号 + cbbh: '', // 采标编号 + cbcd: '', // 采标程度 + yybj: '', // 引用标准 + byybj: '', // 被引用标准 + glwj: '', // 关联文件 + xglc: '', // 相关流程 + chjl: '', // 参会记录 } // 标准信息 }, handleProcessStandardNext(status) { @@ -1628,7 +1661,6 @@ this.zrUserIds.push(data) } - console.log(this.zrUserIds) }else { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); if(getlist.length == 1) { @@ -1646,6 +1678,38 @@ 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 @@ -1889,29 +1953,51 @@ this.fileMadel = true this.fileType = type; }, - popoverHide (checkedIds, checkedData) { + popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - this.form.standSystem = checkedData.id - this.form.standSystemName = checkedData.menuName + if(checkedData.length > 0){ + this.form.standSystem = checkedData.map(item => item.menuName).join(",") + }else { + this.form.standSystem = checkedData.menuName + } } + this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData) { - if(checkedData){ - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName + 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 + } } + this.modalShowFlag2 = false }, - popoverHideCarVs (checkedIds, checkedData) { - if(checkedData){ - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName + 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 + } } + this.modalShowFlag3 = false }, - popoverHideModel (checkedIds, checkedData) { - if(checkedData){ - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name + 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 + } } + this.modalShowFlag4 = false }, closeDrawer() { this.ListModel = false @@ -1930,31 +2016,31 @@ handleTabs(name) { this.active = name }, - //保存 + //保存 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.uName) - _formData.append('prcType', this.$route.query.type) - _formData.append('json', JSON.stringify({ - prcForm: this.prcForm, - sarAccessInfoList: this.sarAccessInfoList, - sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - bzqdForm: this.bzqdForm, - listInfo: this.listInfo, - id: this.id - })) - saveTaskFirst(_formData).then(res => { - this.saveLoading = false - this.$message.success('保存成功') - // 流程保存之后，应该流转至草稿页面 - this.$router.push({path:'/processCenter?tabsName=TaskDraft'}) - // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false - }) + 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.uName) + _formData.append('prcType', this.$route.query.type) + _formData.append('json', JSON.stringify({ + prcForm: this.prcForm, + sarAccessInfoList: this.sarAccessInfoList, + sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, + bzqdForm: this.bzqdForm, + listInfo: this.listInfo, + id: this.id + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + // 流程保存之后，应该流转至草稿页面 + this.$router.push({path:'/processCenter?tabsName=TaskDraft'}) + // this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, handleSubmit() { this.$refs['form'].validate((valid) => { @@ -1983,7 +2069,7 @@ if (res.success) { this.$message.success(res.message) this.isSubmit = false - // 流程提交之后，应该流转至待办任务页面 + // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } }) @@ -1993,7 +2079,7 @@ this.$message.warning('请检查人员信息表单是否填写完整') } }) - } else { + } else { this.$message.warning('请检查基础信息表单是否填写完整') } }) @@ -2006,6 +2092,14 @@ 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 From f15dca9f3c4dcc5fca8113ae8871feeac8b3c463 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 22 Jul 2021 15:15:27 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20=E9=80=82=E7=94=A8=E8=8C=83=E5=9B=B4=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 2618e5787..b2c1d7cd9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -39,27 +39,27 @@ clearable > - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + Date: Thu, 22 Jul 2021 15:17:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E9=80=82=E7=94=A8=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step2.vue | 20 +++++++++---------- .../pages/creatProcess/bzqdfb/step3.vue | 18 ++++++++--------- .../pages/creatProcess/bzqdfb/step4.vue | 20 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 8a50ed5d3..7ca0d53c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,14 +37,14 @@ clearable > - - - + + + + + + + + - - - + + + + + + + - - - + + + + + + + + Date: Thu, 22 Jul 2021 16:10:52 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E9=AB=98=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 129 ++++++++++-- .../pages/details.vue | 198 ++++++++++++++++-- 2 files changed, 288 insertions(+), 39 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 712ae4209..78f468019 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -28,24 +28,6 @@ -

清空 - + + + 高级查询 + + 高级查询 @@ -171,6 +157,58 @@ +
+ + + + + + + + + + + + + + + + + + + + + +
+ - + {{ editRowData.standSortShow }} {{ editRowData.standNumber }} @@ -656,6 +700,7 @@ export default { // } return { textStatusMap: {}, + countryAreaMap: {}, typeApplicableMap: {}, nylxMap: {}, zrbmMap: {}, @@ -712,6 +757,7 @@ export default { disabledFlag: false, regionOptions: [], // 基础信息 区域list drawerCountryOptions: [], // 基础信息 国家list + textStatusOptions: [], // 文本状态 applyOptions: [], //基础信息适用领域list applyArcticOptions: [], // 基础车型 适用车型list energyKindOptions: [], // 能源种类list @@ -733,6 +779,9 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 + issueTime: '', + standName: '', + textStatus: '', // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 @@ -746,6 +795,7 @@ export default { }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 + showSelectBox: true, // 显示高级查询 状态 sarAccessInfoSearchList: [], // 数据搜索 table列表数据 importmodalFlag: false, // 导入model 状态 searching: false, @@ -959,6 +1009,15 @@ export default { methods: { // 高级检索 selectMoreBtn () { + this.showSelectBox = !this.showSelectBox + this.showTableFlag = false + if (!this.showSelectBox) { + this.sarAccessInfoSearch.standName = '' + this.sarAccessInfoSearch.issueTime = '' + this.sarAccessInfoSearch.textStatus = '' + this.sarAccessInfoSearch.modifyTime = '' + } + this.selectLawsStands() }, // 法规维护人树 getDept () { @@ -1062,6 +1121,9 @@ export default { this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 + this.sarAccessInfoSearch.standName = '' + this.sarAccessInfoSearch.putTime = '' + this.sarAccessInfoSearch.textStatus = '' this.isListType = false this.selectLawsStands() }, @@ -1346,12 +1408,31 @@ export default { this.$refs['sarAccessForm'].validate((valid) => { if (valid) { let rowlist = [] + let rowlist1 = [] + let rowlist2 = [] + let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) + if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) { + rowlist1.push(this.sarAccessInfoList[i].putTime) + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + }else { + rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) + } } + console.log(rowlist2) rowlist = rowlist.join(',') + rowlist1 = rowlist1.join(',') + rowlist2 = rowlist2.join(',') + rowlist3 = rowlist3.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) sarAccessEO.inforlist = JSON.stringify(rowlist) + sarAccessEO.inforlist1 = JSON.stringify(rowlist1) + sarAccessEO.inforlist2 = JSON.stringify(rowlist2) + sarAccessEO.inforlist3 = JSON.stringify(rowlist3) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 @@ -1418,7 +1499,6 @@ export default { this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) - console.log(this.sarAccessInfoSearchList) }, e => { }) }, @@ -1883,6 +1963,7 @@ export default { // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { + this.$set(this.countryAreaMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label) this.$set(this.typeApplicableMap, item.value, item.label) this.$set(this.nylxMap, item.value, item.label) @@ -1934,6 +2015,7 @@ export default { this.setMap(this.categoryOptions) this.setMap(this.sycpxOptions) this.setMap(this.energyKindOptions) + this.setMap(this.drawerCountryOptions) this.getGzzOption() }, e => { }) @@ -1992,6 +2074,9 @@ export default { } } } + .showSelectBox { + padding: 10px; + } .data-search{ .standards-drawer-table-one{ position: relative; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 2321c4cb7..85c83657c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -4,8 +4,12 @@
-
{{ sarAccessEO.detailedListName }}
+
+ {{ sarAccessEO.detailedListName }} + + +
@@ -88,12 +92,136 @@ icon="export" >导出 - 高级查询 + + + 高级查询 + + + + 高级查询 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -142,7 +270,10 @@ width="180px" label="适用车型"> - @@ -280,11 +423,12 @@ From 21df4a1f268de74740db4611f844e79bc9897aea Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 22 Jul 2021 17:27:46 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8D=A2=E4=B8=BA=E5=85=AC=E5=85=B1=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 59 +++---------------- .../pages/creatProcess/wfhxzg/step2.vue | 57 +++--------------- .../pages/creatProcess/wfhxzg/step3.vue | 56 +++--------------- 3 files changed, 27 insertions(+), 145 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 9c9831194..4cea23209 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -192,32 +192,13 @@ @submit="handleSubmit" > - - - - - +
@@ -308,7 +289,6 @@ export default { ProcessTitle }, mounted () { - this.getTree() this.getJsonData() }, methods: { @@ -418,13 +398,6 @@ export default { } } }, - // 获取流程节点数据 - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - console.log(res.data) - }) - }, // 流程阶段负责人选择 choiceZRR (type, title, id) { this.nodeList = [] @@ -434,22 +407,8 @@ export default { this.modalshowflag = true }, drawerCheck (data) { - let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { + this.roleForm.dockUserName = data[0].id + this.roleForm.dockUserName = data[0].name this.modalshowflag = false }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 1a273dd00..25ec3cc3e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -142,32 +142,13 @@ @submit="handleSubmit" > - - - - - + @@ -330,24 +311,8 @@ export default { this.drawerTitle = title this.modalshowflag = true }, - // 获取流程节点数据 - getTree () { - roleTreeData().then(res => { - this.treeData = res.data - this.dutyUserCaseData = res.data - }) - }, drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length !== 0) { - this.roleRow = getlist - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes() - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { + this.roleRow = data // 选取负责人时的操作 this.multipleSelection.forEach(item => { item.dutyPeopleInfo = this.roleRow[0].name @@ -356,11 +321,7 @@ export default { this.lastDataList = this.dataList this.$refs.multipleTable.clearSelection(); // 选取流程信息完成 - this.roleForm.dutyUserInfoName = this.roleRow.name - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { + this.roleForm.dutyUserInfoName = this.roleRow[0].name this.modalshowflag = false }, //查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index a925e4f10..599337f8c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -137,32 +137,13 @@ @submit="handleSubmit" > - - - - - + @@ -309,34 +290,15 @@ export default { }) }, - // 获取流程节点数据 - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { + this.roleForm = data[0] // 选择责任人时input框内值 this.newDataList.dutyPeople = this.roleRow.name this.newDataList.dutyPeopleId = this.roleRow.id this.lastDataList = this.dataList - console.log(this.dataList) - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { this.modalshowflag = false }, + //查询按钮 getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 this.realList = this.dataList.filter(item => { From a3aaf9aaa781242f5b470318711e2413f809e902 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 17:36:58 +0800 Subject: [PATCH 11/11] =?UTF-8?q?bug=EF=BC=9A=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=8A=8A=E8=A2=AB=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 2c9309d46..60d989f4a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -707,31 +707,10 @@ - - - - - - - - - - - - - - - + - - - {{'手动查找'}} + + + + + + + + + + + + + + + + +