From b1908feb457fdd1d5328dfc028e0b33d9e9444a6 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Thu, 11 Apr 2024 19:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineDeclartion/declareAddContent.js | 3 - src/assets/styles/ruoyi.scss | 5 +- .../declarationManagement/index.vue | 2 +- .../declareAddContent/index.vue | 4 +- .../declareDetailContent/index.vue | 114 +++++++++++------- .../enterpriseDirectory/index.vue | 2 +- .../onlineDeclaration/pendingReview/index.vue | 6 +- src/views/onlineDeclaration/records/index.vue | 5 +- .../onlineDeclaration/supplementary/index.vue | 4 +- .../onlineDeclaration/template/index.vue | 2 +- .../templateDetail/index.vue | 29 ++--- src/views/project/index.vue | 2 +- src/views/system/config/index.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/logininfor/index.vue | 2 +- src/views/system/notice/index.vue | 2 +- src/views/system/operlog/index.vue | 2 +- src/views/system/post/index.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/user/index.vue | 25 +++- 20 files changed, 133 insertions(+), 84 deletions(-) diff --git a/src/api/onlineDeclartion/declareAddContent.js b/src/api/onlineDeclartion/declareAddContent.js index 92ea6a0..8ce5125 100644 --- a/src/api/onlineDeclartion/declareAddContent.js +++ b/src/api/onlineDeclartion/declareAddContent.js @@ -5,7 +5,6 @@ export function getTemplateInfo(query) { return request({ url: `/system/templateInfo/${query.templateId}`, method: 'get', - params: query }) } @@ -14,7 +13,6 @@ export function getBasicInfo(query) { return request({ url: `/system/enterpriseBasicInfo/${query.enterpriseId}`, method: 'get', - params: query }) } @@ -49,7 +47,6 @@ export function getDeclarationRecords(query) { return request({ url: `/system/declarationRecords/${query.id}`, method: 'get', - params: query }) } diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index edec53c..b1a0acb 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -228,7 +228,7 @@ border-color: #20B2AA; color: #FFFFFF; } -.el-form { +.el-form,.operate_btn { .el-button--primary.is-active, .el-button--primary:active { background: oklab(.88 0 .1/.5); @@ -285,6 +285,9 @@ } } } +} +.operate_btn { + } /* text color */ .text-navy { diff --git a/src/views/onlineDeclaration/declarationManagement/index.vue b/src/views/onlineDeclaration/declarationManagement/index.vue index 67ce292..931ab71 100644 --- a/src/views/onlineDeclaration/declarationManagement/index.vue +++ b/src/views/onlineDeclaration/declarationManagement/index.vue @@ -228,7 +228,7 @@ export default { const headerHeight = header.offsetHeight; const headerOHeight = headerTwo.offsetHeight; const paginationtHeight = pagination.offsetHeight; - this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100; }, /** 查询菜单列表 */ getList() { diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue index c9ee5a0..dac2aff 100644 --- a/src/views/onlineDeclaration/declareAddContent/index.vue +++ b/src/views/onlineDeclaration/declareAddContent/index.vue @@ -2080,9 +2080,9 @@ list-style: none; /* 清除列表项前的标记 */ flex-wrap: wrap; align-content: space-between; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 5px; color: inherit; diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index 28e7848..5d93527 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1578,12 +1578,6 @@ -
- 返回 - 暂存 - 提交 - 导出申报信息 -
@@ -1606,10 +1600,10 @@ 暂无审批流程

-
+
- +
{{ item.approvalByName }}
@@ -1660,12 +1654,12 @@
- +
@@ -1867,6 +1861,12 @@ export default { }) this.getDetailInfo(detailId) }, + filters: { + dealURL : (value)=>{ + let arr = value.split("/") + return arr[arr.length - 1] + } + }, methods: { goBack() { this.$router.go(-1) @@ -2877,9 +2877,9 @@ list-style: none; /* 清除列表项前的标记 */ flex-wrap: wrap; align-content: space-between; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 5px; color: inherit; @@ -2926,9 +2926,9 @@ list-style: none; /* 清除列表项前的标记 */ flex: 1; padding: 0 15px; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 30px 0 5px; color: inherit; @@ -2964,22 +2964,27 @@ list-style: none; /* 清除列表项前的标记 */ diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue index 55b343a..b1d810c 100644 --- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue +++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue @@ -338,7 +338,7 @@ export default { const headerHeight = header.offsetHeight; const headerOHeight = headerTwo.offsetHeight; const paginationtHeight = pagination.offsetHeight; - this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100; }, /** 查询菜单列表 */ getList() { diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue index 1d6314b..c0072c2 100644 --- a/src/views/onlineDeclaration/pendingReview/index.vue +++ b/src/views/onlineDeclaration/pendingReview/index.vue @@ -259,7 +259,7 @@ export default { const headerHeight = header.offsetHeight; const headerOHeight = headerTwo.offsetHeight; const paginationtHeight = pagination.offsetHeight; - this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100; }, /** 查询审批列表 */ getList() { @@ -366,9 +366,9 @@ list-style: none; /* 清除列表项前的标记 */ flex-wrap: wrap; align-content: space-between; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 5px; // margin: 10px 10px 10px 0; diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index 226b6db..600f824 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -388,9 +388,9 @@ export default { if(this.userType == '02') { const headerThree = document.getElementById('I-rowTwo'); // 通过元素的 ID 获取元素 const headerTHeight = headerThree.offsetHeight; - this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 100; } else { - this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100; } }, @@ -460,6 +460,7 @@ export default { }, /** 查看审核详情操作 */ handleDetail(row){ + console.log(row); this.$router.push({name: 'declareDetailContent',query: { templateId: row.templateId, templateRecordId: row.templateRecordId, diff --git a/src/views/onlineDeclaration/supplementary/index.vue b/src/views/onlineDeclaration/supplementary/index.vue index 92a9dae..f5e4ac8 100644 --- a/src/views/onlineDeclaration/supplementary/index.vue +++ b/src/views/onlineDeclaration/supplementary/index.vue @@ -2098,9 +2098,9 @@ list-style: none; /* 清除列表项前的标记 */ flex-wrap: wrap; align-content: space-between; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 5px; color: inherit; diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue index b0528fb..82357bd 100644 --- a/src/views/onlineDeclaration/template/index.vue +++ b/src/views/onlineDeclaration/template/index.vue @@ -155,7 +155,7 @@ export default { const elementHeight = element.offsetHeight; const headerHeight = header.offsetHeight; const paginationtHeight = pagination.offsetHeight; - this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140; + this.tabHeader = elementHeight - headerHeight - paginationtHeight - 100; }, /** 查询模版列表 */ getList() { diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue index f9921f6..edf5346 100644 --- a/src/views/onlineDeclaration/templateDetail/index.vue +++ b/src/views/onlineDeclaration/templateDetail/index.vue @@ -309,10 +309,10 @@
-
+
@@ -341,10 +341,10 @@
- + 导出模版详情 + @@ -544,9 +544,9 @@ list-style: none; /* 清除列表项前的标记 */ flex-wrap: wrap; align-content: space-between; .upload_li { - width: 45%; + // width: 45%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; padding: 0 5px; color: inherit; @@ -584,17 +584,17 @@ list-style: none; /* 清除列表项前的标记 */