feat(levelUpRecords): add new list

src/api/statistics.js

@@ -72,7 +72,6 @@ export function getYesornoList(params) {
   })
 }
 
-
 // 伞下直推列表
 export function getUmbrellaPushList(params) {
   return request({
@@ -126,7 +125,6 @@ export function getResettleAchieveNew(params) {
   })
 }
 
-
 // 出货明细汇总统计列表
 export function getShippingSummary(params) {
   return request({
@@ -248,7 +246,6 @@ export function deleteLcDataList(data) {
   })
 }
 
-
 // 数据报表-联创列表查询单条
 export function getOneLcData(params) {
   return request({
@@ -508,7 +505,6 @@ export function getVertexAchieveStatList(params) {
   })
 }
 
-
 // 订单类型枚举
 export function getOrderType(params) {
   return request({
@@ -552,7 +548,6 @@ export function getMonthlyRankList(params) {
   })
 }
 
-
 // 产品销量排行
 export function getProductSalesStat(params) {
   return request({
@@ -578,7 +573,11 @@ export function waresSales(params) {
   })
 }
 
-
+// 会员升级记录
-
+export function getLevelUpRecordList(params) {
-
+  return request({
-
+    url: '/member/manager/member-level/list',
+    method: 'get',
+    params
+  })
+}

src/router/index.js

@@ -2911,6 +2911,12 @@ export const constantRoutes = [
         component: () => import('@/views/statistics/awardAnalysis'),
         meta: { title: '真实奖衔分析' }
       },
+      {
+        path: 'levelUpRecords',
+        name: 'LevelUpRecords',
+        component: () => import('@/views/statistics/level-up-records/index'),
+        meta: { title: '会员升级记录' }
+      },
       {
         path: 'placementCheck',
         name: 'PlacementCheck',

src/views/information/business/index.vue

@@ -190,22 +190,24 @@
           <el-table-column
             align="center"
             prop="memberCode"
-            :label="'会员编号'"
+            label="会员编号"
+            min-width="110px"
           />
           <el-table-column
             align="center"
             prop="newMemberName"
-            :label="'变更会员姓名'"
+            label="变更会员姓名"
+            width="110px"
           >
             <template slot-scope="scope">
               <el-input v-model="scope.row.newMemberName" />
             </template>
           </el-table-column>
           <el-table-column
-            min-width="130px"
+            min-width="160px"
             align="center"
             prop="newPhone"
-            :label="'变更联系方式'"
+            label="变更联系方式"
           >
             <template slot-scope="scope">
               <el-input v-model="scope.row.newPhone" clearable />
@@ -215,51 +217,56 @@
           <el-table-column
             align="center"
             prop="memberName"
-            :label="'会员姓名'"
+            label="会员姓名"
           />
-          <el-table-column align="center" prop="phone" :label="'联系方式'" />
+          <el-table-column align="center" prop="phone" label="联系方式" min-width="130px" />
-          <el-table-column align="center" prop="pkRegisterGradeVal" :label="'结算等级'" />
+          <el-table-column align="center" prop="pkRegisterGradeVal" label="结算等级" min-width="100px" />
           <el-table-column
             align="center"
             prop="pkAwardsVal"
-            :label="'真实奖衔'"
+            label="真实奖衔"
           />
 
           <el-table-column
             align="center"
             prop="vertexName"
-            :label="'隶属体系'"
+            label="隶属体系"
           />
           <el-table-column
             align="center"
             prop="teamName"
-            :label="'隶属团队'"
+            label="隶属团队"
           />
           <el-table-column
             align="center"
             prop="centerMemberCode"
-            :label="'服务中心编号'"
+            label="服务中心编号"
+            min-width="140"
           />
           <el-table-column
             align="center"
             prop="centerMemberName"
-            :label="'服务中心姓名'"
+            label="服务中心姓名"
+            min-width="140"
           />
 
           <el-table-column
             align="center"
             prop="creationTime"
-            :label="'创建日期'"
+            label="创建日期"
+            min-width="160"
           />
           <el-table-column
             align="center"
             prop="payTime"
-            :label="'支付日期'"
+            label="支付日期"
+            min-width="160"
           />
           <el-table-column
             align="center"
             prop="editNumber"
-            :label="'变更次数'"
+            label="变更次数"
+            min-width="80"
           />
         </el-table>
       </div>

src/views/information/specialBusiness/awardControl.vue

@@ -105,23 +105,22 @@
               <el-form-item :label="'创建时间'">
                 <el-date-picker
                   v-model="creationTime"
+                  style="width: 100%"
                   type="daterange"
-                  @change="changeTime"
                   range-separator="——"
                   :start-placeholder="'开始时间'"
                   :end-placeholder="'结束日期'"
                   value-format="yyyy-MM-dd"
                   :unlink-panels="true"
-                >
+                  @change="changeTime"
-                </el-date-picker>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <div class="searchbox">
                 <el-button class="searchbtn" @click="getData">
-                  {{ '搜索' }}</el-button
+                  搜索</el-button>
-                >
+                <el-button @click="reset"> 重置</el-button>
-                <el-button @click="reset"> {{ '重置' }}</el-button>
               </div>
             </el-col>
           </el-row>
@@ -130,49 +129,45 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button
+            v-hasButtons="['AwardControlAdd']"
             size="small"
             class="thebtn1"
             @click="openDig"
-            v-hasButtons="['AwardControlAdd']"
+          >{{ '添加' }}</el-button>
-            >{{ '添加' }}</el-button
-          >
           <el-button
-            size="small"
-            @click="handleExport"
             v-hasButtons="['AwardControlExport']"
+            size="small"
             style="background-color: #ffad41"
             class="thebtn1"
+            @click="handleExport"
           >
-            {{ '导出' }}</el-button
+            {{ '导出' }}</el-button>
-          >
           <!-- <el-button size="small"
                      class="thebtn1">{{'修改'}}</el-button> -->
           <el-button
+            v-hasButtons="['AwardControlDelete']"
             size="small"
             :disabled="selTable.length == 0"
-            @click="updateShow(selTable)"
-            v-hasButtons="['AwardControlDelete']"
             style="background-color: #ffad41"
             class="thebtn1"
-            >{{ '修改' }}</el-button
+            @click="updateShow(selTable)"
-          >
+          >{{ '修改' }}</el-button>
           <el-button
+            v-hasButtons="['AwardControlDelete']"
             size="small"
             :disabled="selTable.length == 0"
-            @click="delRole(selTable)"
-            v-hasButtons="['AwardControlDelete']"
             style="background-color: #c8161d"
             class="thebtn1"
+            @click="delRole(selTable)"
           >
-            {{ '删除' }}</el-button
+            {{ '删除' }}</el-button>
-          >
         </div>
       </div>
       <div class="main">
         <div class="maintable">
           <el-table
-            :data="tableData"
             v-loading="loading"
+            :data="tableData"
             style="width: 100%"
             height="630px"
             :header-cell-style="{ background: '#EEEEEE' }"
@@ -273,40 +268,40 @@
       />
       <awardDetails
         ref="awardDetails"
+        :sign-type="signType"
+        :is-award="isAward"
         @handleClose="handleClose"
-        :signType="signType"
+      />
-        :isAward="isAward"
-      ></awardDetails>
     </div>
   </div>
 </template>
 
 <script>
-import topBar from "@/components/topBar";
+import topBar from '@/components/topBar'
-import { getvertexValue } from "@/api/member";
+import { getvertexValue } from '@/api/member'
-import awardDetails from "@/views/information/specialBusiness/awardDetails";
+import awardDetails from '@/views/information/specialBusiness/awardDetails'
-import * as api from "@/api/specialBusiness";
+import * as api from '@/api/specialBusiness'
-import { getRouters } from "@/api/settle";
+import { getRouters } from '@/api/settle'
 export default {
-  name: "Qxpz",
+  name: 'Qxpz',
   components: {
     topBar,
-    awardDetails,
+    awardDetails
   },
   data() {
     return {
       selTable: [],
       creationTime: [],
-      signType: "",
+      signType: '',
       isAward: false,
-      value: "",
+      value: '',
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       select: {},
       total: 0,
-      moren: "awardControl",
+      moren: 'awardControl',
       awardsList: [],
       vertexList: [],
       tableData: [],
@@ -314,84 +309,84 @@ export default {
       topList: [
         {
           name: '空单注册',
-          path: "emptyOrder",
+          path: 'emptyOrder',
-          changed: false,
+          changed: false
         },
         {
           name: '修改直推',
-          path: "modifyDirectpush",
+          path: 'modifyDirectpush',
-          changed: false,
+          changed: false
         },
         {
           name: '修改安置',
-          path: "modifyPlacement",
+          path: 'modifyPlacement',
-          changed: false,
+          changed: false
         },
         {
           name: '注水业绩',
-          path: "waterPv",
+          path: 'waterPv',
-          changed: false,
+          changed: false
         },
         {
           name: '修改编号',
-          path: "modifyCode",
+          path: 'modifyCode',
-          changed: false,
+          changed: false
         },
         {
           name: '真实奖衔控制',
-          path: "awardControl",
+          path: 'awardControl',
-          changed: false,
+          changed: false
         },
         {
           name: '修改结算国家',
-          path: "modifySettleCountry",
+          path: 'modifySettleCountry',
-          changed: false,
+          changed: false
         },
         {
           name: '政策币业务',
-          path: "policyMoney",
+          path: 'policyMoney',
-          changed: false,
+          changed: false
         },
         {
           name: '分红配置',
-          path: "bonusConfig",
+          path: 'bonusConfig',
-          changed: false,
+          changed: false
-        },
+        }
-      ],
+      ]
-    };
+    }
   },
   created() {
-    this.getData();
+    this.getData()
-    this.getSelect();
+    this.getSelect()
-    this.getUserRoute();
+    this.getUserRoute()
   },
   methods: {
     changeTime(val) {
-      this.select.startDate = val ? val[0] : "";
+      this.select.startDate = val ? val[0] : ''
-      this.select.endDate = val ? val[1] : "";
+      this.select.endDate = val ? val[1] : ''
     },
     getUserRoute() {
       getRouters().then((res) => {
         res.data.forEach((item) => {
           this.topList.forEach((items) => {
             if (item.path == items.url) {
-              items.changed = true;
+              items.changed = true
             }
-          });
+          })
-        });
+        })
-      });
+      })
     },
     handleClose() {
-      this.isAward = false;
+      this.isAward = false
-      this.getData();
+      this.getData()
     },
     getSelect() {
       api.awardsList().then((res) => {
-        this.awardsList = res.rows;
+        this.awardsList = res.rows
-      });
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
+        this.vertexList = res.data
-      });
+      })
     },
     getData() {
       this.loading = true
@@ -399,18 +394,18 @@ export default {
         .awardsControlList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
           this.loading = false
-          this.tableData = res.rows;
+          this.tableData = res.rows
-          this.total = res.total;
+          this.total = res.total
-        });
+        })
     },
     reset() {
       this.creationTime = []
-      this.select = {};
+      this.select = {}
     },
     openDig() {
-      this.$refs.awardDetails.getAllData(0);
+      this.$refs.awardDetails.getAllData(0)
-      this.signType = 128;
+      this.signType = 128
-      this.isAward = true;
+      this.isAward = true
 
       // this.$router.push({
       //   path: "awardDetails",
@@ -420,9 +415,9 @@ export default {
       // });
     },
     updateShow(item) {
-      this.$refs.awardDetails.getAllData(1, JSON.stringify(item));
+      this.$refs.awardDetails.getAllData(1, JSON.stringify(item))
-      this.signType = 129;
+      this.signType = 129
-      this.isAward = true;
+      this.isAward = true
 
       // this.$router.push({
       //   path: "awardDetails",
@@ -436,25 +431,25 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/member/manage/awards-control/export",
+          '/member/manage/awards-control/export',
           Object.assign({}, this.queryParams, this.select),
           `真实奖衔控制${new Date().getTime()}.xlsx`
-        );
+        )
-      });
+      })
     },
     delRole(item) {
       console.log(
-        "%c [ item ]-356",
+        '%c [ item ]-356',
-        "font-size:13px; background:#493acb; color:#8d7eff;",
+        'font-size:13px; background:#493acb; color:#8d7eff;',
         item
-      );
+      )
       // 130
-      this.$refs.awardDetails.getAllData(2, JSON.stringify(item));
+      this.$refs.awardDetails.getAllData(2, JSON.stringify(item))
-      this.signType = 130;
+      this.signType = 130
-      this.isAward = true;
+      this.isAward = true
       // this.$router.push({
       //   path: "awardDetails",
       //   query: {
@@ -464,18 +459,18 @@ export default {
       // });
     },
     handleSelectionChange(val) {
-      this.selTable = val;
+      this.selTable = val
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
+      }
+      return ''
+    }
+  }
 }
-      return "";
-    },
-  },
-};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table .warning-row {
@@ -505,9 +500,7 @@ export default {
     .searchbox {
       display: flex;
       align-items: center;
-      .searchtitle {
+      padding-left: 10px;
-        margin-right: 10px;
-      }
       .searchbtn {
         background: #c8161d;
         color: #ffffff;

src/views/statistics/level-up-records/constant.js

@@ -0,0 +1,18 @@
+/**
+ * 会员升级记录类型
+ * 1. 自动升级
+ * 2. 手动升级
+ * 3. 购买赠予
+ * 4. 购买升级
+ * 5. 活动升级
+ */
+// 数字作为key，字符串作为value
+const LEVEL_UP_RECORD_TYPE = {
+  1: '自动升级',
+  2: '手动升级',
+  3: '购买赠予',
+  4: '购买升级',
+  5: '活动升级'
+}
+
+export { LEVEL_UP_RECORD_TYPE }

src/views/statistics/level-up-records/index.vue

@@ -0,0 +1,343 @@
+<template>
+  <div class="page">
+    <div class="main">
+      <el-form
+        ref="select"
+        style="padding:0 10px 0 10px;background: #fff"
+        label-width="auto"
+      >
+        <el-row :gutter="20">
+          <!-- 一层 -->
+          <el-col :span="6">
+            <el-form-item label="会员编号">
+              <el-input
+                v-model="form.memberCode"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- <el-col :span="8">
+            <el-form-item label="结算时间范围">
+              <el-date-picker
+                v-model="dateRange"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                format="yyyy-MM-dd"
+                :range-separator="'至'"
+                :start-placeholder="'开始日期'"
+                :end-placeholder="'结束日期'"
+                clearable
+                :picker-options="pickerOptions"
+              />
+            </el-form-item>
+          </el-col> -->
+
+          <el-col
+            :span="10"
+          >
+            <el-button
+              type="primary"
+              size="small"
+              class="my_search"
+              @click="getDataList"
+            > 搜索</el-button>
+            <el-button
+              class="my_reset"
+              @click="reset"
+            > 重置</el-button>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <!-- <div class="maintop">
+        <div class="mainbtn">
+          <el-button
+            size="small"
+            class="thebtn2"
+            :disabled="true"
+            @click="handleExport"
+          > 导出</el-button>
+        </div>
+      </div> -->
+      <div class="mainTable">
+        <div class="itemTrading">
+          <el-table
+            ref="mainTable"
+            v-loading="loading"
+            :data="tableData"
+            height="730px"
+            style="width: 100%"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            show-summary
+          >
+            <!-- <el-table-column
+              type="selection"
+              width="55"
+            /> -->
+            <el-table-column
+              align="center"
+              prop="memberCode"
+              width="150"
+              label="会员编号"
+            />
+            <el-table-column
+              align="center"
+              prop="memberName"
+              width="auto"
+              label="会员姓名"
+            />
+            <el-table-column
+              align="center"
+              prop="memberCode"
+              width="150"
+              label="升级时间"
+            />
+            <el-table-column
+              align="center"
+              prop="gradeNameOld"
+              width="150"
+              label="旧等级"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.gradeNameOld || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="gradeNameNew"
+              width="auto"
+              label="新等级"
+            />
+            <el-table-column
+              align="center"
+              prop="upType"
+              width="auto"
+              label="升级方式"
+              :formatter="upTypeFormatter"
+            />
+          </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 { getLevelUpRecordList } from '@/api/statistics.js'
+import { mapGetters } from 'vuex'
+import { LEVEL_UP_RECORD_TYPE } from './constant'
+export default {
+  name: 'BonusExpansionDelay',
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      total: 0,
+      tableData: [],
+      loading: false,
+      form: {
+        memberCode: ''
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['getUser'])
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    upTypeFormatter(row) {
+      return LEVEL_UP_RECORD_TYPE[row.upType]
+    },
+    reset() {
+      this.form = {
+        memberCode: ''
+      }
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 50
+      this.getDataList()
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          'member/manage/member-structure/export',
+          Object.assign({}, this.queryParams, this.form),
+          `会员升级记录-${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    getDataList() {
+      this.loading = true
+      const params = Object.assign({}, this.queryParams, this.form)
+      getLevelUpRecordList(params)
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+        }).finally(() => {
+          this.loading = false
+        })
+    },
+
+    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-range-editor.el-input__inner {
+  width: 100%;
+}
+::v-deep .el-button {
+  //height: 32px;
+  //line-height: 32px;
+  padding: 8px 20px;
+}
+::v-deep .el-date-editor .el-range__close-icon {
+  margin-top: -10px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  margin-top: -10px;
+}
+::v-deep .el-date-editor .el-range__icon {
+  margin-top: -10px;
+}
+::v-deep .el-cascader input {
+  height: 32px !important;;
+  //line-height: 28px;
+}
+::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+::v-deep .el-form-item__label {
+  color: #333;
+  font-weight: inherit;
+}
+
+::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%;
+}
+.uploadIcon ::v-deep .el-upload--picture-card {
+  display: none !important; /* 上传按钮隐藏 */
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    background: #f9f9f9;
+    //border-radius: 8px;
+    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .maintop {
+      display: flex;
+      //padding: 10px 20px;
+      //padding: 10px 0;
+      justify-content: space-between;
+      align-items: center;
+      .mainbtn {
+        .thebtn1 {
+          background: #3181e5;
+          color: #ffffff;
+        }
+        .thebtn2 {
+          background: #ffad41;
+          color: #ffffff;
+        }
+      }
+      .maintitle {
+        font-size: 10px;
+        font-family: MicrosoftYaHei;
+        color: #999999;
+      }
+    }
+    .mainTable{
+      flex: 1;
+      overflow-y: auto;
+    }
+  }
+  .tem {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    img {
+      width: 28px;
+      height: 20px;
+      margin-right: 3px;
+    }
+  }
+  .isRed {
+    color: #ed1d25;
+  }
+  .isGreen {
+    color: #1ab62b;
+  }
+  .bgImg {
+    width: 48px;
+    height: 48px;
+  }
+}
+.openClose {
+  text-align: right;
+  margin-right: 10px;
+  color: #3181e5;
+}
+.kuang {
+  padding: 5px 20px;
+  background: rgba(255, 255, 255, 0);
+  border-radius: 4px;
+  border: 1px solid #cccccc;
+}
+.heji {
+  margin-top: 10px;
+  .dis {
+    display: flex;
+    justify-content: right;
+    padding: 5px 10px;
+    font-size: 14px;
+    color: #333333;
+    :nth-child(1) {
+      font-size: 14px;
+      font-weight: bold;
+      color: #333333;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

vue.config.js

@@ -44,11 +44,11 @@ module.exports = {
     },
     proxy: {
       '/prod-api': {
-        target: 'http://t-mana.beida413.com',
+        target: 'http://localhost:8080/',
-        changeOrigin: true
+        changeOrigin: true,
-        // pathRewrite: {
+        pathRewrite: {
-        //   '^/prod-api': ''
+          '^/prod-api': ''
-        // }
+        }
       }
     }
     // before: require('./mock/mock-server.js')