diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 7a2fd5c71..2320b4b2b 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -1152,22 +1152,22 @@
- {{ standShowItemEO.itemsNum }}
+ {{ standShowItemEO.itemsNum }}
-
- {{ standShowItemEO.itemsName }}
+
+ {{ standShowItemEO.itemsName }}
-
- 条款内容
+ {{
standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
}}
-
- 解读内容
+
{{
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
@@ -1175,49 +1175,49 @@
-
- 新车型实施日期
+ {{
standShowItemEO.xccssrq
}}
-
- 在产车实施日期
+ {{
standShowItemEO.zccssrq
}}
-
- {{ standShowItemEO.applyArctic }}
+
+ {{ standShowItemEO.applyArctic }}
-
- {{
+
+ {{
standShowItemEO.responsibleUnit
}}
-
-
+
+
{{ standShowItemEO.dutyEngineer }}
-
-
+
+
{{ standShowItemEO.comparedWithPrevious }}
-
-
+
+
{{ standShowItemEO.complianceRequire }}
-
-
+
+
{{ standShowItemEO.complianceState }}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 26874117b..68685d1fc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -81,9 +81,9 @@
-
+
@@ -202,7 +202,6 @@
@@ -212,7 +211,6 @@
@@ -220,7 +218,6 @@
@@ -327,7 +324,6 @@
@@ -335,14 +331,12 @@
@@ -635,9 +629,10 @@ export default {
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
- standName: '',
+ standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
+ pageNo: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
@@ -649,6 +644,7 @@ export default {
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
+ pageNo: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
@@ -998,7 +994,7 @@ export default {
clearSearchLaws() {
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
- this.sarAccessInfoSearch.standName = ''
+ this.sarAccessInfoSearch.standNumber = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.isListType = false
@@ -1476,6 +1472,8 @@ export default {
})
},
pageInfo() {
+ this.sarAccessInfoSearch.pageNo = 1
+ this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
@@ -1526,6 +1524,8 @@ export default {
},
selectPage() {
+ this.sarAccessInfo.pageNo = 1
+ this.sarAccessInfo.page = 1
StandardsInfoPage(this.sarAccessInfo).then(res => {
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 81dce1559..1cbe14f95 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -182,12 +182,10 @@
@@ -195,7 +193,6 @@
show-overflow-tooltip
prop="zccssrq"
align="center"
- sortable
label="在产车实施日期">
@@ -305,14 +301,12 @@
@@ -499,6 +493,7 @@ export default {
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
+ pageNo: 1,
Size: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
@@ -510,6 +505,7 @@ export default {
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
+ pageNo: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
@@ -832,6 +828,8 @@ export default {
// 点数据搜索 查询按钮 事件
searchLawsStands () {
this.showTableFlag = false
+ this.sarAccessInfoSearch.pageNo = 1
+ this.sarAccessInfoSearch.page = 1
this.selectLawsStands()
},
// 点击清空查询条件 按钮事件
@@ -1232,6 +1230,8 @@ export default {
})
},
pageInfo() {
+ this.sarAccessInfoSearch.pageNo = 1
+ this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
@@ -1282,6 +1282,8 @@ export default {
}
},
selectPage() {
+ this.sarAccessInfo.page = 1
+ this.sarAccessInfo.pageNo = 1
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1297,6 +1299,7 @@ export default {
},
// 高级检索查询按钮
selectBtn() {
+ this.sarAccessInfo.pageNo = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index dfec4ebff..83dca2e39 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -238,20 +238,17 @@
@@ -355,7 +352,6 @@
@@ -363,14 +359,12 @@
@@ -569,6 +563,7 @@ export default {
syrz: '',
typeApplicable: '',
dataSource: 'INLAND_STAND', // 数据来源
+ pageNo: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
@@ -582,6 +577,7 @@ export default {
typeApplicable: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
+ pageNo: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
@@ -1355,6 +1351,8 @@ export default {
},
// 查询按钮
selectLawsStands() {
+ this.sarAccessInfoSearch.pageNo = 1
+ this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
@@ -1371,6 +1369,8 @@ export default {
},
/** 高级查询查询按钮*/
selectPage() {
+ this.sarAccessInfo.pageNo = 1
+ this.sarAccessInfo.page = 1
StandardsInfoPage(this.sarAccessInfo).then(res => {
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {