From c9bc703a40ac1a9187c6f642d4ed8a66dc4db23c Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Mon, 6 Jun 2022 15:15:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 323 ++++++++++++++++++++++--------
 1 file changed, 234 insertions(+), 89 deletions(-)

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 @@
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
-         <div v-else class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber }}</div>
+         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
+         <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
          <div class="standState">{{item.standName}}</div>
@@ -79,10 +79,10 @@
        </div>
        <div class="content-time">
          <div style="margin-top: 10px">
-         <span style="padding: 20px;">发布日期：
-           {{ item.issueTime ? $moment(item.issueTime).format("YYYY-MM-DD") : "" }}</span>
-           <span style="padding: 20px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
-           <span style="padding: 20px;" v-else>实施日期： {{item.putTime}}</span>
+         <span style="padding-left: 10px;min-width: 200px;">发布日期：
+           {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : "          ") : "          " }}</span>
+           <span style="padding-left: 15px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
+           <span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
          </div>
 
        </div>
@@ -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 {