Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test

src/api/giftGoods.js

@@ -401,3 +401,11 @@ export function tourismRuleConfigSubmit(data) {
   })
 }
 
+// 直推升级数据
+export function directUpgradeRecordList(params) {
+  return request({
+    url: '/sale/manage/recommend/directPushUpgradeList',
+    method: 'get',
+    params
+  })
+}

src/router/index.js

@@ -2008,6 +2008,7 @@ export const constantRoutes = [
         path: 'directUpgrade',
         name: 'DirectUpgrade',
         component: ParentView,
+        meta: { title: '直推升级' },
         children: [
           {
             path: 'directUpgradeList',
@@ -2021,6 +2022,12 @@ export const constantRoutes = [
             component: () => import('@/views/marketing/directGifts/addDirect'),
             meta: { title: '基本信息' },
             hidden: true
+          },
+          {
+            path: 'directUpgradeRecordList',
+            name: 'DirectUpgradeRecordList',
+            component: () => import('@/views/marketing/directGifts/record'),
+            meta: { title: '直推升级数据' }
           }
         ]
       },

src/views/marketing/directGifts/index.vue

@@ -374,7 +374,7 @@ export default {
         this.download(
           'activity/manage/recommend/export',
           Object.assign({}, { actType: 12 }, this.queryParams, this.select),
-          `${'直推赠送'}${new Date().getTime()}.xlsx`
+          `${'直推升级'}${new Date().getTime()}.xlsx`
         )
       })
     },

src/views/marketing/directGifts/record.vue

@@ -0,0 +1,315 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: kBank
+ * @Date: 2022-10-24 15:45:01
+-->
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form
+          ref="select"
+          :model="select"
+          label-width="auto"
+        >
+          <el-row :gutter="40">
+            <!-- 一层 -->
+            <el-col :span="6">
+              <el-form-item :label="'活动名称'">
+                <el-input
+                  v-model="select.actName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="'会员编号'">
+                <el-input
+                  v-model="select.memberCode"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'活动开始日期'">
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'活动结束日期'">
+                <el-date-picker
+                  v-model="creationTime1"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime1"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4">
+              <el-button
+                type="primary"
+                size="small"
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
+              <el-button
+                size="small"
+                class="resetBtn"
+                @click="reset"
+              > {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="main_a">
+        <div class="mainbtn">
+          <el-button
+            v-hasButtons="['directExport']"
+            size="small"
+            class="exportBtn"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
+        </div>
+        <div class="maintable">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            style="width: 100%"
+            height="710px"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+            />
+            <el-table-column
+              align="center"
+              prop="actName"
+              :label="'活动名称'"
+            />
+            <el-table-column
+              align="center"
+              prop="memberCode"
+              :label="'会员编号'"
+            />
+            <el-table-column
+              align="center"
+              prop="memberName"
+              :label="'会员姓名'"
+            />
+            <el-table-column
+              align="center"
+              prop="pkSettleGrade"
+              :label="'原等级'"
+            />
+            <el-table-column
+              align="center"
+              prop="pkRecommendGrade"
+              :label="'新等级'"
+            />
+            <el-table-column
+              align="center"
+              prop="actStartDate"
+              :label="'活动开始时间'"
+            />
+            <el-table-column
+              align="center"
+              prop="actEndDate"
+              :label="'活动结束时间'"
+            />
+            <el-table-column
+              align="center"
+              prop="upgradeTime"
+              :label="'升级年月'"
+            />
+            <el-table-column
+              align="center"
+              prop="creationTime"
+              :label="'创建时间'"
+            />
+
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/giftGoods.js'
+export default {
+  name: 'Bzpz',
+  components: {
+    topBar
+  },
+  filters: {
+    isAgree(val) {
+      if (!val) {
+        return '允许'
+      } else {
+        return '禁止'
+      }
+    }
+  },
+  data() {
+    return {
+      creationTime: [],
+      creationTime1: [],
+      creationTime2: [],
+      select: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      total: 0,
+      tableData: [],
+      loading: false,
+      moren: 'directUpgradeRecordList',
+      topList: [
+        {
+          name: '直推升级数据',
+          path: 'directUpgradeRecordList'
+        }
+      ],
+      form: {
+        name: ''
+      }
+    }
+  },
+  mounted() {
+    // 获取列表
+    this.getDataList()
+  },
+  methods: {
+    // 重置
+    reset() {
+      this.select = {}
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.getDataList()
+    },
+
+    changeTime(val) {
+      this.select.startActStartDate = val ? val[0] : ''
+      this.select.startActEndDate = val ? val[1] : ''
+    },
+    changeTime1(val) {
+      this.select.endActStartDate = val ? val[0] : ''
+      this.select.endActEndDate = val ? val[1] : ''
+    },
+    // 获取列表
+    getDataList() {
+      this.loading = true
+      api
+        .directUpgradeRecordList(
+          Object.assign({}, this.queryParams, this.select)
+        )
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
+    },
+    handleSelectionChange(val) {},
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          'sale/manage/recommend/directPushUpgradeExport',
+          Object.assign({}, { actType: 12 }, this.queryParams, this.select),
+          `${'直推升级数据'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    // background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    .main_a {
+      background: #fff;
+      border-radius: 8px;
+      justify-content: space-between;
+      align-items: center;
+      box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    }
+    .mainbtn {
+      padding: 0;
+    }
+    .maintable {
+      flex: 1;
+    }
+  }
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+.form_all {
+  padding: 0 20px;
+  margin-bottom: 10px;
+  background: #fff;
+}
+</style>