diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index cb8ff81b9..0021f28aa 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -24,8 +24,8 @@
{{item.lawsNumber}}
-
{{item.standSortShow + '  ' + item.standNumber + '-' + item.standYear }}
-
{{item.standSortShow + '  ' + item.standNumber }}
+
{{item.standSort + '  ' + item.standNumber + '-' + item.standYear }}
+
{{item.standSort + '  ' + item.standNumber }}
{{item.standName}}
@@ -79,10 +79,10 @@
- 发布日期: - {{ item.issueTime ? $moment(item.issueTime).format("YYYY-MM-DD") : "" }} - 实施日期: {{item.XCXSSRQLAWS}} - 实施日期: {{item.putTime}} + 发布日期: + {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : " ") : " " }} + 实施日期: {{item.XCXSSRQLAWS}} + 实施日期: {{item.SSRQ}}
@@ -149,46 +149,31 @@ export default { this.standList = [] this.page = 1 if(this.titleType === 'INLAND'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: this.page, + // standNumber: this.searchKey, + // pageSize: 20, + // standType: 'INLAND' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'INLAND', page: this.page, - standNumber: this.searchKey, - pageSize: 20, - standType: 'INLAND' + pageSize: 20 },{ - _this: this - },res=>{ - if (res.ok){ - this.standList = res.data.list - this.loading = false - }else { - this.$message.error(res.message) - } - },e=>{ - }) - }else if(this.titleType === 'FOREIGN'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ - page: 1, - pageSize: 20, - standNumber: this.searchKey, - standType: 'FOREIGN' - },{ - _this: this - },res=>{ - if (res.ok){ - this.standList = res.data.list - this.loading = false - }else { - this.$message.error(res.message) - } - },e=>{ - }) - }else if(this.titleType === 'POLICY'){ - this.$http.get('lawss/sarLawsInfo/page',{ - page: 1, - pageSize: 20, - lawsNumber: this.searchKey, - },{ - _this: this + _this: this, }, res => { if (res.ok){ this.standList = res.data.list @@ -196,9 +181,83 @@ export default { }else { this.$message.error(res.message) } - }, e =>{ - console.log(e); + }, e => { + console.log(e) }) + }else if(this.titleType === 'FOREIGN'){ + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: 1, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'FOREIGN' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'FOREIGN', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if (res.ok){ + this.standList = res.data.list + this.loading = false + }else { + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + + }else if(this.titleType === 'POLICY'){ + // this.$http.get('lawss/sarLawsInfo/page',{ + // page: 1, + // pageSize: 20, + // lawsNumber: this.searchKey, + // },{ + // _this: this + // }, res => { + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // }, e =>{ + // console.log(e); + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'laws', + selectValue: this.searchKey, + selectType: 'titleSearch', + type: 'laws', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if (res.ok){ + this.standList = res.data.list + this.loading = false + }else { + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + }else{ this.$http.get("/lawss/NewsFeed/getNewsFeed", { messageType: 'ZYBZFG', @@ -223,15 +282,41 @@ export default { this.listFlag = false this.moreFlag = false if(this.titleType === 'INLAND'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: this.page, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'INLAND' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'INLAND', page: this.page, - pageSize: 20, - standNumber: this.searchKey, - standType: 'INLAND' + pageSize: 20 },{ - _this: this - },res=>{ - if (res.ok){ + _this: this, + }, res => { + if(res.ok){ if(res.data.list.length){ if(this.standList.length){ this.standList = this.standList.concat(res.data.list) @@ -240,23 +325,52 @@ export default { } this.loading = false }else{ + this.loading = false this.listFlag = true } - }else { + }else{ this.$message.error(res.message) } - },e=>{ + }, e => { + console.log(e) }) + }else if(this.titleType === 'FOREIGN'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ - page: 1, - pageSize: 20, - standNumber: this.searchKey, - standType: 'FOREIGN' + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: 1, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'FOREIGN' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'FOREIGN', + page: this.page, + pageSize: 20 },{ - _this: this - },res=>{ - if (res.ok){ + _this: this, + }, res => { + if(res.ok){ if(res.data.list.length){ if(this.standList.length){ this.standList = this.standList.concat(res.data.list) @@ -265,38 +379,68 @@ export default { } this.loading = false }else{ + this.loading = false this.listFlag = true } - }else { + }else{ this.$message.error(res.message) } - },e=>{ + }, e => { + console.log(e) }) }else if(this.titleType === 'POLICY'){ - this.$http.get('lawss/sarLawsInfo/page',{ - lawsNumber: this.searchKey, - page: 1, - pageSize: 20, - },{ - _this: this - }, res => { - if (res.ok){ - if(res.data.list.length){ - if(this.standList.length){ - this.standList = this.standList.concat(res.data.list) - }else{ - this.standList = res.data.list - } - this.loading = false - }else{ - this.listFlag = true - } - }else { - this.$message.error(res.message) - } - }, e =>{ - console.log(e); - }) + // this.$http.get('lawss/sarLawsInfo/page',{ + // lawsNumber: this.searchKey, + // page: 1, + // pageSize: 20, + // },{ + // _this: this + // }, res => { + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // }, e =>{ + // console.log(e); + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'laws', + selectValue: this.searchKey, + selectType: 'titleSearch', + type: 'laws', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if(res.ok){ + if(res.data.list.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data.list) + }else{ + this.standList = res.data.list + } + this.loading = false + }else{ + this.loading = false + this.listFlag = true + } + }else{ + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) }else{ this.$http.get("/lawss/NewsFeed/getNewsFeed", { messageType: 'ZYBZFG', @@ -315,6 +459,7 @@ export default { } this.loading = false }else{ + this.loading = false this.listFlag = true } }else {