From bf110dfc6b55a3ed9f2443821cc45ca2c28ca155 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 11:02:43 +0800 Subject: [PATCH 01/52] =?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/52] 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/52] 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/52] =?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 f15dca9f3c4dcc5fca8113ae8871feeac8b3c463 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 22 Jul 2021 15:15:27 +0800 Subject: [PATCH 05/52] =?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 06/52] =?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 07/52] =?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 09/52] =?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 10/52] =?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 @@ - - - - - - - - - - - - - - - + - - - {{'手动查找'}} + + + + + + + + + + + + + + + + + From 9507b5157ac3dd2b3c50e76a15a4e1cc6344c71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 22 Jul 2021 21:10:42 +0800 Subject: [PATCH 11/52] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step3.vue | 35 -- .../pages/creatProcess/xmpg2/step3.vue | 182 ++++--- .../pages/creatProcess/xmpg2/step4.vue | 457 +++++++++++++++++- .../pages/creatProcess/xmpg2/step5.vue | 456 ++++++++++++++++- .../tabComponents/processCenter/index.vue | 44 ++ 5 files changed, 1058 insertions(+), 116 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 22b171a3f..5965a188a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -124,45 +124,10 @@ {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
@@ -34,10 +34,18 @@ clearable > + + + - + + + @@ -77,75 +89,14 @@ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }} - - - - - - - - - - - - - -
-
- - -
- - -
- - -
@@ -215,15 +166,22 @@
+ + @@ -248,16 +206,34 @@ export default { processType: 1, isSubmit: false, saveLoading: false, + showColumn: true, + drawerTitle: "", //drawer标题 + modalshowflag: false, // drawer开关 + selectList: [], + treeData: [], // 人员数据 + roleForm: { + jgUser: "" + }, + nodeList: [], + defaultProps: { + children: "children", + label: "name" + }, //表单的数据 listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 + jgUser: "", //架构经理 dataList: [], //项目下的标准数据 breakdownList: [] //标准下的分解单数据 + }, dataList: [], //展示的标准数据 commentText: "", //审批意见 - detailData: [] //流程历史数据 + detailData: [], //流程历史数据 + userId: this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId }; }, methods: { @@ -307,16 +283,71 @@ export default { this.listForm.breakdownList = item.breakdownList; }); }, - //驳回事件 - beforeBack() { + //保存事件 + handleSave() { }, //提交事件 handleSubmit() { - + if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) { + this.$message.warning("请选择架构经理"); + } else { + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + console.log(json); + 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"); + } + }, e => { + }); + } }, + choiceZRR(scope, type, title, id) { + if (scope != null) { + this.dsadadadsada = scope.$index; + } + this.nodeList = []; + this.nodeList.push(id); + this.type = type; + this.drawerTitle = title; + this.modalshowflag = true; + }, + //标准表格选择框改变 + selectStandChange(data) { + this.selectList = data; + }, + 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]; + } + }, + checkedRole(data) { + if (this.type === "jgUser") { + this.listForm.jgUserId = data[0].id; + this.listForm.jgUser = data[0].name; + } + }, + cancleUserInfo() { + this.modalshowflag = false; + } }, - computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; @@ -325,6 +356,7 @@ export default { mounted() { this.processTable(); this.getData(); + this.getTree(); } }; @@ -332,7 +364,7 @@ export default { + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index aadb150b8..21631e4b2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -1,13 +1,463 @@ - + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 1e44638e8..64152b927 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -556,6 +556,50 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '工程经理转办'){ + this.$router.push({ + name: 'xmpg2Step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理任务分发') { + this.$router.push({ + name: 'xmpg2Step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '分发责任人下发') { + this.$router.push({ + name: 'xmpg2Step5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '合规性评估') { + this.$router.push({ + name: 'xmpg2Step6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程 From 8fd10e0b3f719fac5ab5a8918a687b67aa9ddcae Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 09:58:30 +0800 Subject: [PATCH 12/52] commit --- package-lock.json | 200 +++++++++++--------- package.json | 1 + src/pages/config/pages/linkManage/index.vue | 26 ++- 3 files changed, 135 insertions(+), 92 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d1e87236..5af38045b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3619,6 +3619,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4564,6 +4581,94 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.3.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", + "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "optional": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -9208,7 +9313,7 @@ }, "image-size": { "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "dev": true, "optional": true @@ -12300,6 +12405,11 @@ "is-plain-obj": "^1.0.0" } }, + "sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -13517,94 +13627,6 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.3.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", - "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", diff --git a/package.json b/package.json index bdd1937f8..d496afb94 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "jquery": "^3.5.1", "js-base64": "^2.6.2", "moment": "^2.29.1", + "sortablejs": "^1.14.0", "v-charts": "^1.19.0", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index df2ef0f22..d240cc882 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,7 @@ - + @@ -103,6 +103,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 21631e4b2..0158e60ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -51,8 +51,6 @@ row-key= "id" height="70%" border - lazy - :load="load" @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @@ -224,13 +222,6 @@ export default { }; }, methods: { - load(tree, treeNode, resolve) { - setTimeout(() => { - resolve( - this.listForm.children - ) - }, 1000) - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -266,32 +257,50 @@ export default { }, //动态表单读取 getFormFieldList(item) { - this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)); - item.dataList.forEach(item => { - item.hasChildren = true - }) - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; - this.listForm.children = item.breakdownList; - let children = [] - item.breakdownList.forEach( - item=>{ - let aa = { - id:item.id, - standId:'条款号: '+ item.itemsNum, - standName:'条款名称: '+ item.itemsName, + const listForm = JSON.parse(JSON.stringify(item)); + const { breakdownList, dataList } = listForm + listForm.prcNum = this.prcNum; + listForm.prcName = this.prcName; + this.listForm = listForm + listForm["id"] = item.id; + listForm.dataList = item.dataList; + dataList.forEach(stand => { + stand.hasChildren = true + console.log(stand); + const children = [] + breakdownList.forEach(childItem => { + if (stand.standId === childItem.standId) { + const childItemData = { + id: childItem.id, + standId: '条款号: '+ childItem.itemsNum, + standName: '条款名称: '+ childItem.itemsName } - children.push(aa) + children.push(childItemData) } - ) - this.listForm.children = children; - }); + }) + if (children.length) { + stand.children = children + stand.hasChildren = true + } + }) + + // dataList.distributePerson = item.dataList[0].distributePerson; + // listForm.breakdownList = item.breakdownList; + // listForm.children = item.breakdownList; + // let children = [] + // item.breakdownList.forEach( + // item=>{ + // let aa = { + // id:item.id, + // standId:'条款号: '+ item.itemsNum, + // standName:'条款名称: '+ item.itemsName, + // } + // children.push(aa) + // } + // ) + // this.listForm.children = children; + this.dataList = dataList + console.log(this.dataList) }, //保存事件 handleSave() { @@ -377,7 +386,8 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, - mounted() { + async mounted() { + // const res = await xx() this.processTable(); this.getData(); this.getTree(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 60a93e5dc..5ba515f15 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -1,13 +1,586 @@ - + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index ba58aec42..6ab697efe 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,10 +30,11 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出 From 7c8c50ca6c04fed98edf9ace05b24281d6760813 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:09:09 +0800 Subject: [PATCH 18/52] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BC=96=E8=BE=91-=E6=A0=87=E5=87=86=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E9=9C=80=E4=BF=AE=E6=94=B9=E5=8F=AA=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97,=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E7=AC=A6100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/verify/index.js | 9 +++++++++ .../domesticStandardsAndRegulations/index.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/verify/index.js b/src/common/verify/index.js index acb0272ba..2f030082a 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -457,6 +457,15 @@ export default { callback() } }, + // 验证输入数字和英文 + testNumberCode (rule, value, callback) { + let reg = /[0-9\-]/ + if (value !== '' && !value.match(reg)) { + return callback(new Error('只能输入数字')) + } else { + callback() + } + }, validUrl (rule, value, callback) { let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm if (!value.match(reg)) { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index abc7e6b24..732e58cb5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1765,8 +1765,8 @@ export default { ], standYear: [ {required: true, message: '标准年份不能为空', trigger: 'change'}, - {validator: this.verify.testItemCode, trigger: 'change'}, - {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'} + {validator: this.verify.testNumberCode, trigger: 'change'}, + {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} ], standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, From a5175c49675dc489d76a6905545a9b28ecea6045 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 14:17:21 +0800 Subject: [PATCH 19/52] commit --- src/pages/config/pages/linkManage/index.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index d240cc882..9c37984b4 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -8,11 +8,11 @@ @click="addLink" v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" size="mini">新增 - 顺序调整 + + + + + { item.orderBy = index + 1 }) + let arr = [] + this.sortData.forEach(item => { + let json = {} + json.id = item.id + json.orderBy = item.orderBy + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.$message.success('保存成功') + }) } }) }, From eae877d7959c0951b188b4b57605f2b7e0aa6a48 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:19:00 +0800 Subject: [PATCH 20/52] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E5=85=A5=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandards.vue | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 9a5278cba..249090656 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -336,20 +336,28 @@ export default { standNum = item.standSort + ' ' + item.standNumber } // 验证标准号在系统中是否存在 - this.$http.post('lawss/sarTestItem/validateStandNumber', { - standnumber: standNum - }, { - _this: this - }, res => { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.id, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + // this.$http.post('lawss/sarTestItem/validateStandNumber', { + // standnumber: standNum + // }, { + // _this: this + // }, res => { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.id, + // pageType: 'INLAND_STAND' + // } + // }) + // window.open(routeUrl.href, '_blank') + // }) + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: 'INLAND_STAND' + } }) + window.open(routeUrl.href, '_blank') }, getResetLawsNumRow () { this.replacePage = 1 From 74a795eadb5a9407628b0970dd87a3b517a0482d Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:37:48 +0800 Subject: [PATCH 21/52] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/DatePicker.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index 19fbd067e..c5ea683dc 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -11,6 +11,8 @@ :class="{'form-item-disabled': disabled}" > Date: Fri, 23 Jul 2021 14:48:11 +0800 Subject: [PATCH 22/52] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=9A=84=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 60d989f4a..27deb03e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -940,7 +940,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 + 取消 提交
@@ -987,7 +987,7 @@ v-model="standardSearchForm.standType" placeholder="请选择标准来源"> - + From f2551eb8816d7cee60e9592a2a59ae0805926b72 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 15:03:14 +0800 Subject: [PATCH 23/52] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E9=99=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0d47b1ac6..179e7af34 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -47,7 +47,7 @@

{{ sarStandardsInfoEO.standYear || '-' }}

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

-

{{ sarStandardsInfoEO.standNature || '-' }}

+

{{ standMap[sarStandardsInfoEO.standNature] || '-' }}

+

@@ -412,9 +413,16 @@ width="150" > + + {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + + + + - - - - - @@ -179,13 +179,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -195,7 +195,6 @@ icon="icon-separate" >标准分解单

-

@@ -257,11 +256,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -271,13 +272,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 98f2d0e0f..5f0b7ebe2 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3123,7 +3123,7 @@ export default { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id this.personCollect.collectResId = this.collectId - this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, @@ -3204,6 +3204,7 @@ export default { formData.collectMenuId = undefined } formData.standType = 'INLAND' + formData.userId = this.$store.getters.userInfo.userId this.SarExportSearchEo = formData this.loading = true this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { @@ -3250,6 +3251,7 @@ export default { } this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows + this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, @@ -3414,6 +3416,7 @@ export default { this.quoteIdList1 = [] this.replaceStandNumForm.quoteIdList = '' } + this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) @@ -3650,6 +3653,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } + this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' From 3a5dd8ed1d8529ea3431d9001d64ec63e845279a Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 14:26:45 +0800 Subject: [PATCH 42/52] =?UTF-8?q?bug:=E5=9B=BD=E5=86=85/=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=B7=A6=E4=BE=A7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=A0=91=E4=B8=8A=E6=96=B9=E9=9C=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 ++++++++++++++++ .../foreignStandardsAndRegulations/index.vue | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f0b7ebe2..cec1fc816 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1286,6 +1291,7 @@ export default { }, data () { return { + filterText: '', // 国内法规过滤 props: { label: 'menuName', children: 'children' @@ -1943,7 +1949,17 @@ export default { textStatusMap: {} // 文本状态id与name对应 } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, methods: { + // 国内标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index b394854ef..d7acd19ee 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1741,14 +1746,23 @@ export default { displayLocation: [], orgData: [], delLoading: false, - standState: '' + standState: '', + filterText: '' } }, props: { }, watch: { + filterText(val) { + this.$refs.tree.filter(val); + } }, methods: { + // 海外标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR2 (type, title, id) { this.drawerTitle = title this.modalShowFlag2 = true From 2990241a64df8a9b314206b5978f796f3a520814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:23:00 +0800 Subject: [PATCH 43/52] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=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/bzqdfb/step1.vue | 16 +-- .../pages/creatProcess/bzqdfb/step2.vue | 135 +++++++++++++----- .../pages/creatProcess/bzqdfb/step4.vue | 92 +++++++----- .../pages/creatProcess/xmpg/step1.vue | 12 +- .../pages/details.vue | 6 +- 5 files changed, 172 insertions(+), 89 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 7bd76fbbd..78beff3a1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -800,7 +800,6 @@ export default { listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 fileId: "", model: "", // 上传模板 @@ -1097,8 +1096,7 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); - // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id - // this.$message.success('上传成功') + this.$message.success('上传成功') } else { this.$message.error(res.message); fileList.pop(); @@ -1110,7 +1108,6 @@ export default { var index1 = filename.lastIndexOf("."); var index2 = filename.length; var fileSuffix = filename.substring(index1, index2); - // const fileSuffix = file.name.split('.')[1] // 后缀名 //把后缀转大写 if (fileSuffix !== undefined && fileSuffix !== null) { fileSuffix = fileSuffix.toUpperCase(); @@ -1260,16 +1257,17 @@ export default { } this.listForm.standId = bringData[0].id; this.listForm.listName = bringData[0].detailedListName; - this.listForm.applyRegion = bringData[0].applicationScope; this.listForm.descriptionList = bringData[0].remark; this.listForm.fileId = bringData[0].fileId; this.ListModel = false; - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, { + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", + { id: bringData[0].id, page: this.page, Size:this.pageSize}, { _this: this }, res => { - if (res.data == null) { - res.data = []; - } + console.log(res.data); + // if (res.data == null) { + // res.data = []; + // } this.dataList = res.data; this.listForm.dataList = res.data; let formId = []; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 5ae8b512e..976a14cda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,19 +37,26 @@ clearable > - - - - + +
+

{{ listForm.modelName }} + + +

+
+
+ 暂无数据 +
@@ -70,6 +77,10 @@ prop="code" width="180px" label="标准号"> + { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //保存事件 handleSave() { @@ -356,28 +407,6 @@ export default { }, selectThree() { - }, - // 请求上传的文件信息 - getFileInfo() { - // this.$http.get("att/attFile/getMultiFileInfos", { - // fileIds: this.sarAccessEO.fileIds - // }, { - // _this: this - // }, res => { - // console.log(res); - // this.$nextTick(() => { - // res.data.map(item => { - // // 赋值要回显的上传文件内容 - // this.fileInfoList.push({ - // name: item.oldFileName, - // uid: item.uid, - // status: item.status, - // id: item.id - // }); - // }); - // }); - // }, e => { - // }); }, pageChange(page) { this.page = page; @@ -397,8 +426,6 @@ export default { mounted() { this.processTable(); this.getData(); - this.getFileInfo(); - // console.log(this.$store.getters.getHandleInfo); } }; @@ -413,6 +440,36 @@ export default { padding: 0 20px 0; } } + .fileClass { + cursor: pointer; + } + .fileClass:hover{ + color: #0c91e5; + } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 41f77d353..eadf18395 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -21,14 +21,6 @@ > - - - - - - - - - - - - - - - - - - - - - + +
+

{{ listForm.modelName }} + + +

+
+
+ 暂无数据 +
+ @@ -251,7 +241,6 @@ listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 enclosure: "", //附件 signFlag: "1", //是否会签 1为会签 2为不会签 @@ -337,6 +326,45 @@ this.listForm.zrUserId = item.zrUserId }) }, + // 请求上传的文件信息 + getFileInfo() { + this.$http.get("att/attFile/getMultiFileInfos", { + fileIds: this.fileIds + }, { + _this: this + }, res => { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //驳回事件 beforeBack() { this.listForm.approvalOpinion = '1' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index bd52ce074..1c6baaad8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -496,17 +496,17 @@ export default { } else if (this.type === "qualityEngineer") { this.roleForm.qualityEngineer = data[0].id; this.roleForm.qualityEngineerName = data[0].name; - this.listForm.qualityEngineer = this.roleForm.qualityEngineer; - this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; + this.listForm.qualityEngineer = data[0].id; + this.listForm.qualityEngineerName = data[0].name; } else if (this.type === "certifiedEngineer") { this.roleForm.certifiedEngineer = data[0].id; this.roleForm.certifiedEngineerName = data[0].name; - this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; - this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; + this.listForm.certifiedEngineer = data[0].id; + this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { this.listForm.distributePerson = data[0].name; - this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id - this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name + this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id + this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.showColumn = false; this.$nextTick(() => { this.showColumn = true diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 6ab697efe..d50c934ca 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,11 +30,11 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出 From 0cfa7167314bd08418262595105467cb596b405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:43:00 +0800 Subject: [PATCH 44/52] =?UTF-8?q?=E8=AF=84=E4=BC=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 307ae7832..7c9ef4c0b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -37,16 +37,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 5965a188a..bd027def8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d3f680706..ca0d504ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 1dc390e5a..7d55dff6f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index c5b0bb69a..eaa28bcd6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 607b70c25..467b93137 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -39,14 +39,14 @@ From cb528250cae04731f2fa1c89bc5eeb5e012dfdc0 Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:30:28 +0800 Subject: [PATCH 45/52] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89=E8=A2=AB=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E6=A0=87=E5=87=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectNew.vue | 14 ++++++++++++++ .../domesticStandardsAndRegulations/index.vue | 1 + 2 files changed, 15 insertions(+) diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 1ac8eb973..b8a892ea0 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -218,6 +218,20 @@ this.isShowSelect = !this.isShowSelect; } }, + // 递归 + getTreeData(data) { + // 循环遍历json数据 + for (let i = 0; i < data.length; i++) { + if (data[i].children.length < 1) { + // children若为空数组，则将children设为undefined + delete data[i].children + } else { + // children若不为空数组，则继续 递归调用 本方法 + this.getTreeData(data[i].children) + } + } + return data + }, // 节点选中状态发生变化时的回调 handleCheckChange () { var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cec1fc816..e34a317ae 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -444,6 +444,7 @@ From 8cfb1430584891f874cc224eb8f0e6978e0ed74e Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:45:53 +0800 Subject: [PATCH 46/52] =?UTF-8?q?bug:=20=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E6=9C=AA=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=EF=BC=8C=20=E5=9C=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e34a317ae..b7a97c8e7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2291,8 +2291,10 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values console.log(this.formFieldList, 'assssssssssss') + console.log(item, 'itemitemitemitem') const formFieldList = this.formFieldList this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答') if(this.sarStandardsInfoEO.standSystem){ this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; } @@ -2303,10 +2305,9 @@ export default { } Object.keys(item.attrInfoMap || {}).forEach((key) => { if (item.attrInfoMap[key]) { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key]) + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) } }) - const dynamicFormField = this.sarStandardsInfoEO this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO['id'] = item.id From 33e84ae2bb51d7ffc666644353b6712342304bba Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sat, 24 Jul 2021 16:54:02 +0800 Subject: [PATCH 47/52] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=87=BA=E7=8E=B0value=E5=8F=98=E4=B8=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 14 ++ .../pages/addEdit.vue | 177 +++++++------- .../pages/details.vue | 79 +------ .../pages/otherAddEit.vue | 214 +++++++++++------ .../pages/projectAddEit.vue | 215 ++++++++++++------ 5 files changed, 422 insertions(+), 277 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index a87c8a3ac..94d623b60 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -24,3 +24,17 @@ export function uploadFileText (data) { params: data }) } +export function dicTypeData (data) { + return axios({ + url: 'api/sys/dictype/getDicTypeListCode', + method: 'get', + params: data + }) +} +export function StandardsInfoPage (data) { + return axios({ + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + method: 'get', + params: data + }) +} diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 69bb4a9e0..9300400fc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,7 +80,7 @@ - +
- - - - - - - + + + +
@@ -403,18 +395,12 @@ align="center" width="180px" label="适用车型"> - - - - - +