Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi

src/pages/phone/domesticStand/index.vue

@@ -8,7 +8,7 @@
       <div style="display: flex;align-items: center">
         <van-search
             style="flex: 1;padding-right: 0"
-            v-model="searchQuery.selectValue"
+            v-model="searchQuery.findValue"
             show-action
             placeholder="请输入搜索关键词"
             @search="onSearch"
@@ -40,60 +40,44 @@
              :key="item.id"
              @click="jumpDetails(item)">
           <div class="standTitle">
-            <div v-if="$route.query.standType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-            <div v-else class="title">{{ item.stand_code || item.numbershow }}</div>
+            <div class="title" v-if="$route.query.standType === 'INLAND' || $route.query.standType === 'FOREIGN'">{{ convertTitle(item.standSort, item.standNumber, item.standYear) }}</div>
+            <div class="title" v-else-if="$route.query.standType === 'bussstand'">{{ item.standCode || convertTitle(item.standSort, item.standNumber, item.standYear) }}</div>
           </div>
 
           <div class="standContent">
-            <div class="standState">{{(item.nameshow && item.nameshow !== '') ? item.nameshow : (item.standName && item.standName !== '') ? item.standName : item.standEnName }}</div>
-            <div class="standSubTime" v-if="$route.query.standType === 'POLICY'">标准状态:
-              <span v-if="lawsMap[item.lawsTextState] === '作废'"
-                    style="color: #F56C6C; padding-left: 5px;">
-                            {{ lawsMap[item.lawsTextState] }}
-               </span>
-              <span v-else-if="lawsMap[item.lawsTextState] === '参考' || lawsMap[item.lawsTextState] === '被代替' || lawsMap[item.lawsTextState] === '现行有效'"
-                    style="color: #35720B; padding-left: 5px;">
-                            {{ lawsMap[item.lawsTextState] }}
-               </span>
-              <span v-else style=" padding-left: 5px;">
-                            {{ lawsMap[item.lawsTextState] }}
-               </span>
-            </div>
-            <div class="standSubTime" v-else-if="$route.query.standType === 'bussstand'" >标准状态:
-              <span v-if="item.textStatusBussName === '废止'" style="color: #F56C6C; padding-left: 5px;"> {{ item.textStatusBussName }} </span>
-              <span v-else-if="item.textStatusBussName === '参考' || item.textStatusBussName === '被代替'" style="color: #35720B; padding-left: 5px;">{{ item.textStatusBussName }}</span>
-              <span v-else style=" padding-left: 5px;">{{ item.textStatusBussName }}</span>
-            </div>
-            <div class="standSubTime" v-else >标准状态:
-              <span v-if="textStatusMap[item.textStatus] === '废止'"
-                    style="color: #F56C6C; padding-left: 5px;">
-                            {{ textStatusMap[item.textStatus] }}
-               </span>
-              <span v-else-if="textStatusMap[item.textStatus] === '参考' || textStatusMap[item.textStatus] === '被代替'"
-                    style="color: #35720B; padding-left: 5px;">
-                            {{ textStatusMap[item.textStatus] }}
-               </span>
-              <span v-else style=" padding-left: 5px;">
-                            {{ textStatusMap[item.textStatus] }}
-               </span>
-            </div>
+            <div class="standState">{{ item.standName || item.standEnName || '-' }}</div>
+
+            <template>
+              <div class="standSubTime" v-if="$route.query.standType === 'INLAND' || $route.query.standType === 'FOREIGN'">
+                标准状态:
+                <span v-if="item.standTextStatusShow === '废止'" style="color: #F56C6C; padding-left: 5px;">{{ item.standTextStatusShow }}</span>
+                <span v-else-if="item.standTextStatusShow === '参考' || item.standTextStatusShow === '被代替'" style="color: #35720B; padding-left: 5px;">{{ item.standTextStatusShow }}</span>
+                <span v-else style=" padding-left: 5px;">{{ item.standTextStatusShow }}</span>
+              </div>
+
+              <div class="standSubTime" v-else-if="$route.query.standType === 'bussstand'">
+                标准状态:
+                <span v-if="item.standStatusShow === '废止'" style="color: #F56C6C; padding-left: 5px;">{{ item.standStatusShow }}</span>
+                <span v-else-if="item.standStatusShow === '参考' || item.standStatusShow === '被代替'" style="color: #35720B; padding-left: 5px;">{{ item.standStatusShow }}</span>
+                <span v-else style=" padding-left: 5px;">{{ item.standStatusShow }}</span>
+              </div>
+            </template>
           </div>
 
           <div class="content-time">
-            <div style="margin-top: 10px">
-                  <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="$route.query.standType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
-              <span style="padding-left: 15px;" v-else-if="$route.query.standType === 'bussstand'">实施日期： {{item.putTime}}</span>
-              <span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
-            </div>
+            <div style="width: 50%">发布日期: <span style="padding-left: 5px;">{{ convertTime(item.issueTime) }}</span></div>
+            <template>
+              <div v-if="$route.query.standType === 'INLAND' || $route.query.standType === 'FOREIGN'"
+                  style="width: 50%">实施日期: <span style="padding-left: 5px;">{{ convertTime(item.ssrq) }}</span></div>
+              <div v-else-if="$route.query.standType === 'bussstand'"
+                   style="width: 50%">实施日期: <span style="padding-left: 5px;">{{ convertTime(item.putTime) }}</span></div>
+            </template>
           </div>
         </div>
       </div>
     </PhoneScroll>
 
-    <standardSystemPopup :init-keys="searchQuery.standSystem" @searchQuery="setSearchQuery" ref="standardSystemPopupRef" />
+    <standardSystemPopup :init-keys="convertId(searchQuery.menuId)" @searchQuery="setSearchQuery" ref="standardSystemPopupRef" />
   </div>
 </template>
 
@@ -109,12 +93,10 @@ export default {
   },
   data () {
     const searchQuery = {
-      selectIndex: 'stand',
-      selectValue: '',
-      standSystem: [],
-      textStatus: '全部',
-      selectType: 'titleSearch',
       standType: 'INLAND',
+      findValue: '',
+      textState: '全部',
+      menuId: '',
       page: 1,
       pageSize: 20
     }
@@ -126,7 +108,9 @@ export default {
       loading: false,
       list: [],
       url: {
-        searchSarBykey: 'search/searchCenter/searchSarBykey'
+        searchSarBykey: 'search/searchCenter/searchSarBykey',
+        getSarStandardsInfoPageForPhone: 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageForPhone',
+        getSarBussionStandPageForPhone: 'lawss/sarBussionessStand/getSarBussionStandPageForPhone'
       },
       textStatusMap: {},
       natureMap:{},
@@ -147,9 +131,6 @@ export default {
           case 'bussstand':
             vm.titleName = '企业标准'
             break
-          case 'POLICY':
-            vm.titleName = '国内外政策库'
-            break
         }
         vm.searchQuery = { ...vm.initSearQuery }
         vm.$refs.standardSystemPopupRef.initOpen()
@@ -183,6 +164,31 @@ export default {
     // this.getData()
   },
   methods: {
+    convertTitle (standSort, standName, standYear) {
+      if (!standYear || standYear === '') {
+        return standSort + ' ' + standName
+      } else {
+        return standSort + ' ' + standName + '-' + standYear
+      }
+    },
+    convertTime (time) {
+      if (!time || time === '') {
+        return '-'
+      } else {
+        const timeArr = time.split(',')
+        if (timeArr.length === 1) {
+          return this.$moment(time).format('YYYY-MM-DD')
+        } else {
+          return this.$moment(timeArr[0]).format('YYYY-MM-DD') + ',...'
+        }
+      }
+    },
+    convertId (idArr) {
+      if (idArr === '') {
+        return []
+      }
+      return idArr.split(',')
+    },
     onSearch () {
       this.list = []
       // this.searchQuery.page = 1
@@ -193,21 +199,14 @@ export default {
     getData (page) {
       switch (this.$route.query.standType) {
         case 'INLAND':
-          this.searchQuery.selectIndex = 'stand'
           this.searchQuery.standType = 'INLAND'
           break
         case 'FOREIGN':
-          this.searchQuery.selectIndex = 'stand'
           this.searchQuery.standType = 'FOREIGN'
           break
         case 'bussstand':
-          this.searchQuery.selectIndex = 'bussstand'
           this.searchQuery.standType = 'bussstand'
           break
-        case 'POLICY':
-          this.searchQuery.selectIndex = 'laws'
-          this.searchQuery.standType = 'laws'
-          break
       }
       return new Promise((resolve, reject) => {
         const config = {
@@ -217,7 +216,11 @@ export default {
         if (page) {
           this.searchQuery.page = page
         }
-        this.$http._post("search/searchCenter/searchSarBykey", this.searchQuery, config).then(res => {
+        let url = this.url.getSarStandardsInfoPageForPhone
+        if (this.$route.query.standType === 'bussstand') {
+          url = this.url.getSarBussionStandPageForPhone
+        }
+        this.$http._getData(url, this.searchQuery, config).then(res => {
           if (res.ok) {
             this.total = res.data.count
 
@@ -236,8 +239,8 @@ export default {
       this.$refs.standardSystemPopupRef.open()
     },
     setSearchQuery (searchQuery) {
-      this.searchQuery.standSystem = searchQuery.checkedKeys
-      this.searchQuery.textStatus = searchQuery.textStatusName
+      this.searchQuery.menuId = searchQuery.checkedKeys.join(',')
+      this.searchQuery.textState = searchQuery.textStatusName
       this.onSearch()
     },
     getDicTypeListCode () {
@@ -371,8 +374,10 @@ export default {
     font-size: 3.4vw;
     width: 100%;
     height: 35px;
-    margin-top: 5px;
+    line-height: 35px;
+    padding: 0 10px;
     border-top: 1px solid #cccccc;
+    display: flex;
   }
 }
 .card-content:first-child{

src/pages/phone/standDynamics/components/Standard.vue

@@ -65,7 +65,17 @@ export default {
   },
   methods: {
     convertTime (time) {
-      return time !== '' ? this.$moment(time).format('YYYY-MM-DD') : '-'
+      // return (time && time !== '') ? this.$moment(time).format('YYYY-MM-DD') : '-'
+      if (!time || time === '') {
+        return '-'
+      } else {
+        const timeArr = time.split(',')
+        if (timeArr.length === 1) {
+          return this.$moment(time).format('YYYY-MM-DD')
+        } else {
+          return this.$moment(timeArr[0]).format('YYYY-MM-DD') + ',...'
+        }
+      }
     },
     getData (page) {
       return new Promise((resolve, reject) => {

src/pages/phone/standDynamics/index.vue

@@ -19,9 +19,9 @@
         <van-tab name="DataCenter" title="资料中心">
           <DataCenter></DataCenter>
         </van-tab>
-        <van-tab name="SolicitOpinions" title="标准征求意见">
-          <SolicitOpinions></SolicitOpinions>
-        </van-tab>
+        <!--<van-tab name="SolicitOpinions" title="标准征求意见">-->
+        <!--  <SolicitOpinions></SolicitOpinions>-->
+        <!--</van-tab>-->
         <van-tab name="EnterpriseStandard" title="企业标准发布">
           <Standard message-type="QYBZFB"></Standard>
         </van-tab>