数据

src/router/index.js

@@ -44,7 +44,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
- 
+
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),
@@ -65,12 +65,7 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/index_v2'], resolve),
         name: 'Index',
         meta: { title: '首页', icon: 'dashboard', affix: true }
-      },
-      {
-        path: '/coupon/verificationList',
-        component: (resolve) => require(['@/views/coupon/couponData/verificationList'], resolve),
-        hidden: true
-      },
+      }
     ]
   },
   {
@@ -162,7 +157,13 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/coupon/audit/detail'], resolve),
         name: 'CouponAuditDetail',
         meta: { title: '详情', activeMenu: '/coupon/couponAudit'}
-      }
+      },
+      // {
+      //   path: 'verificationList',
+      //   component: (resolve) => require(['@/views/coupon/couponData/verificationList'], resolve),
+      //   name: 'CouponVerificationList',
+      //   meta: { title: '数据', activeMenu: '/coupon/couponList'},
+      // }
     ]
   }
 ]

src/views/coupon/couponData/verificationList.vue

@@ -2,135 +2,58 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-form-item label="微信昵称" prop="receiveNickName">
-        <el-input
-          v-model="queryParams.receiveNickName"
-          placeholder="请输入微信昵称"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.receiveNickName" placeholder="请输入微信昵称" clearable size="small"
+          style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="领取人" prop="receiveUserAccount">
-        <el-input
-          v-model="queryParams.receiveUserAccount"
-          placeholder="请输入领取人"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.receiveUserAccount" placeholder="请输入领取人" clearable size="small"
+          style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="state">
-        <el-select
-          v-model="queryParams.state"
-          placeholder="状态"
-          clearable
-          size="small"
-          style="width: 240px"
-        >I
-        <!-- INI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
-        <el-option
-            key=""
-            label="全部"
-            value=""
-          />
-          <el-option
-            key="INI"
-            label="已领取待核销"
-            value="INI"
-          />
-          <el-option
-            key="USED"
-            label="已核销"
-            value="USED"
-          />
-          <el-option
-            key="EXPIRYED"
-            label="已失效"
-            value="EXPIRYED"
-          />
-         <el-option
-            key="ERR"
-            label="发放失败"
-            value="ERR"
-          />
-          <el-option
-            key="X"
-            label="已删除"
-            value="X"
-          />
+        <el-select v-model="queryParams.state" placeholder="状态" clearable size="small" style="width: 240px">I
+          <!-- INI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
+          <el-option key="" label="全部" value="" />
+          <el-option key="INI" label="已领取待核销" value="INI" />
+          <el-option key="USED" label="已核销" value="USED" />
+          <el-option key="EXPIRYED" label="已失效" value="EXPIRYED" />
+          <el-option key="ERR" label="发放失败" value="ERR" />
+          <el-option key="X" label="已删除" value="X" />
         </el-select>
       </el-form-item>
       <el-form-item label="发放渠道" prop="sendChannel">
-        <el-input
-          v-model="queryParams.sendChannel"
-          placeholder="请输入发放渠道"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.sendChannel" placeholder="请输入发放渠道" clearable size="small" style="width: 240px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="核销时间">
-        <el-date-picker
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-           <el-form-item label="核销人" prop="verificationChannelEmployeeName">
-        <el-input
-          v-model="queryParams.verificationChannelEmployeeName"
-          placeholder="请输入核销人"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="核销人" prop="verificationChannelEmployeeName">
+        <el-input v-model="queryParams.verificationChannelEmployeeName" placeholder="请输入核销人" clearable size="small"
+          style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
-           <el-form-item label="核销门店" prop="verificationChannelName">
-        <el-input
-          v-model="queryParams.verificationChannelName"
-          placeholder="请输入核销门店"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="核销门店" prop="verificationChannelName">
+        <el-input v-model="queryParams.verificationChannelName" placeholder="请输入核销门店" clearable size="small"
+          style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-<el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleAdd"
-            >下载报表</el-button>
-          </el-col>
-        
-         
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAdd">下载报表</el-button>
+      </el-col>
+    </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column label="id" prop="roleId" width="60" >
-        <template  slot-scope="scope">
+      <el-table-column label="id" prop="roleId" width="60">
+        <template slot-scope="scope">
           {{
-            (scope.$index + 1)
-        }}
+              (scope.$index + 1)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="优惠券标题" prop="couponName" width="120" />
@@ -141,11 +64,11 @@
       <el-table-column label="状态" align="center" width="120">
         <template slot-scope="scope">
           <!-- INI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
-          <span v-if="scope.row.state=='INI'">已领取待核销</span>
-          <span v-if="scope.row.state=='USED'">已核销</span>
-          <span v-if="scope.row.state=='EXPIRYED'">已失效</span>
-          <span v-if="scope.row.state=='ERR'">发放失败</span>
-          <span v-if="scope.row.state=='X'">已删除</span>
+          <span v-if="scope.row.state == 'INI'">已领取待核销</span>
+          <span v-if="scope.row.state == 'USED'">已核销</span>
+          <span v-if="scope.row.state == 'EXPIRYED'">已失效</span>
+          <span v-if="scope.row.state == 'ERR'">发放失败</span>
+          <span v-if="scope.row.state == 'X'">已删除</span>
         </template>
       </el-table-column>
       <el-table-column label="核销时间" align="center" prop="verificationTime" width="150">
@@ -153,31 +76,26 @@
           <span>{{ parseTime(scope.row.verificationTime) }}</span>
         </template>
       </el-table-column>
-   <el-table-column label="核销人" align="center" prop="verificationChannelEmployeeName" width="150"/>
-<el-table-column label="核销门店" align="center" prop="verificationChannelName" width="150"/>
-<el-table-column label="使用人" align="center" prop="receiveNickName" width="150"/>
-<el-table-column label="会员体系ID" align="center" prop="memberSysId" width="150"/>
-<el-table-column label="发放渠道" align="center" prop="sendChannel" width="150"/>
+      <el-table-column label="核销人" align="center" prop="verificationChannelEmployeeName" width="150" />
+      <el-table-column label="核销门店" align="center" prop="verificationChannelName" width="150" />
+      <el-table-column label="使用人" align="center" prop="receiveNickName" width="150" />
+      <el-table-column label="会员体系ID" align="center" prop="memberSysId" width="150" />
+      <el-table-column label="发放渠道" align="center" prop="sendChannel" width="150" />
 
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageIndex"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
   </div>
 </template>
 
 <script>
-import { verificationList} from "@/api/coupon/couponData";
+import { verificationList } from "@/api/coupon/couponData";
 
 
 export default {
-  name: "Role",
+  name: "CouponVerificationList",
   dicts: ['sys_normal_disable'],
   data() {
     return {
@@ -240,7 +158,7 @@ export default {
         children: "children",
         label: "label"
       },
-   
+
     };
   },
   created() {
@@ -251,11 +169,13 @@ export default {
     getList() {
       this.loading = true;
       let params = this.queryParams;
-      if(this.dateRange.length!=0){
-         params.verificationStartTime=this.dateRange[0];
-         params.verificationEndTime=this.dateRange[1];
-        }
-   
+      if (this.dateRange.length != 0) {
+        params.verificationStartTime = this.dateRange[0];
+        params.verificationEndTime = this.dateRange[1];
+      }
+
+      params.couponInfoId = this.$route.query.id
+
       verificationList(params).then(
         response => {
           this.roleList = response.rows;
@@ -265,7 +185,7 @@ export default {
       );
     },
 
- 
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -291,7 +211,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     // 更多操作触发
@@ -324,17 +244,17 @@ export default {
     // 树权限（全选/全不选）
     handleCheckedTreeNodeAll(value, type) {
       if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
       } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
       }
     },
     // 树权限（父子联动）
     handleCheckedTreeConnect(value, type) {
       if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
+        this.form.menuCheckStrictly = value ? true : false;
       } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
+        this.form.deptCheckStrictly = value ? true : false;
       }
     },
     /** 新增按钮操作 */
@@ -356,9 +276,9 @@ export default {
           roleMenu.then(res => {
             let checkedKeys = res.checkedKeys
             checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                    this.$refs.menu.setChecked(v, true ,false);
-                })
+              this.$nextTick(() => {
+                this.$refs.menu.setChecked(v, true, false);
+              })
             })
           });
         });
@@ -367,7 +287,7 @@ export default {
     },
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {
-      if(value !== '2') {
+      if (value !== '2') {
         this.$refs.dept.setCheckedKeys([]);
       }
     },
@@ -387,12 +307,12 @@ export default {
       });
     },
     /** 分配用户操作 */
-    handleAuthUser: function(row) {
+    handleAuthUser: function (row) {
       const roleId = row.roleId;
       this.$router.push("/system/role-auth/user/" + roleId);
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.roleId != undefined) {
@@ -414,7 +334,7 @@ export default {
       });
     },
     /** 提交按钮（数据权限） */
-    submitDataScope: function() {
+    submitDataScope: function () {
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys();
         dataScope(this.form).then(response => {
@@ -427,12 +347,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function () {
         return delRole(roleIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -443,8 +363,8 @@ export default {
       }).then(response => {
         this.$download.name(response.msg);
         this.exportLoading = false;
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };
-</script>
+</script>
\ No newline at end of file

src/views/coupon/list/index.vue

@@ -195,8 +195,11 @@ export default {
         // row.status = row.status === 'P' ? 'A' : 'P'
       })
     },
-    handleMoreData() {
-
+    handleMoreData(row) {
+      this.$tab.closePage({ name: 'CouponVerificationList' })
+      this.$nextTick(() => {
+        this.$router.push({ name: "CouponVerificationList", query: { id: row.couponInfoId } });
+      })
     },
     /** 提交按钮 */
     submitForm: function() {