jufubao-admin-library 1.1.74 → 1.1.76

package/library/viewModules/viewsFinance/router/finance.js

@@ -10,7 +10,7 @@ const financeRouter = {
   redirect: '/finance/index',
   meta: {
     title: '我的账户',
-    icon: 'xdicon_dingdandaifukuan',
+    icon: 'xdicon_yonghu1',
     iconSize: 20,
     roles: [wallet.listHomeWallet]
   },
@@ -21,7 +21,7 @@ const financeRouter = {
       component: () => import('@/viewsFinance/index'),
       meta: {
         title: '我的账户',
-        icon: 'xdicon_dingdandaifukuan',
+        icon: 'xdicon_yonghu1',
         roles: [wallet.listHomeWallet]
       }
     }

package/library/viewModules/viewsFinance/schemas/trade.record.js

@@ -148,6 +148,19 @@ module.exports = {
       },
       disabled: true,
       "role": "FINANCE-PARTNER.WALLET_LIST_PARTNER_CHANNEL_SUPPLIERS"
-    }
+    },
+    {
+      title: "加盟商明细-服务费返点结算明细",
+      mapFn: "getByCardFeeInfo",
+      path: "/finance-partner/v1/trade-record/get-card-service-fee-rule",
+      isRule: false,
+      params: {
+        trade_nnid: ["交易号", "String", "必填"],
+        partner_id: ["加盟商ID", "String", "必填"],
+        wallet_type: ["钱包类型", "String", "必填"],
+      },
+      disabled: true,
+      "role": ""
+    },
   ]
-} 
+}

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -152,6 +152,12 @@
               </div>
             </div>
           </template>
+          <template slot="amount" slot-scope="scope">
+            <xd-table-price :price="scope.row.amount"></xd-table-price>
+            <div v-if="isShowDeductDetail(scope.row)" style="display:flex; justify-content: center; align-items: center">
+              <el-button type="primary" size="mini" @click="handleShowDetail(scope.row)">查看明细</el-button>
+            </div>
+          </template>
         </xd-table>
       </div>
       <div class="app-container__list-pagination">
@@ -198,6 +204,32 @@
     >
       <el-input maxlength="20" v-model="exportName" placeholder=""></el-input>
     </xd-dialog>
+    <el-dialog
+      v-if="dialogTableVisible"
+      title="查看明细"
+      :visible.sync="dialogTableVisible"
+      width="800px"
+      @close="handleClose"
+    >
+      <div v-if="detailCard" style="height: 20px;display: flex;justify-content: flex-start;align-items: center">
+        <span style="color: #999;">卡号：</span>
+        <span>{{detailCard}}</span>
+      </div>
+      <div v-if="detailTips" style="height: 40px;display: flex;justify-content: flex-start;align-items: center">
+        <i class="el-icon-info" style="color: #666;font-size: 18px; margin-right:5px;margin-top: -1px"></i>
+        <span>{{detailTips}}</span>
+      </div>
+      <el-table
+        border
+        :data="detailList"
+        style="width: 100%"
+      >
+        <el-table-column prop="project" label="项目" width="100"></el-table-column>
+        <el-table-column prop="service_fee" label="税率" width="100"></el-table-column>
+        <el-table-column prop="amount_info" label="金额"></el-table-column>
+        <el-table-column prop="comment" label="备注"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -213,6 +245,8 @@ import { baseJsDateToTime } from "@/utils/xd.base.js";
 import checkPermission from "@/utils/permission";
 import roleTRecord from "@/constant/modules/tradeRecord.js";
 import roleWallet from "@/constant/modules/wallet.js";
+import XdTablePrice from "@/components/XdTablePrice.vue";
+import {Loading} from "element-ui";
 
 export default {
   name: "PagePartnerDetail",
@@ -221,6 +255,7 @@ export default {
     XdSearch, //搜查插件
     XdTable,
     XdDialog,
+    XdTablePrice
   },
   data() {
     return {
@@ -320,7 +355,13 @@ export default {
       channel_code: null,
       supplier_ids: null,
       supplierList: [],
-      showSupplier: false
+      showSupplier: false,
+
+      //查看明细
+      dialogTableVisible:false,
+      detailList:[],
+      detailTips:'',
+      detailCard:'',
     };
   },
   computed: {
@@ -354,8 +395,52 @@ export default {
       "listPartner",
       "countPartner",
       "getSupplierList",
+      'getByCardFeeInfo'
     ]),
     ...mapActions("wallet", ["correctPartnerAmount"]),
+
+    //===扣款明细==========
+    isShowDeductDetail(row){
+      return ['card_fee_a'].includes(row.trade_type);
+    },
+    getShowDeductFn(row){
+      let temp = {
+        card_fee_a: 'getByCardFeeInfo',
+      }
+      return temp[row.trade_type]
+    },
+    getShowDeductParams(row){
+      let temp = {};
+      if(row.trade_type === 'card_fee_a'){
+        temp['trade_nnid'] = row['trade_nnid'];
+        temp['partner_id'] = row['partner_id'];
+        temp['wallet_type'] = this.wallet_type
+      }
+      return temp;
+    },
+    handleClose(){
+      this.dialogTableVisible = false;
+      this.detailTips = '';
+      this.detailCard = ''
+    },
+    handleShowDetail(row){
+      let fnName = this.getShowDeductFn(row);
+      let loading = Loading.service({})
+      this[fnName](this.getShowDeductParams(row))
+        .then(res=>{
+          this.detailList = res.data['list_rule_item'];
+          this.detailTips = res.data['formula'];
+          this.detailCard = res.data['card_number']
+          this.dialogTableVisible = true;
+          loading.close()
+        })
+        .catch(err=>{
+          console.error(err);
+          loading.close()
+        })
+    },
+    //===扣款明细==========
+
     handleCorrect() {
       console.log(this.correctForm);
       const { amount, correct_type } = this.correctForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {