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

packages/conv/creditScore/AppGridMemberScore/components/gmScore.vue

@@ -10,7 +10,7 @@
     <template slot="tabs">
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :is="tab.comp" v-if="currIndex === String(i)" :ref="tab.name"
+          <component :is="tab.comp" v-if="currIndex === String(i)" :ref="tab.name" v-on="$listeners"
                      :areaId="areaId" :instance="instance" :dict="dict" :permissions="permissions"/>
         </el-tab-pane>
       </el-tabs>

packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="gridScoreDetail">
     <!-- <ai-list> -->
-      <ai-title slot="title" title="网格员积分详情" isShowBottomBorder :isShowBack="true" />
+      <ai-title slot="title" title="网格员积分详情" isShowBottomBorder :isShowBack="true" @onBackClick="cancel(false)"/>
     <!-- </ai-list> -->
     <el-row style="margin-top: 20px;">
       <div class="card_list">
@@ -160,6 +160,12 @@ export default {
     },
     getTableData() {},
     getListInit() {},
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'gridScoreManage',
+        isRefresh: !!isRefresh
+      })
+    }
   },
   mounted() {
     this.getColEcherts()
@@ -174,9 +180,8 @@ export default {
 .gridScoreDetail {
   width: 100%;
   height: 100%;
-  padding: 0 0 20px 0;
+  padding: 0 20px;
   box-sizing: border-box;
-  margin-top: 20px;
   .card_list {
     display: flex;
     .card {

packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue

@@ -5,7 +5,7 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" size="small" icon="iconfont iconAdd" @click="dialog = true">批量调整积分</el-button>
-            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="toDetail">跳转详情</el-button>
+            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="toDetail('')">跳转详情</el-button>
             <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="所属网格" clearable
                       @change="getListInit()">
               <el-option
@@ -147,18 +147,15 @@ export default {
       }
     },
     onConfirm() {},
-    toDetail() {
+    toDetail(id) {
-      console.log('跳转详情');
       this.$emit('change', {
         type: 'gridScoreDetail',
         params: {
-          // id
+          id: id || ''
         }
       })
-      console.log('跳转');
     }
   },
-
 }
 </script>
 

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -41,7 +41,6 @@
           <ai-empty v-if="false" style="height: 300px;"></ai-empty>
         </div>
       </div>
-      
     </el-row>
 
     <ai-card>
@@ -110,6 +109,13 @@
         <el-button @click="dialog = false">关闭</el-button>
       </span>
     </el-dialog>
+
+    <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter>
+      <el-date-picker v-model="timeList" size="small" type="daterange" value-format="yyyy-MM-dd"
+        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+      </el-date-picker>
+      <el-button slot="footer" @click="selectDete" type="primary">确认</el-button>
+    </ai-dialog>
   </section>
 </template>
 
@@ -140,6 +146,8 @@ export default {
       timeCheck: ['昨日','近7天','近30天','自定义'],
       currrntTime: '0',
       dialog: false,
+      dialogDate: false,
+      timeList: ''
     }
   },
   computed: {
@@ -290,7 +298,11 @@ export default {
     getTableData() {},
 
     timeChange(index) {
-      this.currrntTime = index
+      if(index == 3) {
+        this.dialogDate = true
+      } else {
+        this.currrntTime = index
+      }
     },
     open(id) {
       this.dialog = true
@@ -298,9 +310,24 @@ export default {
     },
     getDetail(id) {
 
-    }
+    },
 
+    selectDete() {
+      if(!this.timeList || !this.timeList.length) {
+        return this.$message.error('请选择自定义时间');
+      }
 
+      if(this.isEffectTimeSelect) { //宣发效果
+        this.timeListEffect = this.timeList
+        this.effectType = 3
+        // this.getEffect()
+      } else {  //宣发明细
+        this.timeListDepart = this.timeList
+        this.departType = 3
+        // this.getDepart()
+      }
+      this.dialogDate = false
+    },
 
 
   },

project/sass/apps/Announce/AppAnnounce/components/Detail.vue

@@ -616,8 +616,12 @@
       border: 1px solid #D0D4DC;
 
       p {
-        line-height: 1.3;
+        display: -webkit-box;
-        padding: 8px 12px;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+        line-height: 38px;
+        padding: 0px 12px;
+        overflow: hidden;
       }
 
       .msg-bottom {