update: 短信营销

src/views/card/merge-list.vue

@@ -32,8 +32,9 @@
       </el-table-column>
       <el-table-column label="操作" align="left" width="120px" fixed="right">
         <template slot-scope="scope">
-          <el-button type="text" @click="$router.push(`/card/merge/edit/${scope.row.cardPackageId}`)">修改</el-button>
-          <dm-delete @confirm="del(scope.row)" tips="是否删除该卡券包？">
+          <el-button v-if="scope.row.canEdit" type="text" @click="$router.push(`/card/merge/edit/${scope.row.cardPackageId}`)">修改</el-button>
+          <el-button v-else type="text" @click="$router.push(`/card/merge/edit/${scope.row.cardPackageId}?isView=1`)">查看</el-button>
+          <dm-delete v-if="scope.row.canEdit" @confirm="del(scope.row)" tips="是否删除该卡券包？">
             <el-button type="text">删除</el-button>
           </dm-delete>
         </template>

src/views/message/importSendList.vue

@@ -37,7 +37,13 @@
       <el-table-column min-width="120" align="left" prop="totalFeeNum" label="计费条数"></el-table-column>
       <el-table-column min-width="120" align="left" label="状态">
         <template slot-scope="scope">
-          <span v-html="filterStatus(scope.row)"></span>
+          <span v-if="scope.row.sendStatus === 5"><span class="dm-status--primary--flash"></span>执行中</span>
+          <span v-else-if="filterStatus(scope.row.sendStatus)" :class="'dm-status--' + filterStatus(scope.row.sendStatus).type">
+            {{ filterStatus(scope.row.sendStatus).label }}
+            <el-tooltip v-if="scope.row.sendStatus == 2 && scope.row.failReason" :content="scope.row.failReason" placement="top">
+              <i class="el-icon-warning" style="color:#f56c6c;cursor:pointer;margin-left:3px;"></i>
+            </el-tooltip>
+          </span>
           <time-counts v-if="scope.row.sendStatus == 0" class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
         </template>
       </el-table-column>
@@ -80,7 +86,7 @@ export default {
         pageSize: 20
       },
       // 发送状态（-1: 已失效; 0：定时执行，1：执行完毕，2：执行失败,3:无可用模板;4.执行中）
-      status: [{ value: -1, label: '已失效' }, { value: 0, label: '定时执行' }, { value: 1, label: '执行完毕' }, { value: 2, label: '执行失败' }, { value: 3, label: '无可用模板' }, { value: 5, label: '执行中' }], // eslint-disable-line
+      status: [{ value: 0, label: '定时执行', type: 'warning' }, { value: 1, label: '已执行', type: 'success' }, { value: 2, label: '执行失败', type: 'danger' }, { value: 5, label: '执行中', type: 'primary--flash' }, { value: -1, label: '已失效', type: 'danger' }], // eslint-disable-line
       total: 0,
       loading: false,
       tableList: [],
@@ -110,22 +116,12 @@ export default {
     },
     // 列表状态过滤器
     // -1: 已失效; 0：定时执行，1：执行完毕，2：执行失败,3:无可用模板;4.执行中
-    filterStatus(row) {
-      let _content = '';
-      if (row.sendStatus == -1) {
-        _content = `<div class="dm-status--info">已失效</div>`;
-      } else if (row.sendStatus == 0) {
-        _content = `<div class="dm-status--warning">定时执行</div>`;
-      } else if (row.sendStatus == 1) {
-        _content = `<div class="dm-status--success">执行完毕</div>`;
-      } else if (row.sendStatus == 2) {
-        _content = `<div class="dm-status--default">执行失败</div>`;
-      } else if (row.sendStatus == 3) {
-        _content = `<div class="dm-status--default">无可用模板</div>`;
-      } else if (row.sendStatus == 4) {
-        _content = `<div class="dm-status--primary">执行中</div>`;
-      }
-      return _content;
+    filterStatus(val) {
+      let result = null;
+      this.status.forEach(v => {
+        if (val === v.value) result = v;
+      });
+      return result;
     },
     // 加载列表
     async getTableList() {

src/views/recharge/record.vue

@@ -37,6 +37,20 @@
         <template slot-scope="scope"> {{ (scope.row.totalFee / 100).toFixed(2) }}元 </template>
       </el-table-column>
       <el-table-column align="left" prop="reason" label="充值原因" show-overflow-tooltip></el-table-column>
+      <el-table-column label="图片凭证">
+        <template slot-scope="scope">
+          <!-- <el-image v-for="(item, index) in getUrls(scope).slice(0, 3)" :key="`${currentPage}-${item}`" style="width: 36px; height: 36px" :src="item" :preview-src-list="getUrls(scope, index)" lazy>
+            <div slot="placeholder" class="image-slot">
+              <i class="el-icon-picture-outline"></i>
+            </div>
+          </el-image> -->
+          <viewer :options="options" :images="getUrls(scope)" class="viewer" ref="viewer">
+            <template #default="scope2">
+              <img style="width: 36px; height: 36px;margin-left:5px;cursor:pointer" v-for="src in scope2.images" :src="src" :key="src" />
+            </template>
+          </viewer>
+        </template>
+      </el-table-column>
     </el-table>
     <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
   </section>
@@ -44,9 +58,12 @@
 <script>
 import { rechargeRecord } from '@/service/api/rechargeApi.js';
 import { formatDateTimeByType } from '@/utils/index.js';
+import 'viewerjs/dist/viewer.css';
+import { component as Viewer } from 'v-viewer';
 
 export default {
   name: 'recharge-record',
+  components: { Viewer },
   data() {
     return {
       formatDateTimeByType,
@@ -70,6 +87,11 @@ export default {
     this.$store.commit('mutations_breadcrumb', [{ name: '企业管理', path: '' }, { name: '计费中心', path: '/recharge' }, { name: '充值记录', path: '' }]); // eslint-disable-line
   },
   methods: {
+    getUrls(scope) {
+      let urls = scope.row.imageUrls ? scope.row.imageUrls.split(',') : [];
+      urls = urls.filter(el => el);
+      return urls;
+    },
     onChangeFeeType() {
       this.listParams.deductType = '';
       this.onSearch();