zhangsiya пре 1 година
родитељ
комит
0a7dd5d977

+ 3 - 3
apps/bigmember_pc/src/components/collect-info/CollectInfo.vue

@@ -124,7 +124,7 @@
                 <div class="long-control" v-if="moduleShow.job">
                   <el-form-item label="职位 :" prop="job">
                     <el-select
-                      popper-class="custom-select"
+                      popper-class="collect-custom-select"
                       v-model="form.job"
                       placeholder="请选择职位"
                       class="data-short-input item-input job-input"
@@ -144,7 +144,7 @@
                     <el-select
                       style="margin-left: 12px"
                       v-if="showBranch"
-                      popper-class="custom-select"
+                      popper-class="collect-custom-select"
                       v-model="form.branch"
                       placeholder="请选择部门"
                       class="data-short-input item-input job-input"
@@ -1266,7 +1266,7 @@ export default {
 .el-select-dropdown.custom-select{
   z-index: 3100 !important;
 }
-.custom-select {
+.collect-custom-select {
   z-index: 3100 !important;
   margin-top: 0 !important;
   border: 1px solid #2cb7ca;

+ 1 - 1
apps/bigmember_pc/src/components/download-report/DownloadBottomTip.vue

@@ -81,7 +81,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  z-index: 100;
+  z-index: 9;
   .free-experience {
     color: $color_main;
     margin:0 9px;

+ 1 - 6
apps/bigmember_pc/src/views/download-pdf/entReport.vue

@@ -106,7 +106,7 @@
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>行业:{{ getFormatIndustry(analysisCondition.scopeClass) }}</p>
           <p><span>√</span>采购单位类型:{{getFormatBuyerClass(analysisCondition.s_buyerClass)}}</p>
-          <p><span>√</span>成交时间:{{analysisCondition.timeRange | formatTimeRange}}</p>
+          <p><span>√</span>成交时间:{{analysisCondition.timeRange}}</p>
           <div class="tip-red">注:以下分析统计已根据项目去重</div>
         </div>
         <h2>1、概况</h2>
@@ -469,11 +469,6 @@ export default {
         strArr.push(obj[item])
       }
       return strArr.join(',')
-    },
-    formatTimeRange (value) {
-      if(!value) return ''
-      const arr = value.split('_')
-      return arr[0] + '/01/01-' + arr[1] + '/12/31'
     }
   },
   watch: {

+ 1 - 6
apps/bigmember_pc/src/views/download-pdf/propReport.vue

@@ -100,7 +100,7 @@
           <p><span>√</span>搜索范围:{{ analysisCondition.matchRange | formatSelectType}}</p>
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>行业:{{ getFormatIndustry(analysisCondition.scopeClass) }}</p>
-          <p><span>√</span>发布时间:{{analysisCondition.timeRange | formatTimeRange}}</p>
+          <p><span>√</span>发布时间:{{analysisCondition.timeRange}}</p>
           <div class="tip-red">注:仅针对报告时间段内发布了结果类公告的项目进行分析(已根据项目去重)</div>
         </div>
         <h2>1.概况</h2>
@@ -587,11 +587,6 @@ export default {
         strArr.push(obj[item])
       }
       return strArr.join(',')
-    },
-    formatTimeRange (value) {
-      if(!value) return ''
-      const arr = value.split('_')
-      return arr[0] + '/01/01-' + arr[1] + '/12/31'
     }
   },
   watch: {},

+ 2 - 2
apps/bigmember_pc/src/views/reportDownload/record.vue

@@ -454,8 +454,8 @@ export default {
               v.rangeTimeEnd = new Date(rangeTimeArr[1] * 1000).getTime()
             } else if(v.timeRange) {
               const rangeTimeArr = v.timeRange.split('_')
-              v.rangeTimeStart = rangeTimeArr[0] + '-01-01'
-              v.rangeTimeEnd = rangeTimeArr[1] + '-12-31'
+              v.rangeTimeStart = rangeTimeArr[0]
+              v.rangeTimeEnd = rangeTimeArr[1]
             }
             const creatTime = v.l_createTime ? new Date(v.l_createTime * 1000).pattern('yyyyMMdd') : new Date().pattern('yyyyMMdd')
             const typeName = v.type ? this.typeObj[v.type.toString()] : '分析报告'