Merge branch 'feature/消费线索' into master

src/views/recharge/consume.vue

@@ -28,6 +28,7 @@
         </el-select> -->
         <el-input v-model="listParams.searchParam" class="w250" :placeholder="placeholder" clearable @change="loadAll(true)"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
       </div>
+      <!-- 短信营销 -->
       <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'marketing'">
         <el-table-column align="left" width="170" prop="sendTime" label="发送时间">
           <template slot-scope="scope">
@@ -41,13 +42,15 @@
         <el-table-column align="left" width="100" prop="countNum" label="计费条数">
           <template slot-scope="scope">{{ scope.row.countNum }}条 </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="主门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="模板ID" align="left" width="100" prop="chartsDate"></el-table-column>
+        <el-table-column label="触发计划名称" :show-overflow-tooltip="true" align="left" width="300" prop="sourceName"></el-table-column>
+        <el-table-column label="计划创建人" align="left" width="100" prop="sourceCreatorName"></el-table-column>
+        <!-- <el-table-column label="模板ID" align="left" width="100" prop="chartsDate"></el-table-column> -->
         <el-table-column label="短信内容" align="left" min-width="200" prop="remark">
           <template slot-scope="scope">
             <el-popover class="item" trigger="hover" width="200" v-if="scope.row.remark && scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
@@ -57,6 +60,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- 短信验证码 -->
       <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'sms'">
         <el-table-column align="left" width="170" prop="createTime" label="发送时间">
           <template slot-scope="scope">
@@ -67,7 +71,7 @@
           </template>
         </el-table-column>
         <el-table-column align="left" width="150" prop="receivePhone" label="接收号码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="主门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
@@ -82,6 +86,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- 语音验证码 -->
       <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'voice'">
         <el-table-column align="left" prop="createTime" label="发送时间" width="170px">
           <template slot-scope="scope">
@@ -92,22 +97,21 @@
           </template>
         </el-table-column>
         <el-table-column align="left" prop="receivePhone" label="接收号码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="主门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
-
         <el-table-column label="状态" align="left" prop="status">
           <template slot-scope="scope">
             {{ scope.row.status === 1 ? '成功' : '失败' }}
           </template>
         </el-table-column>
       </el-table>
-      <!-- 不良评价回访 -->
+      <!-- 双向呼叫 -->
       <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'call'">
-        <el-table-column align="left" width="160" prop="createTime" label="呼叫时间">
+        <el-table-column align="left" width="200" prop="createTime" label="呼叫时间">
           <template slot-scope="scope">
             <p class="cell-time">
               {{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
@@ -115,19 +119,21 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" min-width="320" prop="storeName" label="主门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
+        <el-table-column label="触发计划名称" align="left" :show-overflow-tooltip="true" min-width="320" prop="sourceName"></el-table-column>
+        <el-table-column label="计划创建人" align="left" width="150" prop="sourceCreatorName"></el-table-column>
         <el-table-column align="left" width="150" prop="clerkName" label="主叫">
           <template slot-scope="scope">
             <p>{{ scope.row.clerkName || '--' }}</p>
             <p class="gray">{{ scope.row.sendPhone }}</p>
           </template>
         </el-table-column>
-        <el-table-column align="left" width="150" prop="memberId" label="被叫(会员)">
+        <el-table-column align="left" width="160" prop="memberId" label="被叫(会员)">
           <template slot-scope="scope">
             <img :src="scope.row.memberPic || defaultAvatar" width="32" height="32" alt="" />
             <div class="inline-block">
@@ -148,6 +154,7 @@
           <template slot-scope="scope">{{ Number(scope.row.callFee / 1000).toFixed(2) }}元</template>
         </el-table-column>
       </el-table>
+
       <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'record'">
         <el-table-column align="left" width="160" prop="createTime" label="呼叫时间">
           <template slot-scope="scope">
@@ -157,12 +164,14 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" prop="storeName" width="350" label="主门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
+        <el-table-column label="触发计划名称" align="left" width="350" prop="sourceName" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计划创建人" align="left" width="100" prop="sourceCreatorName"></el-table-column>
         <el-table-column align="left" width="150" prop="clerkName" label="主叫">
           <template slot-scope="scope">
             <p>{{ scope.row.clerkName || '--' }}</p>