From 0a9ac5b38f84213d90f9fdf47725d9bf98807bd9 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 09:17:35 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052557=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E5=8E=BB=E6=8E=89=E6=97=A5=E6=9C=9F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 6d071e387..ed432e8f9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -162,7 +162,6 @@ @@ -170,14 +169,12 @@ From 2c6b0f2058215b4890767f693c0d07367c1fcd7e Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 09:53:34 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052550=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B8=85=E5=8D=95--=E7=82=B9=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=A1=86?= =?UTF-8?q?=E4=BC=9A=E8=A2=AB=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 3f7d46e0b..581bdbf51 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -801,6 +801,7 @@ export default { orgTableValName: "", // 高级检索 isAdvancedSearch: false, + isAdvancedSearchFlag: false, targetMarketOptions: {}, twoOptions: [ { @@ -1206,7 +1207,7 @@ export default { getLocalProductTableBtn() { this.page = 1 this.projectLibrarySearch.page = 1; - this.isAdvancedSearch = true; + this.isAdvancedSearchFlag = true; this.getLocalProductTable(); }, // 查询本地产品 @@ -1418,7 +1419,7 @@ export default { // 分页点击后方法 pageChange(page) { this.page = page; - if (this.isAdvancedSearch === true) { + if (this.isAdvancedSearchFlag === true) { this.getLocalProductTable() } else { this.getLocalProductTables() @@ -1427,7 +1428,7 @@ export default { // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.pageSize = pageSize; - if (this.isAdvancedSearch === true) { + if (this.isAdvancedSearchFlag === true) { this.getLocalProductTable() } else { this.getLocalProductTables() From 3e35778991b99f43a46fc3008734bfb0541fa5ee Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 09:59:47 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052549=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E7=BF=BB?= =?UTF-8?q?=E9=A1=B5=E4=B9=8B=E5=90=8E=E7=9A=84=E9=A1=B5=E7=A0=81=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=98=BE=E7=A4=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listOfCountries.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 5f82860d2..30d9299cf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -32,7 +32,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="searchSarAccess"> + @click="searchSarAccessPage1"> 查询 @@ -263,8 +263,8 @@ export default { searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { sortKey: 1, - page: 1, - pageSize: 10, + page: this.sarSarAccessEOSearch.page, + pageSize: this.sarSarAccessEOSearch.pageSize, ...this.sarSarAccessEOSearch }, { _this: this @@ -286,7 +286,7 @@ export default { }); this.tableLoading = false; this.sarAccessListDatas = arr; - this.sarSarAccessEOSearch.page = 1; + // this.sarSarAccessEOSearch.page = 1; this.sarAccessListTotal = res.data.total; }, e => { @@ -300,6 +300,10 @@ export default { this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent; this.searchSarAccess(); }, + searchSarAccessPage1() { + this.sarSarAccessEOSearch.page = 1 + this.searchSarAccess(); + }, clearSearch() { this.sarSarAccessEOSearch.countryArea = ""; this.sarSarAccessEOSearch.detailedListName = ""; From 3f3d067ff23abb7bef3433f2826168e295c738b8 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 10:46:58 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052235=20=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E5=BA=93=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E7=A0=81=EF=BC=8C=E4=BC=9A=E6=8A=8A=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=A0=87=E5=87=86=E5=BA=93=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=88?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=E4=B9=9F=E8=BF=99?= =?UTF-8?q?=E6=A0=B7=E3=80=81=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E8=BF=99?= =?UTF-8?q?=E6=A0=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 3f6d1ab06..29a2cad08 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -748,6 +748,7 @@ export default { }, data() { return { + seniorQueryFlag: false, textStatusMap: {}, countryAreaMap: {}, // 编辑抽屉状态 @@ -1036,7 +1037,9 @@ export default { // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null }*/ this.sarAccessInfo = formData + this.sarAccessInfo.page = 1 this.showQueryMore = false + this.seniorQueryFlag = true this.selectLawsStands(1) }, @@ -1100,6 +1103,7 @@ export default { }, // 点数据搜索 查询按钮 事件 searchLawsStands() { + this.seniorQueryFlag = false this.showTableFlag = false this.sarAccessInfo.page = 1 this.selectLawsStands() @@ -1640,12 +1644,21 @@ export default { drawerPageChange(page) { this.drawerPage = page this.sarAccessInfo.page = this.drawerPage - this.selectLawsStands() + if (this.seniorQueryFlag) { + this.selectLawsStands(1) + } else { + this.selectLawsStands() + } + }, // 数据搜索table分页条数改变回调 drawerPageSizeChange() { this.sarAccessInfo.pageSize = this.$store.getters.userInfo.configContent - this.selectLawsStands() + if (this.seniorQueryFlag) { + this.selectLawsStands(1) + } else { + this.selectLawsStands() + } }, // 点击 导出、全部导出按钮事件 exportAccessInfo(type) { From 30dbe491edf7f2871fad728b5976393af7da54b6 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 10:55:15 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052536=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=8B=86=E5=88=86-=E6=8B=86=E5=88=86-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9D=A1/=E9=A1=B5?= =?UTF-8?q?=E4=B8=BA20=E6=9D=A1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=9C=AC=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=8F=AA=E8=83=BD=E5=88=A0=E9=99=A420=E6=9D=A1=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=88=A0=E9=99=A4=E7=9A=84=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=98=AF=E4=B9=B1=E7=9A=84=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B9=8B?= =?UTF-8?q?=E5=89=8D247=E6=9D=A1=E6=95=B0=E6=8D=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=20180=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index b940e3705..96974ace8 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1508,8 +1508,8 @@ export default { }, res => { if (res.data) { this.batchDeleteItem() - } else if(this.selectedList != null && this.selectedList.length > 20){ - this.$message.warning('单次最多删除20个条款') + } else if(this.selectedList != null){ + this.$message.warning('请选择要删除的数据') } else { this.deleteItemsModal = true } From 0e2af584cc75c429dad6933ef9f91377c696bc40 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 13:48:55 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login/index.js | 11 +++ src/pages/login/checkPage.vue | 137 ++++++++++++++++++++++++++++++++++ src/pages/login/index.vue | 90 +++++++++++----------- src/router/index.js | 11 +++ 4 files changed, 204 insertions(+), 45 deletions(-) create mode 100644 src/api/login/index.js create mode 100644 src/pages/login/checkPage.vue diff --git a/src/api/login/index.js b/src/api/login/index.js new file mode 100644 index 000000000..3e37d9721 --- /dev/null +++ b/src/api/login/index.js @@ -0,0 +1,11 @@ +import axios from '@/common/axiosV2' + +// 流程发起 +export function checkPage(params) { + return axios({ + url: '/api/checkPage', + method: 'get', + params + }) +} + diff --git a/src/pages/login/checkPage.vue b/src/pages/login/checkPage.vue new file mode 100644 index 000000000..33a1ca44d --- /dev/null +++ b/src/pages/login/checkPage.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 75c737f81..062f1ac58 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -148,53 +148,53 @@ }) }, loginNew (res) { - if (res.data.orgId === null || res.data.orgId === '') { - this.$message.warning('未分配组织机构,请联系管理员分配后重新登录') - return + if (res.data.orgId === null || res.data.orgId === '') { + this.$message.warning('未分配组织机构,请联系管理员分配后重新登录') + return + } + let Base64 = require('js-base64').Base64 + let userInfoStr = Base64.decode(res.data) + let userInfo2 = decodeURIComponent(userInfoStr) + let userInfoObj = JSON.parse(userInfo2) + userInfoObj.userId = userInfoObj.usid + window.sessionStorage.setItem('userInfoObj', userInfoObj); // del + this.setToken(userInfoObj.token) // vuex存储token + let userInfo = {} + for (let key in userInfoObj) { + if (key !== 'uname') { + userInfo[key] = userInfoObj[key] + } else { + userInfo.uName = userInfoObj[key] + } + } + this.setUserInfo(JSON.stringify((userInfo))) + // this.resetTime() + // 获取用户菜单 + window.sessionStorage.setItem('userInfo', userInfo); // del + this.getMenu().then((menuList) => { + let hasHomeMenu = false + menuList.map((menuItem) => { + if (menuItem.id === 'asdfadf') { + hasHomeMenu = true } - let Base64 = require('js-base64').Base64 - let userInfoStr = Base64.decode(res.data) - let userInfo2 = decodeURIComponent(userInfoStr) - let userInfoObj = JSON.parse(userInfo2) - userInfoObj.userId = userInfoObj.usid - window.sessionStorage.setItem('userInfoObj', userInfoObj); // del - this.setToken(userInfoObj.token) // vuex存储token - let userInfo = {} - for (let key in userInfoObj) { - if (key !== 'uname') { - userInfo[key] = userInfoObj[key] - } else { - userInfo.uName = userInfoObj[key] - } - } - this.setUserInfo(JSON.stringify((userInfo))) - // this.resetTime() - // 获取用户菜单 - window.sessionStorage.setItem('userInfo', userInfo); // del - this.getMenu().then((menuList) => { - let hasHomeMenu = false - menuList.map((menuItem) => { - if (menuItem.id === 'asdfadf') { - hasHomeMenu = true - } - }) - window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del - window.sessionStorage.setItem('menuList', menuList); // del - if (hasHomeMenu) { - this.setMenu(JSON.stringify(menuList)).then(res => { - if (this.showIETips) {//判断是否IE浏览器 - alert('为了最佳显示效果 请使用google chrome') - } - this.$router.push('/home2') - }, e => { - this.$message.warning('未获取到菜单') - }) - } else { - alert('无系统权限') - // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'; - } + }) + window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del + window.sessionStorage.setItem('menuList', menuList); // del + if (hasHomeMenu) { + this.setMenu(JSON.stringify(menuList)).then(res => { + if (this.showIETips) {//判断是否IE浏览器 + alert('为了最佳显示效果 请使用google chrome') + } + this.$router.push('/home2') + }, e => { + this.$message.warning('未获取到菜单') }) - }, + } else { + alert('无系统权限') + // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'; + } + }) + }, ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']), ...mapActions(['setMenu']) }, diff --git a/src/router/index.js b/src/router/index.js index 0bd717c52..02a81cb16 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,6 +36,17 @@ const routes = [ path: '*', redirect: '/loginVerify' }, + // 单点登录跳转页面 + { + path: '/checkPage', + name: 'CheckPage', + component: resolve => require(['@/pages/login/checkPage.vue'], resolve), + meta: { + requireAuth: true, + isBoolean: true, + title: '跳转' + } + }, // 登录页 { path: '/login', From 7d9d1d6a1f2ffe199cc743793ba47fb2944e38c7 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 13:55:41 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/checkPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/checkPage.vue b/src/pages/login/checkPage.vue index 33a1ca44d..344b231c9 100644 --- a/src/pages/login/checkPage.vue +++ b/src/pages/login/checkPage.vue @@ -28,7 +28,7 @@ export default { let Base64 = require('js-base64').Base64 const str = Base64.encode(this.$route.query.username) const params = { - username: str + username: this.$route.query.username } checkPage(params).then(res => { if (res.ok) { From df42065e29172a4f123439dfdbe6df0714aca0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 13 Apr 2022 14:23:21 +0800 Subject: [PATCH 08/15] =?UTF-8?q?52548=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=84=8F=E8=A7=81=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8A=A5=E6=89=B9=E8=8A=82=E7=82=B9=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=BD=92=E6=A1=A3=20=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 4 +- .../pages/creatProcess/bzzqyj/step1-9.vue | 13 -- .../pages/creatProcess/bzzqyj/step2.vue | 4 + .../pages/creatProcess/bzzqyj/step4.vue | 13 +- .../pages/creatProcess/bzzqyj/step5.vue | 5 +- .../pages/phone/bzzqyj/step4-2.vue | 120 +++++++++--------- 6 files changed, 80 insertions(+), 79 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index ede994365..90225c661 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -661,13 +661,14 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) + console.log(mes); this.bpnId = this.$route.query.bpnId if (mes.form.endTime) { mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) } else { mes.form.endTime = '' } - this.addFjList = mes.filesId + this.addFjList = mes.filesId || mes.form.filesId || '' this.form.fjListName = mes.filesName this.form = mes.form this.roleForm = mes.roleForm @@ -878,6 +879,7 @@ export default { handleSave () { this.saveLoading = true let _formData = new FormData() + this.form.filesId = this.addFjList _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 0b87159c2..a80b09eba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -169,19 +169,6 @@ - - -
- - -
- -
{ let data = JSON.parse(res.mesg) + this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.commentText2 = data.commentText2 || '' this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index fe5399ae3..51c43b171 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -349,6 +349,7 @@ export default { data() { return { standId: '', + onlyKey: '', modaltitle2: '', addType: '', commentText4: '', @@ -623,6 +624,7 @@ export default { let _formData = new FormData(); let json = this.json json.info = this.data + json.onlyKey = this.onlyKey json.spId = this.form.spId json.spName = this.form.spName _formData.append("id", this.bpnId || ""); @@ -630,8 +632,9 @@ export default { _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: json, - commentText: this.commentText4 + commentText4: this.commentText4 })); + console.log(json); saveTaskForPub(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); @@ -649,6 +652,7 @@ export default { json.commentText = this.commentText4 json.spId = this.form.spId json.info = this.data + json.onlyKey = this.onlyKey json.spName = this.form.spName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -702,7 +706,12 @@ export default { this.acceptShow = false this.submitShow = true } - this.commentText4 = data.commentText || data.commentText4 || '' + this.commentText4 = data.commentText4 || '' + if(data.onlyKey){ + this.onlyKey = data.onlyKey + }else{ + this.onlyKey = data.form.onlyKey + } this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index a9f199be1..97f4abc32 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -351,6 +351,7 @@ return { clickFlag: false, commentText5: '', + onlyKey: '', options: [], itemId: '', modalshowflag2: false, @@ -557,6 +558,7 @@ let _formData = new FormData(); let json = this.form; json.data = this.data; + json.onlyKey = this.onlyKey _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); _formData.append("taskIds", this.taskIds); @@ -593,6 +595,7 @@ this.isSubmit = true; var json = this.json; json.oldinfo = this.oldData; + json.onlyKey = this.onlyKey json.commentText = this.commentText5; json.introduce = true; this.$http.post("lawss/activiti/completeTask", { @@ -617,8 +620,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - console.log(data); this.commentText5 = data.commentText5 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index 02ee8be31..e59fad088 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -305,70 +305,66 @@ handleTabs(name) { this.active = name }, - handleSubmit() { - this.isSubmit = true - var json = this.json - json.commentText = this.commentText42 - json.bzFlag = '0' - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - }, - handleSubmitNo() { - if (this.commentText42) { - var json = this.json - json.bzFlag = '1' - json.commentText = this.commentText42 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmit() { + this.isSubmit = true + let json = this.json + json.info = this.data + json.commentText = this.commentText42 + json.bzFlag = '0' + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, + handleSubmitNo() { + if (this.commentText42) { + var json = this.json + json.bzFlag = '1' + json.commentText = this.commentText42 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } + }) + } else { + this.$message.warning('请输入反馈意见') + } - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.commentText42 = data.commentText42 || '' - this.form.cid = data.cid || data.form.cid - this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.bzfgId = data.bzfgId || '' - this.json = data - this.data = data.info || data.data - }).catch(e => { - }) - }) - }, + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.form.fjList = data.fjList || data.form.fjList + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.commentText42 = data.commentText42 || '' + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.bzfgId = data.bzfgId || '' + this.json = data + this.data = data.info || data.data + }).catch(e => { + }) + }) + }, }, mounted() { this.getHistoryData() From b8929a77fa487a62d114075a5a9c86533ce9b9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 13 Apr 2022 14:25:01 +0800 Subject: [PATCH 09/15] =?UTF-8?q?52548=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=84=8F=E8=A7=81=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8A=A5=E6=89=B9=E8=8A=82=E7=82=B9=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=BD=92=E6=A1=A3=20=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index e1cc1e674..8e90c9433 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -355,6 +355,8 @@ export default { json.commentText = this.commentText2; json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; + json.presidentUser = this.form.presidentUser + json.presidentUserName = this.form.presidentUserName json.introduce = false; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), From 51522ade7e13eb7b0c19e90b8d87071ed449317f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 13 Apr 2022 14:58:27 +0800 Subject: [PATCH 10/15] =?UTF-8?q?52570=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=20=E7=AC=AC=E4=BA=8C=E6=AD=A5?= =?UTF-8?q?=E7=BC=BA=E4=B8=AA=E9=80=80=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/wfhxzg/step2.vue | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index a7ab8056f..63d7f3513 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -89,6 +89,7 @@ { + if(res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }).catch(e => { + this.isSubmit = false + }) + } + + }, // 提交按钮 handleSubmit() { this.isSubmit = true From f322e884824b0bda2c8c13081585bd357fe89cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 13 Apr 2022 16:30:24 +0800 Subject: [PATCH 11/15] =?UTF-8?q?52455=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=B8=85?= =?UTF-8?q?=20=E5=B9=B6=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=8A=8A=E7=BB=8F=E7=90=86=E4=BA=BA=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=89=B9=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzrk/step2.vue | 163 ++++-------------- 1 file changed, 30 insertions(+), 133 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index c6c3e831e..29d878e6f 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -10,12 +10,12 @@
审批历史
-
+
@@ -27,14 +27,7 @@ 海外标准入库 - - - + - - - - - - - - - - + + + 是 否 - - - - - - + - - - +
@@ -277,36 +230,12 @@ > - - - - - - - - - - - - - - - - - - + + + + + + @@ -367,18 +296,7 @@ > --> - - {{ form.wssmr }} - - + 关联信息
- - - + @@ -412,34 +323,13 @@
{{ value.name }}
-
+
- -
- - - - - - - - - + + +
@@ -516,6 +406,7 @@ export default { name: "phoneBzrkStep2", data() { return { + textStatusMap: {}, // 文本状态id与name对应 xgdFileMap: [], fbgbjbdFileMap: [], bpgFileMap: [], @@ -701,6 +592,13 @@ export default { TreeSelect }, methods: { + // 将文本状态的id与name对应 + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + + }, checkedRole(data) { this.assigneeNewLoading = true changeAssigneeNew({ @@ -1013,6 +911,7 @@ export default { this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.setMap(this.standStateOptions) this.standSystemOptions = res.data.BZTXCLASS // 标准体系 this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.categoryOptions = res.data.NYLXCLASS // 能源类型 @@ -1041,11 +940,9 @@ export default { /deep/.el-select .el-input .el-select__caret { font-size: 0; } - /deep/.prc-content-border { - width: 600px; - } /deep/ .el-drawer__container { .prc-content-border { + overflow: auto; border: none; padding: 0 20px 0; } From 223622650c8c5a93612c1a2ba3861ee7d0a60a04 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 16:42:02 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052565=20=E6=94=BF?= =?UTF-8?q?=E7=AD=96=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 38 ++++++- src/pages/policyRegulation/index.vue | 23 ++++ .../policyRegulation/nationalPolicy/index.vue | 27 +++++ .../policyWorkGroup/index.vue | 74 +++++++++++++ .../policyRegulation/problemControl/index.vue | 100 ++++++++++++++++++ .../standardTrackingList/index.vue | 27 +++++ .../accessStandardsAndRegulations/index.vue | 6 +- .../nonConfomity/index.vue | 6 +- .../workingGroup/index.vue | 8 +- src/router/index.js | 61 +++++++++++ 10 files changed, 355 insertions(+), 15 deletions(-) create mode 100644 src/pages/policyRegulation/index.vue create mode 100644 src/pages/policyRegulation/nationalPolicy/index.vue create mode 100644 src/pages/policyRegulation/policyWorkGroup/index.vue create mode 100644 src/pages/policyRegulation/problemControl/index.vue create mode 100644 src/pages/policyRegulation/standardTrackingList/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 7be6eb11c..b6579017b 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -161,11 +161,11 @@ // path: '/dataStatisComments', // menuId: '' // }, - { - title: '国内外政策', - path: '/foreignRegulationsDatabase', - menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' - }, + // { + // title: '国内外政策', + // path: '/foreignRegulationsDatabase', + // menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + // }, // // // { // // // title: '标准制修订管理', // // // path: '/demo2One' @@ -208,6 +208,34 @@ // } ] }, + { + title: '政策法规库', + path: '/policyRegulation', + 'icon-class': 'el-icon-s-management', + menuId: 'asdzcfgk', + children: [ + { + title: '问题项管控', + path: '/problemControl', + menuId: '50d7a0c0af4740c486100c257ae6068e' + }, + { + title: '国内外政策', + path: '/nationalPolicy', + menuId: '6557e9c4ce672af71be5807052da126b' + }, + { + title: '标准跟踪清单', + path: '/standardTrackingList', + menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' + }, + { + title: '政策工作组', + path: '/policyWorkGroup', + menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' + } + ] + }, { title: '工作中心', path: '/processCenter', diff --git a/src/pages/policyRegulation/index.vue b/src/pages/policyRegulation/index.vue new file mode 100644 index 000000000..c75eca2c9 --- /dev/null +++ b/src/pages/policyRegulation/index.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/pages/policyRegulation/nationalPolicy/index.vue b/src/pages/policyRegulation/nationalPolicy/index.vue new file mode 100644 index 000000000..e6fc85096 --- /dev/null +++ b/src/pages/policyRegulation/nationalPolicy/index.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/pages/policyRegulation/policyWorkGroup/index.vue b/src/pages/policyRegulation/policyWorkGroup/index.vue new file mode 100644 index 000000000..2dd70eb39 --- /dev/null +++ b/src/pages/policyRegulation/policyWorkGroup/index.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/pages/policyRegulation/problemControl/index.vue b/src/pages/policyRegulation/problemControl/index.vue new file mode 100644 index 000000000..2d0ce2e2c --- /dev/null +++ b/src/pages/policyRegulation/problemControl/index.vue @@ -0,0 +1,100 @@ + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue new file mode 100644 index 000000000..12b8507a8 --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 6071af3b9..21dfae7f8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 9bc0ef834..86fa0ac08 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -6,9 +6,9 @@ - - - + + +
diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index f3c350c94..e99e5b298 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -9,10 +9,10 @@ 标准法规工作组 - - 政策工作组 - - + + + + 工作组统计 diff --git a/src/router/index.js b/src/router/index.js index 02a81cb16..a6fb25b6d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3542,6 +3542,67 @@ const routes = [ } ] }, + // 政策法规库 + { + path: '/policyRegulation', + name: 'PolicyRegulation', + redirect: () => { + return 'problemControl' + }, + component: () => + import('@/pages/policyRegulation/index'), + meta: { + requireAuth: true, + title: '政策法规库', + menuId: 'asdzcfgk' + }, + children: [ + { + path: '/problemControl', + name: 'ProblemControl', + component: () => + import('@/pages/policyRegulation/problemControl/index'), + meta: { + requireAuth: true, + title: '问题项管控', + menuId: '50d7a0c0af4740c486100c257ae6068e' + } + }, + { + path: '/nationalPolicy', + name: 'NationalPolicy', + component: () => + import('@/pages/policyRegulation/nationalPolicy'), + meta: { + requireAuth: true, + title: '国内外政策', + menuId: '6557e9c4ce672af71be5807052da126b' + } + }, + { + path: '/standardTrackingList', + name: 'StandardTrackingList', + component: () => + import('@/pages/policyRegulation/standardTrackingList'), + meta: { + requireAuth: true, + title: '标准跟踪清单', + menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' + } + }, + { + path: '/policyWorkGroup', + name: 'PolicyWorkGroup', + component: () => + import('@/pages/policyRegulation/policyWorkGroup'), + meta: { + requireAuth: true, + title: '政策工作组', + menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' + } + } + ] + }, // 配置管理 { path: '/config', From e43d6df1df05ac939739ea2c5aa781186fb1ffdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 13 Apr 2022 16:58:09 +0800 Subject: [PATCH 13/15] =?UTF-8?q?52547=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=20=E5=89=8D=E9=9D=A2=E7=82=B9?= =?UTF-8?q?=E5=90=8C=E6=84=8F=E4=B9=8B=E5=90=8E=EF=BC=8Cpc=E7=AB=AF?= =?UTF-8?q?=E5=88=B0=E6=84=8F=E8=A7=81=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9?= =?UTF-8?q?=20=E5=86=85=E5=AE=B9=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzzqyj/step2.vue | 96 ++++++++++--------- .../pages/phone/bzzqyj/step4-1.vue | 51 +++++----- .../pages/phone/bzzqyj/step4-2.vue | 4 +- 3 files changed, 79 insertions(+), 72 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index e04ae7855..e4837618b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -253,51 +253,59 @@ this.saveLoading = false; }); }, - handleSubmit() { - this.$refs["bzzqyjForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - var json = this.json; - json.commentText = this.commentText2; - json.responUserList = this.form.responUserList; - json.responUserListName = this.form.responUserListName; - json.introduce = false; - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success("提交成功"); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } else { - return this.$message.warning("请完善基础信息"); - } + handleSubmit() { + this.$refs["bzzqyjForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = this.json; + json.onlyKey = this.onlyKey + json.commentText = this.commentText2; + json.responUserList = this.form.responUserList; + json.responUserListName = this.form.responUserListName; + json.presidentUser = this.form.presidentUser + json.presidentUserName = this.form.presidentUserName + json.introduce = false; + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.account + }, {}, res => { + if (res.success) { + this.$message.success("提交成功"); + this.$router.push("/processCenter"); + } + this.isSubmit = false; }); - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - this.commentText2 = data.commentText2 || '' - this.form.cid = data.form ? data.form.cid : data.cid - this.form.endTime = data.form ? data.form.endTime : data.endTime - this.form.fjList = data.form ? data.form.fjList : data.fjList - this.form.textType = data.form ? data.form.textType : data.textType - this.form.modelList = data.form ? data.form.modelList : data.modelList - this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '') - this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '') - this.json = data - }).catch(e => { - }); - }); - } + } else { + return this.$message.warning("请完善基础信息"); + } + }); + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey + this.commentText2 = data.commentText2 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.form.startUserName = data.form ? data.form.startUserName : data.startUserName + this.form.startUser = data.form ? data.form.startUser : data.startUser + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime + this.form.fjList = data.form ? data.form.fjList : data.fjList + this.form.textType = data.form ? data.form.textType : data.textType + this.form.modelList = data.form ? data.form.modelList : data.modelList + this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '') + this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '') + this.json = data + }).catch(e => { + }); + }); + } }, mounted() { this.getHistoryData(); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index b892b67e9..c749d3a70 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -314,34 +314,34 @@ handleTabs(name) { this.active = name }, - handleSubmit() { - this.$refs['bzzqyjForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - var json = this.json - json.commentText = this.commentText41 - json.bzfgId = this.form.bzfgId - json.bzfgName = this.form.bzfgName - json.spFlag = '0' - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } else { - this.$message.warning('请选择标准法规工程师分线管理员') - } + handleSubmit() { + this.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + let json = this.json + json.info = this.data + json.commentText = this.commentText41 + json.bzfgId = this.form.bzfgId + json.bzfgName = this.form.bzfgName + json.spFlag = '0' + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.account + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false }) - }, + } else { + this.$message.warning('请选择标准法规工程师分线管理员') + } + }) + }, handleSubmitNo() { if (this.commentText41) { - this.isSubmit = true var json = this.json json.spFlag = '1' json.commentText = this.commentText41 @@ -353,7 +353,6 @@ if (res.success) { this.$message.success('提交成功') this.$router.push('/processCenter') - this.isSubmit = false } }) } else { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index e59fad088..c4712d9a8 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -314,7 +314,7 @@ this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.account }, {}, res => { if (res.success) { this.$message.success('提交成功') @@ -331,7 +331,7 @@ this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.account }, {}, res => { if (res.success) { this.$message.success('提交成功') From 4c8dcbdfc372f37eff30da6cfae903401e9c9d03 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 17:11:22 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052572=20=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84--=E5=BD=93?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=A8=BF=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=99=84=E4=BB=B6=EF=BC=8C=E5=9B=BD=E5=86=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E5=B0=B1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index e6dd6ee42..b785040db 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -258,7 +258,7 @@ -

+

@@ -4371,7 +4371,7 @@ export default { .basic-information-content { & > p { - min-height: 42px; + min-height: 43px; line-height: 43px; border-bottom: 1px solid #E5E5E5; } From fa4d167ceccaf77a8fd1d5bc1db951b284a3830b Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 13 Apr 2022 17:36:23 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052523=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=B5=81=E7=A8=8B=20=E4=BB=8E?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B=E8=BF=9B=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=E9=9C=80?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4=EF=BC=8C=E6=8A=8A=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=94=BE=E5=88=B0=E6=9C=80=E4=B8=8B=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue index 67b82b874..f091246e6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -16,7 +16,7 @@ @@ -394,7 +394,7 @@ export default { display: flex; flex-direction: column; justify-content: space-between; - height: calc(~'100% - 103px'); + height: calc(~'100% - 53px'); overflow: auto; } }