Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into feature/福利中心-礼品管理

src/api/gic-card.js

@@ -26,111 +26,37 @@ let card = {
   updateCardStock: '/coupon/update-coupon-stock', // 修改库存
   deleteCard: '/coupon/delete-coupon', // 删除卡券
   disableCard: '/coupon/disable-coupon', // 禁用卡券
-  couponLogPage: '/coupon-log/coupon-log-page', // 卡券领取列表
-  giveLogList: '/coupon-gic/gic-coupon-give-log-page', // 卡券转赠记录 TODO:
+  couponLogPage: '/coupon/coupon-log-page', // 卡券领取列表
+  giveLogList: '/coupon/coupon-give-log-page', // 卡券转赠记录
   groupSendAdd: {
     // 新建投放 TODO:
-    url: '/coupon-gic/coupon-puton',
+    url: '/coupon/coupon-puton',
     method: 'post',
     useFormData: true,
   },
-  groupSendList: '/coupon-gic/coupon-plan-page', // 卡券投放列表 TODO:
-  groupSendInfo: '/coupon-gic/coupon-puton-detail', // 卡券投放详情 TODO:
-  groupSendInfoLog: '/coupon-gic/coupon-puton-log-page', // 卡券投放记录 TODO:
-  couponPutonFailLogList: '/coupon-gic/coupon-puton-fail-log-page', // 卡券投放失败详情 TODO:
-  stopGroupSend: '/coupon-gic/stop-coupon-puton-timed-task', // 禁用投放 TODO:
   codeErrorList: '/gic-coupon-code-error-page', // 查询导入券券码错误列表 TODO:
   checkDemoCode: {
     // 根据demo code TODO:
-    url: '/coupon-gic/check-demo-code',
+    url: '/coupon/check-demo-code',
     alertError: false
   },
   cardDestoryList: '/destroy-plugin/page-destroy-plan', // 卡券销毁分页列表 TODO:
-  exportDestroyLogExcel: {
-    // 卡券销毁记录导出 TODO:
-    url: '/export-destroy-log-excel',
-    method: 'post',
-    export: true,
-    headers: { 'Content-Type': 'application/json' }
-  },
   saveCoupDestoryPlan: {
     // 保存卡券销毁 TODO:
     url: '/destroy-plugin/save-destroy-plan',
     method: 'post',
     useFormData: true,
   },
-  couponlogList: '/coupon-gic/coupon-log-page', // 会员领取记录 TODO:
-  exportCoupReceivedLog: {
-    // 导出会员领取记录 TODO:
-    url: '/export-coup-received-log-excel',
-    method: 'post',
-    export: true,
-    headers: { 'Content-Type': 'application/json' }
-  },
-  exportCoupGiveLog: {
-    // 导出转赠记录 TODO:
-    url: '/export-gic-coupon-give-log-excel',
-    method: 'post',
-    export: true,
-    headers: { 'Content-Type': 'application/json' }
-  },
-  exportCouponPutonLog: {
-    // 导出卡券投放详情 TODO:
-    url: '/export-coupon-puton-log-excel',
-    method: 'post',
-    export: true,
-    headers: { 'Content-Type': 'application/json' }
-  },
-  couponConsumeOrder: '/coupon-gic/coupon-consume-order', // 核销 - 订单信息 TODO:
-  couponConsume: '/coupon-gic/coupon-consume', // 核销 - 核销 TODO:
-  couponDestroy: '/coupon-gic/coupon-destroy', // 销毁 TODO:
-};
-
-// 卡券同步库存
-let syncStock = {
-  getCouponStockInfo: '/coupon-gic/get-coupon-stock-info', // 获取卡券同步信息 TODO:
-  returnStock: '/coupon-gic/return-welfare-coupon', // 卡券返还 TODO:
-  syncStock: '/coupon-gic/syn-welfare-coupon', // 卡券同步库存 TODO:
-  getWelfareStock: '/coupon-gic/get-welfare-stock', // 获取福利库存 TODO:
-  getSyncWelfareList: '/coupon-gic/syn-welfare-coupon-page', // 卡券同步记录列表 TODO:
-};
-
-// 卡券展架
-let shelf = {
-  saveShelf: {
-    // 保存（新增、更新） TODO:
-    url: '/coupon-gic/save-shelf',
-    method: 'post',
-    useFormData: true,
-  },
-  getShelfList: '/coupon-gic/list-shelf-page', // 获取展架列表 TODO:
-  getShelfInfo: '/coupon-gic/shelf-detail', // 获取展架详情 TODO:
-  delShelf: '/coupon-gic/delete-shelf', // 删除某个展架 TODO:
-  getShelfCoupon: '/coupon-gic/list-shelf-coupon', // 获取展架使用的卡券 TODO:
+  couponlogList: '/coupon/coupon-log-page', // 会员领取记录 TODO:
+  couponConsumeOrder: '/coupon/coupon-consume-order', // 核销 - 订单信息 TODO:
+  couponConsume: '/coupon/coupon-consume', // 核销 - 核销 TODO:
+  couponDestroy: '/coupon/coupon-destroy', // 销毁 TODO:
 };
 
-// 其他接口
-let other = {
-  auditList: '/coupon/audit-log-page', // 审核记录 TODO:
-  // 子应用相关配置↓
-  auditSettingInfo: '/coupon/audit-setting-info', // 子应用审核配置 TODO:
-  auditSettingSave: {
-    // 子应用保存更新 TODO:
-    url: '/coupon/audit-setting',
-    method: 'post',
-    useFormData: true
-  },
-  getCouponSendLogList: '/coupon-gic/coupon-send-log', // 卡券发放成功记录 TODO:
-  getMarketAppcodes: '/market/market-appcodes', // 来源模块codeList TODO:
-  getCouponSendFailLogList: '/coupon-gic/coupon-send-fail-log', // 卡券发放失败记录 TODO:
-};
 
 card = getFetch(card, welfarePrefix);
-syncStock = getFetch(syncStock, welfarePrefix);
-shelf = getFetch(shelf, welfarePrefix);
-other = getFetch(other, welfarePrefix);
 
-export default { ...card, ...other, ...syncStock, ...shelf };
+export default { ...card };
 
 
 export const downloadCouponCSV = config.api + welfarePrefix + '/download-code-csv-template'; // 下载导入GIC券号csv示例文件  TODO:

src/components/layout/aside-menu.vue

@@ -130,8 +130,8 @@ export default {
       if(project == '' || project == 'index') {
         return [];
       }
-      // const isCard = project.includes('card');
-      const currentRoute = this.routePath.filter(v => v.menuCode.includes('card'));
+      const code = project.includes('card') ? 'card' : 'gift';
+      const currentRoute = this.routePath.filter(v => v.menuCode.includes(code));
       return currentRoute || [];
     }
   },
@@ -147,7 +147,8 @@ export default {
     },
     '$route.path': {
       handler() {
-        this.getActiveIndex();
+        console.log(this.project);
+        // this.getActiveIndex();
       }
     }
   }

src/config/mapping/gic-card.js

@@ -39,18 +39,13 @@ export const cardType = {
 };
 
 /**
- * 核销状态
- * 3：已发放，4：已领取，5：已使用，6：已到期,7:已销毁, 8:已占用, 9:转赠中, 10: 已转赠）
+ * 转赠状态
+ * （1：转赠中，2：已撤回，3：已完成）
  */
 export const sendType = {
-  3: { label: '已发放', value: 1, cl: 'state-point-success' },
-  4: { label: '已领取', value: 1, cl: 'state-point-success' },
-  5: { label: '已使用', value: 2,  cl: 'state-point-success' },
-  6: { label: '已到期', value: 3,  cl: 'state-point-default' },
-  7: { label: '已销毁', value: 4, cl: 'state-point-error' },
-  8: { label: '已占用', value: 1, cl: 'state-point-warning' },
-  9: { label: '转赠中', value: 2,  cl: 'state-point-loading-scale' },
-  10: { label: '已转赠', value: 3,  cl: 'state-point-success' },
+  1: { label: '转赠中', value: 1,  cl: 'state-point-loading-scale' },
+  2: { label: '已撤回', value: 1, cl: 'state-point-warning' },
+  3: { label: '已完成', value: 3,  cl: 'state-point-success' },
 };
 
 

src/views/gic-card/send-list.vue

@@ -2,26 +2,25 @@
   <div class="p20" v-loading="loading">
     <div class="pb20 clearfix flex-center">
       <el-input placeholder="请输入关键字搜索" class="w400 mr10" v-model="listParams.search" clearable @change="refresh">
-        <el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
-          <el-option label="卡券名称" :value="1"></el-option>
-          <el-option label="卡券代码" :value="2"></el-option>
-          <el-option label="转赠会员姓名" :value="3"></el-option>
-          <el-option label="转赠会员卡号" :value="4"></el-option>
-          <el-option label="受赠会员姓名" :value="5"></el-option>
-          <el-option label="受赠会员卡号" :value="6"></el-option>
-          <el-option label="受赠会员昵称" :value="7"></el-option>
+        <el-select v-model="listParams.searchColumn" slot="prepend" style="width:140px;" placeholder="请选择" @change="refresh">
+          <el-option label="卡券名称" value="cardName"></el-option>
+          <el-option label="卡券代码" value="couponCode"></el-option>
+          <el-option label="转赠会员姓名" value="memberName"></el-option>
+          <el-option label="转赠会员卡号" value="memberCardNo"></el-option>
+          <el-option label="受赠会员姓名" value="giveMemberName"></el-option>
+          <el-option label="受赠会员卡号" value="giveMemberCardNo"></el-option>
         </el-select>
       </el-input>
       <!-- <dm-perm-button :disabled="$itemPerm($itemCode.gicCardGiveLogExport)" type="primary" icon="iconfont-market4 icon-icon_yunxiazai mr5" @click="showExport">数据导出</dm-perm-button> -->
     </div>
     <div class="table-search-head">
-      <el-select class="dm-select mr10 w140" clearable v-model="listParams.status" placeholder="所有转赠状态" @change="refresh">
-        <el-option v-for="(v, i) in status" :key="i" :label="v.label" :value="v.value"></el-option>
+      <el-select class="dm-select mr10 w140" clearable v-model="listParams.statusFlag" placeholder="所有转赠状态" @change="refresh">
+        <el-option v-for="(v, i) in statusFlag" :key="i" :label="v.label" :value="v.value"></el-option>
       </el-select>
       领取时间：<el-date-picker class="w250 mr10" v-model="dateTime2" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
       转赠时间：<el-date-picker class="w250" v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
     </div>
-    <el-table tooltip-effect="dark" :data="tableList" :max-height="mainHeight(54 + 50)" style="width:100%" :default-sort="{prop: 'giveTime', order: 'descending'}">
+    <el-table tooltip-effect="dark" :data="tableList" :max-height="mainHeight(54 + 50)" style="width:100%" :default-sort="{prop: 'giveTime', order: ''}" @sort-change="sortChange">
       <el-table-column label="转赠会员" min-width="120" fixed="left">
         <template slot-scope="scope">
           <member-info :member-name="scope.row.memberName" :member-image="scope.row.memberImage" :member-phone="scope.row.memberPhone"></member-info>
@@ -81,16 +80,17 @@ export default {
       dateTime2: [ , ],
       listParams: {
         search: '',
-        searchType: 1,
-        status: '',
+        searchColumn: 'cardName',
+        statusFlag: '',
         giveBeginTime: '',
         giveEndTime: '',
         receiveBeginTime: '',
         receiveEndTime: '',
         currentPage: 1,
-        pageSize: 20
+        pageSize: 20,
+        sortOrder: '' // 默认可以不传; asc:升序; desc:倒序
       },
-      status: Object.keys(sendType).map(v => { return sendType[v]; }),
+      statusFlag: Object.keys(sendType).map(v => { return sendType[v]; }),
       total: 0,
       tableList: [],
       // 导出组件
@@ -112,6 +112,10 @@ export default {
   },
   methods: {
     listTime,
+    sortChange(sort) {
+      this.listParams.sortOrder = sort.order ? sort.order == 'ascending' ? 'asc' : 'desc' : '';
+      this.refresh();
+    },
     formatSendStatus(row) {
       const st = sendType[row.status];
       if(st) {
@@ -124,6 +128,7 @@ export default {
       return cardType[row.cardType].label;
     },
     getTableList() {
+      return;
       if(this.loading) {
         return;
       }