diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 96f578574..77f06915a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -237,13 +237,13 @@
>
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // i 全部对象数组的下标
- // s 选中对象数组的下标
- for (var s in this.sarAccessInfoListArry) {
- for (var i in this.sarAccessInfoList) {
- if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
- this.sarAccessInfoList.splice(i, 1)
- }
+ let exits = []
+ this.sarAccessInfoListArry.map(item => {
+ let index
+ index = this.sarAccessInfoList.findIndex(items => {
+ return items.id = item
+ })
+ if (index > -1) {
+ this.sarAccessInfoList.splice(index, 1)
}
- }
+ exits.push(item)
+ })
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1467,6 +1470,13 @@ export default {
selectLawsStands () {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
+ this.sarAccessInfoSearchList.forEach(item => {
+ if (item.standYear === null) {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber
+ } else {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+ }
+ })
this.drawerTotal = res.data.list.length
}, e => {
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 3d3213f1e..32b738445 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -117,10 +117,10 @@
-
-
+
+
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // i 全部对象数组的下标
- // s 选中对象数组的下标
- for (var s in this.sarAccessInfoListArry) {
- for (var i in this.sarAccessInfoList) {
- if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
- this.sarAccessInfoList.splice(i, 1)
- }
+ let exits = []
+ this.sarAccessInfoListArry.map(item => {
+ let index
+ index = this.sarAccessInfoList.findIndex(items => {
+ return items.id = item
+ })
+ if (index > -1) {
+ this.sarAccessInfoList.splice(index, 1)
}
- }
+ exits.push(item)
+ })
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1278,6 +1281,13 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
+ this.sarAccessInfoSearchList.forEach(item => {
+ if (item.standYear === null) {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber
+ } else {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+ }
+ })
this.drawerTotal = res.data.list.length
}, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3c8704868..d636411a5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -215,13 +215,13 @@
>
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // i 全部对象数组的下标
- // s 选中对象数组的下标
- for (var s in this.sarAccessInfoListArry) {
- for (var i in this.sarAccessInfoList) {
- if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
- this.sarAccessInfoList.splice(i, 1)
- }
+ let exits = []
+ this.sarAccessInfoListArry.map(item => {
+ let index
+ index = this.sarAccessInfoList.findIndex(items => {
+ return items.id = item
+ })
+ if (index > -1) {
+ this.sarAccessInfoList.splice(index, 1)
}
- }
+ exits.push(item)
+ })
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1276,6 +1279,13 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
+ this.sarAccessInfoSearchList.forEach(item => {
+ if (item.standYear === null) {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber
+ } else {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+ }
+ })
this.drawerTotal = res.data.list.length
}, e => {