Merge branch 'dev/v4.8.28_tsz' of qmx/jy into release/v4.8.28

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/analysis_result.js

@@ -543,6 +543,10 @@ var vNode = {
           } else {
             this.historyExpert.historyTabActive = 1
           }
+          setTimeout(() => {
+            var targetEle = document.getElementById('analysis-tabs')
+            targetEle.scrollIntoView()
+          }, 500)
         },
         setYearData () {
           let num = 1
@@ -848,9 +852,9 @@ var vNode = {
           const { pid, sid } = this.filterData
           this.savePageData()
           if(pid && sid) {
-            location.href = '/jyapp/big/page/ai_add?fromType=search&id=' + pid + '&sId=' + sid
+            location.href = '/jyapp/big/page/ai_add?fromType=analysis&id=' + pid + '&sId=' + sid
           } else {
-            location.href = '/jyapp/big/page/ai_add?fromType=search'
+            location.href = '/jyapp/big/page/ai_add?fromType=analysis'
           }
         },
         // 初始化画像数据
@@ -1403,12 +1407,12 @@ var vNode = {
             case 1:
               this.filterData.searchItem = 2
               this.filterData.projectScope = 0
-              this.historyExpert.historyTabActive = 1
+              this.historyExpert.historyTabActive = 0
               break;
             case 2:
               this.filterData.searchItem = 3
               this.filterData.projectScope = 0
-              this.historyExpert.historyTabActive = 1
+              this.historyExpert.historyTabActive = 0
               break;
             default:
               break;
@@ -1424,6 +1428,10 @@ var vNode = {
                 this.getProjectWinnerEnt()
                 this.getProjectDetail()
                 this.getHistoryExpert()
+                setTimeout(() => {
+                  var targetEle = document.getElementById('analysis-tabs')
+                  targetEle.scrollIntoView()
+                }, 500)
               }
             } else {
               this.setYearData()

src/jfw/modules/app/src/web/templates/big-member/page_ai_add.html

@@ -368,6 +368,13 @@
                 this.firstSearch()
             }
             this.initPurchaseList();
+            // 从投标决策分析跳转过来
+            if(utils.getParam('fromType') == 'analysis') {
+              let analysisFilterData = sessionStorage.getItem('analysis-filter-data')
+              if(analysisFilterData) {
+                this.analysisFilterData = JSON.parse(analysisFilterData)
+              }
+            }
             // var searchData = JSON.parse(sessionStorage.getItem('big-ai-search'));
             var addCont = JSON.parse(sessionStorage.getItem('big-ai-add-data'))
             if(addCont) {
@@ -595,6 +602,19 @@
             getFilterData: function(){
                 var history = JSON.parse(localStorage.getItem('BIG_AI_LIST'))
                 var that = this;
+                var anaBuyerContent = []
+                var anaBuyer = ''
+                if(that.analysisFilterData.buyerContent) {
+                  anaBuyerContent = that.analysisFilterData.buyerContent.reduce((acc, item) => acc.concat(item.key), []).flat();
+                }
+                if(that.analysisFilterData.filters) {
+                  if(that.analysisFilterData.filters.buyer) {
+                    anaBuyer = that.analysisFilterData.filters.buyer
+                  }
+                  if(that.analysisFilterData.filters.pname) {
+                    that.project.pName = that.analysisFilterData.filters.pname
+                  }
+                }
                 $.ajax({
                     type:'POST',
                     url:'/bigmember/analysis/projectInfo',
@@ -618,11 +638,15 @@
                                         if(that.project.pName == ele.projectname) {
                                             if(ele.purchaseList){
                                                 that.purchaseList = ele.purchaseList
+                                            } else if(anaBuyerContent.length > 0) {
+                                              that.getApiData('content', anaBuyerContent);
                                             } else {
                                                 that.getApiData('content',res.data.purchasing);
                                             }
                                             if(ele.buyer) {
                                                 that.formData.buyer = ele.buyer
+                                            } else if(anaBuyer) {
+                                              that.getApiData('buyer', anaBuyer)
                                             } else {
                                                 that.getApiData('buyer',res.data.buyer)
                                             }
@@ -649,6 +673,11 @@
                                             that.getApiData('area',res.data.area)
                                         }
                                     }
+                                } else if(that.analysisFilterData) {
+                                  that.getApiData('content', anaBuyerContent);
+                                  that.getApiData('buyer', anaBuyer)
+                                  that.getApiData('budget',res.data.budget)
+                                  that.getApiData('area',res.data.area)
                                 } else {
                                     // 2. 读接口中的数据
                                     that.getApiData('content',res.data.purchasing);
@@ -664,23 +693,6 @@
                                     }
                                 });
                             }
-                        }else{
-                          let analysisFilterData = sessionStorage.getItem('analysis-filter-data')
-                          if(analysisFilterData) {
-                            analysisFilterData = JSON.parse(analysisFilterData)
-                            if(analysisFilterData.buyerContent) {
-                              const arr = analysisFilterData.buyerContent.reduce((acc, item) => acc.concat(item.key), []).flat();
-                              that.getApiData('content', arr);
-                            }
-                            if(analysisFilterData.filters) {
-                              if(analysisFilterData.filters.buyer) {
-                                that.getApiData('buyer', analysisFilterData.filters.buyer)
-                              }
-                              if(analysisFilterData.filters.pname) {
-                                that.project.pName = analysisFilterData.filters.pname
-                              }
-                            }
-                          }
                         }
                     },
                     error:function(err) {

src/jfw/modules/app/src/web/templates/big-member/page_analysis_result.html

@@ -84,7 +84,7 @@
                           </van-tab>
                       </van-tabs>
                     </div>
-                    <div ref="analysisTab">
+                    <div id="analysis-tabs" ref="analysisTab">
                       <van-tabs v-if="listCount.pCount !== 0" v-model="active" background="#fff" title-active-color="#2ABED1" line-width="24" @click="onTabClick">
                           <van-tab title="采购单位">
                           </van-tab>
@@ -116,7 +116,7 @@
                                   <span v-else>--</span>
                               </div>
                               <div class="summary-item">
-                                  <span>涉及评标专家</span>
+                                  <span>同类项目评标专家</span>
                                   <span v-if="cacheImgData.all_review_experts">${cacheImgData.all_review_experts}人</span>
                                   <span v-else>--</span>
                               </div>
@@ -133,7 +133,7 @@
                             <div class="pl-title" @click="goProjectDetail(item.infoid)">${item.projectname}</div>
                             <div class="pl-tags">
                               <span v-if="item.area">${item.area}</span>
-                              <span v-if="item.bidtype">${item.bidtype}</span>
+                              <span v-if="item.subtype">${item.subtype}</span>
                               <span v-if="item.buyerclass">${item.buyerclass}</span>
                               <span v-if="item.bidamount || item.budget">${item.bidamount || item.budget}万元</span>
                             </div>
@@ -343,8 +343,8 @@
                         <div class="jy-empty-img"></div>
                         <div class="jy-empty-text" style="padding-bottom: 0.32rem;">
                           <span style="color: #171826;" v-if="active === 0">${filterData.pname}</span><br/>
-                          <span style="color: #9B9CA3;" v-if="active === 0">暂未采购过同类项目，您可查看前往查看：</span> 
-                          <span style="color: #9B9CA3;" v-if="active === 1">${filterData.area}地区暂无同类项目，您可查看前往查看：</span> 
+                          <span style="color: #9B9CA3;" v-if="active === 0">暂未采购过同类项目，您可前往查看：</span> 
+                          <span style="color: #9B9CA3;" v-if="active === 1">${filterData.area}地区暂无同类项目，您可前往查看：</span> 
                           <div class="a-item navBar">
                             <div class="link-btn" @click="onTabClick(0)" v-if="active !== 0 && listCount.BuyerCount > 0">采购单位同类项目分析</div>
                             <div class="link-btn" @click="onTabClick(1)" v-if="active !== 1 && listCount.AreaCount > 0">${filterData.area}同类项目分析</div>

src/jfw/modules/app/src/web/templates/big-member/page_bid_analysis_pro_list.html

@@ -38,7 +38,7 @@
                 <div class="pl-title" @click="goProjectDetail(item.infoid)">${item.projectname}</div>
                 <div class="pl-tags">
                   <span v-if="item.area">${item.area}</span>
-                  <span v-if="item.bidtype">${item.bidtype}</span>
+                  <span v-if="item.subtype">${item.subtype}</span>
                   <span v-if="item.buyerclass">${item.buyerclass}</span>
                   <span v-if="item.bidamount || item.budget">${item.bidamount || item.budget}万元</span>
                 </div>

src/web/staticres/common-module/analysis-filter/css/analysis-filter.css

@@ -197,9 +197,13 @@
 .van-popover__arrow {
   display: none;
 }
-.select_time .van-hairline--top-bottom::after, .van-hairline-unset--top-bottom::after {
+.van-hairline--top-bottom::after, .van-hairline-unset--top-bottom::after {
   border-width: 0px 0px 1px;
 }
 .select_time.select_area .van-hairline--top-bottom::after, .van-hairline-unset--top-bottom::after {
   border-width: 0px;
+}
+
+.select-year-time{
+  padding-bottom: .48rem;
 }

src/web/staticres/common-module/analysis-filter/js/analysis-filter.js

@@ -153,7 +153,7 @@ var analysisTemp = `
     round
     position="bottom"
     close-icon="clear"
-    class="j-popup collection select_time"
+    class="j-popup collection select_time select-year-time"
     :lazy-render="false"
     overlay-class="j-overlay"
     get-container="body">