Merge branch 'dev/v1.1.9_yf' of jianyu/web into feature/v1.1.9

apps/bigmember_pc/src/router/router-interceptors.js

@@ -62,6 +62,7 @@ const powerCheckWhiteList = [
   'report_download_record',
   'api-doc',
   'zhima',
+  'ent_report_year'
 ]
 
 const regListCheck = function (regList, path) {

apps/bigmember_pc/src/views/portrayal/components/EntNewContent.vue

@@ -694,11 +694,13 @@ const onKnowConfirm = () => {
                       </template>
                       <!-- 出质人 -->
                       <template #pledgor="scope">
-                        <span :class="{'highlight-clickable': scope.row.company_id}" @click="goEntPortrayal(scope.row.company_id)">{{scope.row.pledgor}}</span>
+                        <span v-if="scope.row.pledgor" :class="{'highlight-clickable': scope.row.company_id}" @click="goEntPortrayal(scope.row.company_id)">{{scope.row.pledgor}}</span>
+                        <span v-else class="no-data-line">-</span>
                       </template>
                       <!-- 质权人 -->
                       <template #pledgee="scope">
-                        <span :class="{'highlight-clickable': scope.row.company_id}" @click="goEntPortrayal(scope.row.company_id)">{{scope.row.pawnee}}</span>
+                        <span v-if="scope.row.pawnee" :class="{'highlight-clickable': scope.row.company_id}" @click="goEntPortrayal(scope.row.company_id)">{{scope.row.pawnee}}</span>
+                        <span v-else class="no-data-line">-</span>
                       </template>
                     </ModuleTable>
                     <!-- 行政处罚 -->
@@ -710,7 +712,8 @@ const onKnowConfirm = () => {
                     >
                       <!-- 处罚内容(点击可展开) -->
                       <template #content="scope">
-                        <TextExpand :text="scope.row.punish_content"></TextExpand>
+                        <TextExpand v-if="scope.row.punish_content" :text="scope.row.punish_content"></TextExpand>
+                        <span v-else class="no-data-line">-</span>
                       </template>
                     </ModuleTable>
                     <!-- 经营异常 -->
@@ -742,7 +745,8 @@ const onKnowConfirm = () => {
                     >
                       <!-- 被执行人 -->
                       <template #person="scope">
-                        <span>{{scope.row.executee}}</span>
+                        <span v-if="scope.row.executee">{{scope.row.executee}}</span>
+                        <span v-else class="no-data-line">-</span>
                       </template>
                     </ModuleTable>
                   </template>
@@ -939,8 +943,15 @@ const onKnowConfirm = () => {
     color: $color_main;
     cursor: pointer;
   }
+  .no-data-line{
+    color: #999;
+    text-align: center;
+  }
 }
 ::v-deep{
+  .module-card:first-child{
+    padding-top: 16px;
+  }
   .tab-contents-card{
     .el-loading-mask{
       left: -40px;
@@ -1022,5 +1033,17 @@ const onKnowConfirm = () => {
     // 解决 scrollIntoView 被固定定位元素遮挡的问题
     scroll-margin-top: 100px;
   }
+  .text-container{
+    text-align: justify;
+  }
+  // 表格某一项内容设置对齐方式（class类名即为字段名）
+  .td_change_content,
+  .td_included_reason,
+  .td_content_before,
+  .td_content_after,
+  .td_allow_content{
+    text-align: justify;
+  }
+
 }
 </style>

apps/bigmember_pc/src/views/portrayal/components/common/ModuleTable.vue

@@ -88,7 +88,7 @@ const handleCurrentChange = (page) => {
           :prop="col.prop"
           :label="col.label"
           :width="col.width"
-          align="center"
+          :align="col.align || 'center'"
           :cell-class-name="col.cellClass"
           v-bind="col.attrs"
         >
@@ -99,7 +99,10 @@ const handleCurrentChange = (page) => {
             </template>
             <!-- 默认文本渲染 -->
             <template v-else>
-              {{ scope.row[col.prop] }}
+              <template v-if=" scope.row[col.prop]">
+                <div :class="'td_' + col.prop">{{ scope.row[col.prop] }}</div>
+              </template>
+              <span v-else class="no-data-line">-</span>
             </template>
           </template>
         </el-table-column>
@@ -136,7 +139,6 @@ const handleCurrentChange = (page) => {
 </template>
 <style scoped lang="scss">
 .module-table-container {
-
   .cell {
     color: #1d1d1d;
   }
@@ -170,6 +172,9 @@ const handleCurrentChange = (page) => {
     margin-top: 16px;
     text-align: center;
   }
+  .no-data-line{
+    color: #999999;
+  }
 }
 </style>
 <style lang="scss">
@@ -177,9 +182,13 @@ const handleCurrentChange = (page) => {
   overflow-x: hidden;
 }
 .el-table {
+  .cell{
+    word-break: break-word;
+  }
   th.el-table__cell > .cell {
     padding-left: 0!important;
-    padding-right: 0;
+    padding-right: 0!important;
+    
   }
   thead > tr > th {
     background: #f9fafb !important;
@@ -187,5 +196,8 @@ const handleCurrentChange = (page) => {
   td.el-table__cell div{
     color: #1D1D1D;
   }
+  thead{
+    color: #686868!important;
+  }
 }
 </style>

apps/bigmember_pc/src/views/portrayal/components/ent-new/BiddingList.vue

@@ -50,7 +50,7 @@ const onLimitChange = (data) => {
 }
 </script>
 <template>
-<ModuleCard id="bid_dynamics">
+<ModuleCard id="bid_dynamics" style="padding-top:0;">
   <div id="chartInfo" class="tab-content-item bg-white">
     <div>
       <!-- 中标动态 -->
@@ -90,16 +90,18 @@ const onLimitChange = (data) => {
   </div>
 </ModuleCard>
 </template>
-<style lang="scss">
-.bidinfoactive {
-  .pro_a_h_left::after {
-    display: none;
+<style lang="scss" scoped>
+::v-deep{
+  .bidinfoactive {
+    .pro_a_h_left::after {
+      display: none;
+    }
+  }
+  .info-list .article-item{
+    margin-left: 0!important;
+  }
+  .c-tab-container{
+    margin: 0 -16px;
   }
-}
-.info-list .article-item{
-  margin-left: 0!important;
-}
-.c-tab-container{
-  margin: 0 -16px;
 }
 </style>