From 7aedc5c410e196b50c6060517ed24394346f8592 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, 10 Nov 2021 09:32:14 +0800
Subject: [PATCH 01/15] commit
---
src/App.vue | 2 +-
src/components/personalCenter/index.vue | 2 +-
src/pages/localTool/standContrast/index.vue | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index fe37bdd6e..e0697d05d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@
- 标准法规管理系统 Standard and Regulations Management System
+ 标准法规管理系统 Standard and Regulation Management System
- 标准法规管理系统 Standard and Regulations Management System
+ 标准法规管理系统 Standard and Regulation Management System
diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index f2de06d94..43ef1da5b 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -19,12 +19,12 @@
type="primary"
size="mini"
class="common-button-primary"
- v-btn-permission="'158298eaaf15a57a221c53f69e9ae563'"
+ v-btn-permission="''"
@click="sarStandCompareHisInfo">搜索
清空
From 1ae16146f84359ea0614d82b443b142fd8728195 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 10 Nov 2021 13:16:33 +0800
Subject: [PATCH 02/15] feat: There is no way the,
---
.../otherBussStandardDetails/index.vue | 20 +-
.../details/otherLawsStandDetails/index.vue | 20 +-
.../details/otherStandardDetails/index.vue | 20 +-
.../domesticStandardsAndRegulations/index.vue | 22 +-
.../components/EnterpriseStandardDatabase.vue | 11 +-
.../foreignRegulationsDatabase/index.vue | 12 +-
.../foreignStandardsAndRegulations/index.vue | 590 +++++++++---------
7 files changed, 361 insertions(+), 334 deletions(-)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 881324144..2a85a3026 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2204,6 +2204,16 @@ export default {
}
}
+ for (let i = 0; i < displayLocation.length; i++) {
+ // sss
+ if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+ const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+ if(childList.length === 0){
+ displayLocation.splice(i,1)
+ }
+ }
+ }
+
const child = location.child || []
const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
const fieldsIsTextAreaOrFile = child.filter(field => {
@@ -2214,15 +2224,7 @@ export default {
})
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
})
- for (let i = 0; i < displayLocation.length; i++) {
- // sss
- if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
- const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
- if(childList.length === 0){
- displayLocation.splice(i,1)
- }
- }
- }
+
this.dynamicFormField = displayLocation
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index 3e150bed7..b46256a7c 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -2112,6 +2112,16 @@ export default {
}
}
+ for (let i = 0; i < displayLocation.length; i++) {
+ // sss
+ if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+ const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+ if(childList.length === 0){
+ displayLocation.splice(i,1)
+ }
+ }
+ }
+
const child = location.child || []
const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
const fieldsIsTextAreaOrFile = child.filter(field => {
@@ -2123,16 +2133,6 @@ export default {
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
})
- for (let i = 0; i < displayLocation.length; i++) {
- // sss
- if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
- const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
- if(childList.length === 0){
- displayLocation.splice(i,1)
- }
- }
- }
-
this.dynamicFormField = displayLocation
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 7fab8f162..6a5a8b72f 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3136,6 +3136,16 @@
}
}
+ for (let i = 0; i < displayLocation.length; i++) {
+ // sss
+ if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+ const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+ if(childList.length === 0){
+ displayLocation.splice(i,1)
+ }
+ }
+ }
+
const child = location.child || []
const one = []
const half = []
@@ -3160,16 +3170,6 @@
location.showAll = false
})
- for (let i = 0; i < displayLocation.length; i++) {
- // sss
- if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
- const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
- if(childList.length === 0){
- displayLocation.splice(i,1)
- }
- }
- }
-
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id
}, {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 21e5fc1c7..78a7d7349 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -184,7 +184,7 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange">
@@ -1647,12 +1647,6 @@
-
-
-
-
From 1cc1ce08c6d8f0b10950493660c6d61c2c36fccd Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 10 Nov 2021 16:54:40 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E9=A1=B9=E7=AE=A1=E6=8E=A7=20-=20=E5=8E=86=E5=8F=B2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nonConfomity/pages/businessDetails.vue | 287 +++++++++++-------
1 file changed, 178 insertions(+), 109 deletions(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
index 8563f747d..075d19a30 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
@@ -9,62 +9,82 @@