jufubao-admin-library 1.1.160 → 1.1.162

package/library/pageComponents/modules/JfbProductSku.vue

@@ -141,6 +141,7 @@
       uiSkusHeaders(){
         let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' :this.$setting['system'] === 'open-dist' ?'分销价':'进货价';
         return [
+          {"type": "normal", "prop": "product_sku", "align": "center", "min-width": 200, "label": "规格ID"},
           {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
           this.isShowPurchasePrice && {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
           {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
@@ -181,7 +182,7 @@
       getTableDataFromResponseData(data = []) {
         let list = this.$xdHelper.cloneDeep(data);
         return list.map((item) => {
-          let {specs, stocks, sku_uniq_id, standards} = item;
+          let {specs, stocks, sku_uniq_id, standards,product_sku} = item;
           let imgStandIndex = standards.findIndex((ss) => ss.image);
           if (imgStandIndex > -1) {
             let imgUrl = standards[imgStandIndex].image;
@@ -215,6 +216,7 @@
             ...specs,
             ...stocks,
             sku_uniq_id,
+            product_sku,
             standards,
           };
         });

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

@@ -67,7 +67,18 @@ const balanceRouter = {
         activeMenu: "/balance/list",
         roles: [tradeRecord.listOpenApi]
       }
-    }
+    },
+    {
+      path: "detail_invoice/:id",
+      name: "PageInvoiceDetail",
+      component: () => import("@/viewsFinance/balance/detail_invoice"),
+      hidden: true,
+      meta: {
+        title: "供应商明细对账",
+        activeMenu: "/balance/list",
+        // roles: [tradeRecord.listSupplier]
+      }
+    },
   ]
 }
 

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

@@ -161,6 +161,107 @@ module.exports = {
       },
       disabled: true,
     },
+    {
+      title: "供货商发票管理-列表",
+      mapFn: "billListInvoiceStat",
+      path: '/finance-partner/v1/supplier-bill/list-invoice-stat',
+      isRule: false,
+      params: {
+        supplier_id: ["supplier_id", "Number", "选填"],
+        start_uninvoice_amount: ["待开票开始金额", "Number", "选填"],
+        end_uninvoice_amount: ["待开票结束金额", "Number", "选填"],
+        supplier_name: ["供货商名称", "string", "选填"],
+        page_size: ["每页条数", "number", "非必填"],
+        page_token: ["翻页标识", "string", "非必填"],
+      },
+      disabled: true,
+      role: "FINANCE-PARTNER.BILL_LIST_INVOICE_STAT"
+    },
+    {
+      title: "供货商发票管理-统计",
+      mapFn: "billCountInvoiceStat",
+      path: '/finance-partner/v1/supplier-bill/count-invoice-stat',
+      isRule: false,
+      params: {
+        supplier_id: ["supplier_id", "Number", "选填"],
+        start_uninvoice_amount: ["待开票开始金额", "Number", "选填"],
+        end_uninvoice_amount: ["待开票结束金额", "Number", "选填"],
+        supplier_name: ["供货商名称", "string", "选填"],
+        page_size: ["每页条数", "number", "非必填"],
+        page_token: ["翻页标识", "string", "非必填"],
+      },
+      disabled: true,
+      role: ""
+    },
+    {
+      title: "供货商发票管理-对账明细",
+      mapFn: "billListInvoiceStatRecord",
+      path: '/finance-partner/v1/supplier-bill/list-invoice-stat-record',
+      isRule: false,
+      params: {
+        supplier_id: ["supplier_id", "Number", "选填"],
+        start_time: ["start_time", "Number", "选填"],
+        end_time: ["end_time", "Number", "选填"],
+        invoice_number: ["发票号", "string", "选填"],
+        type: ["类型", "string", "选填"],
+        op_user_id: ["操作人", "string", "选填"],
+        page_size: ["每页条数", "number", "非必填"],
+        page_token: ["翻页标识", "string", "非必填"],
+      },
+      disabled: true,
+      role: "FINANCE-PARTNER.LIST_INVOICE_STAT_RECORD"
+    },
+    {
+      title: "供货商发票管理-对账明细统计",
+      mapFn: "billCountInvoiceStatRecord",
+      path: '/finance-partner/v1/supplier-bill/count-invoice-stat-record',
+      isRule: false,
+      params: {
+        supplier_id: ["supplier_id", "Number", "选填"],
+        start_time: ["start_time", "Number", "选填"],
+        end_time: ["end_time", "Number", "选填"],
+        invoice_number: ["发票号", "string", "选填"],
+        type: ["类型", "string", "选填"],
+        op_user_id: ["操作人", "string", "选填"],
+        page_size: ["每页条数", "number", "非必填"],
+        page_token: ["翻页标识", "string", "非必填"],
+      },
+      disabled: true,
+      role: ""
+    },
+     {
+      title: "供货商发票管理-对账明细导出",
+      mapFn: "billListInvoiceStatRecordExport",
+      isRule: false,
+      disabled: true,
+      role: "FINANCE-PARTNER.LIST_INVOICE_STAT_RECORD_EXPORT"
+    },
+    {
+      title: "供货商发票管理-发票金额矫正",
+      mapFn: "billCorrectInvoiceRecord",
+      path: '/finance-partner/v1/supplier-bill/correct-invoice-record',
+      isRule: false,
+      data: {
+        supplier_id: ["supplier_id", "Number", "必填"],
+        amount: ["金额", "Number", "必填"],
+        info_des: ["信息", "Number", "必填"],
+      },
+      disabled: true,
+      role: "FINANCE-PARTNER.CORRECT_INVOICE_RECORD"
+    },
+    {
+      mapFn: 'walletListSubPartnerLib',
+      isRule: false,
+      title: '下级加盟商列表',
+      path: '/finance-partner/v1/wallet/list-sub-partner',
+      params: {
+        partner_id: ['partner_id', 'String', '选填'],
+        partner_name: ['partner_name', 'String', '选填'],
+        page_size: ['每页', 'Number', '必填'],
+        page_token: ['页数', 'String', '必填'],
+      },
+      disabled: true,
+    },
   ],
 
 }

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listInvoice.vue

@@ -0,0 +1,222 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__search">
+      <xd-search
+        dateFilter
+        v-if="searchForm.length > 0"
+        v-model="searchParams"
+        :list="searchForm"
+        @onSearch="handleSearch"
+        @onDone="getList"
+      >
+      </xd-search>
+    </el-card>
+    <el-card class="app-container__list">
+      <div class="app-container__list-table">
+        <xd-table
+          :headers="headers"
+          :list="tables"
+          is-border
+          @onClick="handleTableClick"
+        ></xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :page="page_token"
+          :total="total"
+          :limit.sync="page_size"
+          :autoScroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+
+<script>
+import XdSearch from "@/components/XdSearch";
+import XdPagination from "@/components/XdPagination.vue";
+import XdTable from "@/components/XdTable";
+import { mapActions } from "vuex"
+import { getOptions } from "@/utils/options"
+import { baseJsDateToTime } from "@/utils/xd.base.js"
+import checkPermission from "@/utils/permission"
+import roleTRecord from "@/constant/modules/tradeRecord.js"
+
+export default {
+  name: "listInvoice",
+  components: {
+    XdPagination, //翻译插件
+    XdSearch, //搜查插件
+    XdTable
+  },
+  data() {
+    return {
+
+      //分页参数
+      page_token: 1, //当前页面数量
+      hasNextPage: true, //是否有下一页
+      page_size: 20, //搜索参数
+      searchForm: [], //搜索区域模块表单
+      searchParams: null, //搜索参数
+      totalData: {},
+      total: 0,
+      categoryList: [],
+
+      //列表对象
+      tables: [],
+    }
+  },
+  computed: {
+    isDetail(){
+      return checkPermission(roleTRecord.billListInvoiceStatRecord);
+    },
+    //列表头部配置项
+    headers(){
+      return [
+        { "type": "normal", "prop": "supplier_id", "align": "center", "label": "供货商ID" },
+        { "type": "normal", "prop": "supplier_name", "align": "center", "minWidth": 200, "label": "供货商名称" },
+        { "type": "price", "prop": "invoice_amount", "align": "center", "width": 100, "label": "已开票金额", "unit": "元"},
+        { "type": "price", "prop": "uninvoice_amount", "align": "center", "width": 100, "label": "待开票金额", "unit": "元"},
+        { "type": "normal", "prop": "updated_time", "align": "center", "minWidth": 200, "label": "更新时间" },
+        this.isDetail&&{
+          "type": "operate", "align": "center", "label": "操作",
+          "values": [
+            { "ui": "text-button", "name": "对账", "type": "text", "event": "detail" },
+          ]
+        }
+      ].filter(item => item);
+    }
+  },
+  created() {
+    this.initSearchForm();
+  },
+  methods: {
+    ...mapActions("tradeRecord", ["billListInvoiceStat","billCountInvoiceStat",]),
+    //相除
+    divide(price) {
+      return this.$xdHelper.divisionFloatNumber(price, 100);
+    },
+    /**
+     * @description 获取数据列表
+     */
+    getList() {
+      let copySearchParams = this.$xdHelper.cloneDeep(this.searchParams)
+      if(this.searchParams.start_uninvoice_amount){
+        copySearchParams.start_uninvoice_amount = this.searchParams.start_uninvoice_amount*100;
+      }
+      if(this.searchParams.end_uninvoice_amount){
+        copySearchParams.end_uninvoice_amount = this.searchParams.end_uninvoice_amount*100;
+      }
+      //请求数据
+      let params = {
+        ...copySearchParams,
+        page_token: this.page_token,
+        page_size: this.page_size
+      };
+      console.log(params)
+      let loading = this.$loading({});
+      this.billListInvoiceStat(params).then(res => {
+        loading.close();
+        this.tables = res.data.list.map(item => {
+          item['updated_time'] = item['updated_time'] ? baseJsDateToTime(item['updated_time']) : "";
+          return item;
+        });
+        this.getCount();
+      }).catch(err => {
+        loading.close();
+      })
+    },
+    getCount(){
+       let params = {
+        ...this.searchParams,
+        page_token: this.page_token,
+        page_size: this.page_size
+      };
+      this.billCountInvoiceStat(params).then(res => {
+       this.total = res.data.total_size;
+      }).catch(err => {
+        
+      })
+    },
+   
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch({ action, form }) {
+      this.page_token = 1;
+      this.getList();
+    },
+    handleTableClick({value, row}){
+      if(value.event === "detail"){
+        this.$router.push({
+          path: "/balance/detail_invoice/" + row.supplier_id,
+          query: {
+            supplier_id: row.supplier_id,
+            supplier_name: row.supplier_name,
+          }
+        })
+      }
+    },
+    /**
+     * @description 初始化搜索模块
+     */
+    initSearchForm() {
+      getOptions({
+        server: 'finance-partner',
+        fn: 'wallet',
+        path: 'p1',
+        params: {
+          type: 'supplier'
+        }
+      }).then(res=>{
+        let {list_settlement_method} = res.data
+        list_settlement_method.unshift({
+          label: "全部",
+          value: ""
+        })
+        this.searchForm = [
+          {
+            label: "供货商名称",
+            ele: "el-input",
+            valueKey: "supplier_name",
+            value: "",
+            placeholder: "请输入供货商名称"
+          },
+          {
+            label: "供货商ID",
+            ele: "el-input",
+            valueKey: "supplier_id",
+            value: "",
+            placeholder: "请输入供货商ID"
+          },
+          {
+            label: '待开票金额', //label
+            ele: 'xd-range', //package 名称
+            valueKey: ['start_uninvoice_amount', 'end_uninvoice_amount'], //form[valueKey]
+            value: ['', ''], //v-model
+            placeholder: ['开始金额', '结束金额'],
+            width: 400
+          },
+        ];
+      })
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination(page) {
+      this.page_token = page;
+      this.getList();
+    }, //todo
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listPartner.vue

@@ -74,6 +74,8 @@ export default {
         { "type": "normal", "prop": "partner_name", "align": "center", "minWidth": 200, "label": "加盟商名称" },
         { "type": "normal", "prop": "wallet_type_name", "align": "center", "minWidth": 200, "label": "账户类型" },
         { "type": "price", "prop": "amount", "align": "center", "width": 100, "label": "账户余额", "unit": "元"},
+        { "type": "price", "prop": "today_pure_amount", "align": "center", "minWidth": 100, "label": "今日消费", "unit": "元"},
+        { "type": "price", "prop": "yesterday_pure_amount", "align": "center", "minWidth": 100, "label": "昨日消费", "unit": "元"},
         { "type": "normal", "prop": "updated_time", "align": "center", "minWidth": 200, "label": "更新时间" },
         checkPermission([roleTRecord.listPartner]) && {
           "type": "operate", "align": "center", "label": "操作",
@@ -119,7 +121,7 @@ export default {
       let params = {
         ...this.searchParams,
         page_token: this.page_token,
-        page_size: this.page_size
+        page_size: this.page_size,
       };
       console.log(params)
       let loading = this.$loading({});
@@ -127,6 +129,8 @@ export default {
         loading.close();
         this.tables = res.data.list.map(item => {
           item['updated_time'] = item['updated_time'] ? baseJsDateToTime(item['updated_time']) : "";
+          item.today_pure_amount = item['trade_stat']['today_pure_amount']
+          item.yesterday_pure_amount = item['trade_stat']['yesterday_pure_amount']
           return item;
         });
         this.total = res.data.total_size;

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

@@ -0,0 +1,470 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__search">
+      <div slot="header" class="flex list_header">
+        <div>供应商发票对账明细</div>
+      </div>
+      <xd-search
+        dateFilter
+        timeType
+        v-if="searchForm.length > 0"
+        v-model="searchParams"
+        :list="searchForm"
+        @onSearch="handleSearch"
+        @onDone="getList"
+      >
+      </xd-search>
+    </el-card>
+    <el-card class="app-container__list">
+      <div class="app-container__list-pagination">
+        <div></div>
+        <div class="table-stat">
+          <p v-if="countData">
+            总充值：<span class="_mo">{{divide(countData.total_recharge_amount)}}元</span>
+            提现总额：<span class="_mo">{{divide(countData.total_withdraw_amount)}}元</span>
+            矫正金额：<span class="_mo">{{divide(countData.total_correct_amount)}}元</span>
+            已开票金额：<span class="_mo">{{divide(countData.total_invoiced_amount)}}元</span>
+            发票矫正金额：<span class="_mo">{{divide(countData.total_invoice_correct_amount)}}元</span>
+            待开票金额：<span class="_mo p_red">{{divide(countData.total_invoiced_amount)}}元</span>
+          </p>
+          <div style="display: flex;">
+            <el-button type="primary" v-if="isEdit" @click="handleCorrect">发票金额矫正</el-button>
+            <el-button type="primary" v-if="isExport" @click="doExport">导出</el-button>
+          </div>
+        </div>
+      </div>
+      <div class="app-container__list-table">
+        <xd-table
+          :headers="headers"
+          :list="tables"
+          is-border
+        >
+        <template slot="amount" slot-scope="scope">
+          <div><span :style="{color:scope.row.amount>=0?'red':'green'}">{{ $xdHelper.divisionFloatNumber(scope.row.amount, 100).toFixed(2) }}</span>元</div>
+        </template>
+        </xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :page="page_token"
+          :total="total"
+          :limit.sync="page_size"
+          :autoScroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+    <xd-dialog :show.sync="dialogShow" width="50%" title="发票金额矫正">
+      <xd-base-dynamic-field
+        ref="form"
+        :list="formList"
+        size="medium"
+        :key="formKey"
+        v-model="formParams"
+        :picker-options="{}"
+        :time-type="true"
+        label-width="120px"
+      >
+      </xd-base-dynamic-field>
+      <div slot="btn">
+        <el-button @click="handleCorrectCancel">取消</el-button>
+        <el-button type="primary" @click="handleCorrectSure">确定矫正</el-button>
+      </div>
+    </xd-dialog>
+    <xd-dialog @onConfirm="handleExport" :show.sync="showExport" width="350px" title="导出文件名称">
+      <el-input maxlength="20" v-model="exportName" placeholder=""></el-input>
+    </xd-dialog>
+  </div>
+</template>
+
+
+<script>
+import XdSearch from "@/components/XdSearch";
+import XdPagination from "@/components/XdPagination.vue";
+import XdTable from "@/components/XdTable";
+import { mapActions } from "vuex"
+import { getOptions } from "@/utils/options"
+import XdDialog from "@/components/XdDialog"
+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 XdBaseDynamicField from "@/components/XdBaseDynamicField"
+import { Loading } from 'element-ui'
+
+export default {
+  name: "PageInvoiceDetail",
+  components: {
+    XdPagination, //翻译插件
+    XdSearch, //搜查插件
+    XdTable,
+    XdDialog,
+    XdBaseDynamicField,
+  },
+  data() {
+    return {
+      roleWallet,
+
+      //分页参数
+      page_token: 1, //当前页面数量
+      hasNextPage: true, //是否有下一页
+      page_size: 20, //搜索参数
+      searchForm: [], //搜索区域模块表单
+      searchParams: null, //搜索参数
+      totalData: {},
+      total: 0,
+      categoryList: [],
+      dialogShow: false,
+      correctForm: {},
+
+      //列表对象
+      tables: [],
+      headers: [
+        { "type": "normal", "prop": "record_id", "align": "center","label": "记录ID" },
+        { "type": "normal", "prop": "type_name", "align": "center", "label": "记录类型" },
+        { "type": "price", "prop": "amount", "align": "center", "label": "总金额" },
+        { "type": "normal", "prop": "info_des", "align": "center","label": "信息" },
+        { "type": "normal", "prop": "op_user_name", "align": "center", "label": "操作人" },
+        { "type": "normal", "prop": "created_time", "align": "center", "label": "操作时间" },
+      ],
+      showExport: false,
+      exportName: '供货商明细对账',
+      formParams:null,
+      formList:[],
+      formKey:'formKey',
+      countData:null,
+      listTypeData:[],
+    }
+  },
+  computed: {
+    supplier_id(){
+      return this.$route.params.id;
+    },
+    supplier_name(){
+      return this.$route.query.supplier_name;
+    },
+    isEdit(){
+      return checkPermission(roleTRecord.billCorrectInvoiceRecord);
+    },
+    isExport(){
+      return checkPermission(roleTRecord.billListInvoiceStatRecordExport);
+    }
+  },
+  created() {
+    getOptions({
+      server: 'finance-partner',
+      fn: 'supplier-bill/invoice',
+      path: 'p1',
+    }).then(res=>{
+      this.listTypeData = res.data.list_type
+      this.initSearchForm();
+    })
+    
+  },
+  methods: {
+    ...mapActions("tradeRecord", ["billListInvoiceStatRecord","billCountInvoiceStatRecord","billCorrectInvoiceRecord"]),
+    handleCorrectSure(){
+      this.$refs.form.submit().then(res=>{
+        let copyFormParams = this.$xdHelper.cloneDeep(this.formParams);
+        copyFormParams.amount = copyFormParams.amount*100;
+        let loading = Loading.service({})
+        this.billCorrectInvoiceRecord({...copyFormParams,supplier_id:this.supplier_id})
+        .then(res=>{
+          this.dialogShow = false;
+          this.formParams = null;
+          this.$message.success('操作成功');
+          this.getList();
+          loading.close();
+        })
+      }).catch(err=>{
+          loading.close();
+      });
+    },
+    handleCorrectCancel(){
+      this.formParams = null;
+      this.dialogShow = false;
+    },
+    //相除
+    divide(price) {
+      return this.$xdHelper.divisionFloatNumber(price, 100);
+    },
+    getParams(){
+      let copySearchParams = this.$xdHelper.cloneDeep(this.searchParams);
+      if(this.searchParams.op_user_id){
+        copySearchParams.op_user_id = copySearchParams.op_user_id[0]['value']
+      }
+      return {
+        ...copySearchParams,
+        wallet_type: this.wallet_type,
+        supplier_id: this.supplier_id,
+      }
+    },
+    doExport(){
+      this.exportName= '供货商明细对账'
+      this.showExport=true;
+    },
+    handleExport(){
+      if(!this.exportName) {
+        this.$message.error('请输入导出名称');
+        return
+      }
+      const other = this.getParams();
+      let params = {
+        ...other,
+        export: true,
+        file_ext: "xlsx",
+        file_name: this.exportName,
+        export_data_tag: "ExportSupplierInvoiceStatRecordList"
+      };
+      let loading = this.$loading({});
+      this.billListInvoiceStatRecord(params).then(res => {
+        loading.close();
+        this.showExport=false
+        this.$alert('导出任务已经开始执行，请去任务管理查看下载状态', '提示', {
+          confirmButtonText: '确定',
+        });
+      }).catch(err => {
+        this.$message.error(err.msg);
+        loading.close();
+      })
+    },
+    /**
+     * @description 获取数据列表
+     */
+    getList() {
+      //请求数据
+      const other = this.getParams();
+      let params = {
+        ...other,
+        page_token: this.page_token,
+        page_size: this.page_size
+      };
+      console.log(params)
+      let loading = this.$loading({});
+      this.billListInvoiceStatRecord(params).then(res => {
+        loading.close();
+        this.tables = res.data.list.map(item => {
+          item['created_time'] = item['created_time'] ? baseJsDateToTime(item['created_time']) :'-'
+          return item;
+        });
+        // this.total = res.data.total_size;
+        this.getCount();
+      })
+      .catch(err => {
+        loading.close();
+      })
+    },
+    getCount(){
+       const other = this.getParams();
+      let params = {
+        ...other,
+        page_token: this.page_token,
+        page_size: this.page_size
+      };
+      console.log(params)
+      this.billCountInvoiceStatRecord(params).then(res => {
+        this.countData = res.data;
+        this.total = res.data.total_size;
+      })
+      .catch(err => {
+      })
+    },
+
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch({ action, form }) {
+      this.page_token = 1;
+      this.getList();
+    },
+    /**
+     * @description 初始化搜索模块
+     */
+    initSearchForm() {
+      this.searchForm = [
+        {
+          label: "供应商",
+          ele: "xd-select-list",
+          valueKey: "supplier_id",
+          value: this.supplier_id,
+          placeholder: "请输入供应商",
+          disabled: true,
+          list: [
+            { label: this.supplier_name, value: this.supplier_id },
+          ]
+        },
+        // {
+        //   label: "账户类型",
+        //   ele: "xd-select-list",
+        //   valueKey: "wallet_type",
+        //   value: this.wallet_type,
+        //   placeholder: "请输入渠道ID",
+        //   disabled: true,
+        //   list: [
+        //     { label: "供货商账户", value: "PP" },
+        //   ]
+        // },
+        {
+          label: "记录类型",
+          ele: "xd-select-list",
+          valueKey: "type",
+          value: "",
+          placeholder: "请输入记录类型",
+          list: this.listTypeData
+        },
+        {
+          label: "发票号",
+          ele: "el-input",
+          valueKey: "invoice_number",
+          value: "",
+          placeholder: "请输入发票号"
+        },
+        {
+          label: '操作人',
+          ele: 'xd-remote-select',
+          valueKey: 'op_user_id',
+          value: [],
+          className: 'input40',
+          placeholder: `请选择操作人`,
+          multiple: false,
+          collapseTags: false,
+          remoteSearch: (query, resolve) => {
+            getOptions({
+              server: 'idaas-partner',
+              fn: 'users',
+              path: 'p1',
+              params: {
+                page_token: '1',
+                page_size: '500',
+                keyword: query
+              }
+            })
+              .then(res => {
+                resolve(res.data.list)
+              })
+              .catch()
+          },
+        },
+        {
+          label: '时间', //label
+          ele: 'xd-date', //package 名称
+          valueKey: ['start_time', 'end_time'], //form[valueKey]
+          value: [], //v-model
+          format: 'yyyy-MM-dd HH:mm:ss', //时间显示格式
+          formatValue: 'timestamp', //输出时间格式
+          placeholder: ['开始时间', '结束时间'],
+        },
+      ];
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination(page) {
+      this.page_token = page;
+      this.getList();
+    }, //todo
+
+    handleCorrect(){
+      this.initForm({})
+    },
+    initForm (params = {}) {
+      let formList = [
+        {
+          label:'供应商名称:',
+          ele:'el-html',
+          value:this.supplier_name,
+        },
+        {
+          label: '发票矫正金额:', //label
+          ele: 'el-input', //package 名称
+          valueKey: 'amount', //form[valueKey]
+          type:'number',
+          value: params.amount || '', //v-model
+          placeholder: '输入发票矫正金额',
+          rules: [
+            { required: true, message: `请输入发票矫正金额`, trigger: 'change' },
+          ]
+        },
+        {
+          label: '备注:', //label
+          ele: 'el-input', //package 名称
+          valueKey: 'info_des', //form[valueKey]
+          value: params.info_des || '', //v-model
+          placeholder: '输入备注',
+        },
+
+      ]
+      this.formList = formList.filter(i => i)
+      this.formKey = Date.now()
+      this.dialogShow = true;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .list_header{
+    .total_wrap{
+      font-size: 13px;
+      margin-left: 30px;
+    }
+    .amount_wrap{
+      margin-right: 20px;
+      .amount_label{
+        font-size: 14px;
+        font-weight: 500;
+      }
+    }
+  }
+  .table-stat{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    p{
+      margin: 0;
+      font-weight: 500;
+      font-size: 14px;
+      ._mo{
+        font-weight: 400;
+        margin-right: 20px;
+        font-size: 12px;
+      }
+    }
+  }
+  .flex{
+    display: flex;
+    align-items: center;
+  }
+  .table-product{
+    display: flex;
+    align-items: center;
+    .table-product__img{
+      width: 50px;
+      height: 50px;
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .table-product__id,
+    .table-product__name{
+      width: 120px;
+      p{
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+  ::v-deep .xd-base-field .xd-html {
+    margin-bottom: 22px!important;
+  }
+  .p_red{
+    color: red;
+  }
+</style>
+

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

@@ -27,7 +27,7 @@
       >
         <template slot="time" slot-scope="scope">
           <div>
-            <el-select v-model="channel_code" filterable clearable placeholder="请输入加盟商名称">
+            <el-select v-model="channel_code" filterable clearable placeholder="请选择供货商">
               <el-option
                 v-for="item in channelList"
                 :key="item.value"
@@ -97,6 +97,7 @@
               v-for="(prod, i) in scope.row.product_list"
               :key="i"
             >
+            <template v-if="scope.row.is_card_open==='N'">
               <div v-if="scope.row.scene==='online'" class="table-product__img">
                 <img :src="prod.product_thumb" alt="" />
               </div>
@@ -150,6 +151,34 @@
                   }}
                 </p>
               </div>
+              </template>
+              <template v-else>
+                <el-tooltip placement="top">
+                <div slot="content">
+                  <div class="table-product__name">
+                    <p>{{ prod.product_name}}</p>
+                  </div>
+                </div>
+                <div class="table-product__name" style="margin-right: 5px;">
+                  <p>{{ prod.product_name}}</p>
+                </div>
+                </el-tooltip>
+                <div class="table-product__id" style="margin-right: 5px;">
+                  <p style="white-space: pre-wrap;">{{ prod.product_id }}</p>
+                </div>
+                <div style="display: flex;">
+                <p style="margin-right: 5px;">
+                  {{
+                    `面额(${divide(prod.dist_price)}${prod.product_sku_name}/张)`
+                  }}
+                </p>
+                <p>
+                  {{
+                    `数量(${prod.product_num}张)`
+                  }}
+                </p>
+              </div>
+              </template>
             </div>
           </template>
           <template slot="amount" slot-scope="scope">
@@ -295,7 +324,7 @@ export default {
           prop: "products",
           align: "center",
           minWidth: 500,
-          label: "商品图片/名称/ID/公式",
+          label: "商品信息",
         },
         // { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "公式" },
         {
@@ -349,6 +378,13 @@ export default {
           minWidth: 200,
           label: "发票名称",
         },
+        {
+          type: "normal",
+          prop: "rebate_from_partner_name",
+          align: "center",
+          minWidth: 200,
+          label: "来源",
+        },
         {
           type: "normal",
           prop: "comment",
@@ -404,7 +440,8 @@ export default {
       "listPartner",
       "countPartner",
       "getSupplierList",
-      'getByCardFeeInfo'
+      'getByCardFeeInfo',
+      'walletListSubPartnerLib'
     ]),
     ...mapActions("wallet", ["correctPartnerAmount"]),
 
@@ -504,6 +541,9 @@ export default {
         channel_codes = []
         channel_codes.push(this.channel_code)
       }
+      if(other.rebate_from_partner_list&&other.rebate_from_partner_list.length){
+        other.rebate_from_partner_id = other.rebate_from_partner_list[0]['value']
+      }
       return {
         ...other,
         supplier_ids,
@@ -662,6 +702,30 @@ export default {
               placeholder: "请选择",
               list: res[1].data.list_trade_type
             },
+            {
+              label: '来源:',
+              ele: 'xd-remote-select',
+              valueKey: 'rebate_from_partner_list',
+              value: [],
+              className: 'input40',
+              placeholder: `请选择来源`,
+              multiple: false,
+              collapseTags: false,
+              remoteSearch: (query, resolve) => {
+                let params = {
+                  page_token: 1,
+                  page_size:20,
+                  partner_name:query,
+                };
+                this.walletListSubPartnerLib(params).then(res=>{
+                  res.data.list.map(item=>{
+                    item.value = item.partner_id;
+                    item.label = item.partner_name;
+                  })
+                  resolve(res.data.list);
+                })
+              },
+            },
             {
               label: "订单类型",
               ele: "xd-select-list",

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

@@ -14,6 +14,9 @@
         <el-tab-pane v-if="has_openapi_wallet" label="open API余额" name="openapi">
           <listOpenapi v-if="activeName==='openapi'"></listOpenapi>
         </el-tab-pane>
+        <el-tab-pane v-if="has_supplier_invoice" label="供应商发票管理" name="invoice">
+          <listInvoice v-if="activeName==='invoice'"></listInvoice>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
 
@@ -26,6 +29,7 @@ import listPartner from "./components/listPartner.vue"
 import listChannel from "./components/listChannel.vue"
 import listSupplier from "./components/listSupplier.vue"
 import listOpenapi from './components/listOpenapi.vue'
+import listInvoice from './components/listInvoice.vue'
 import checkPermission from "@/utils/permission"
 import roleTRecord from "@/constant/modules/tradeRecord.js"
 import roleWallet from "@/constant/modules/wallet.js"
@@ -36,7 +40,8 @@ export default {
     listChannel,
     listPartner,
     listSupplier,
-    listOpenapi
+    listOpenapi,
+    listInvoice,
   },
   
   data () {
@@ -58,10 +63,13 @@ export default {
     },
     has_openapi_wallet() {
       return checkPermission([roleWallet.listOpenApiWallet])
-    }
+    },
+    has_supplier_invoice(){
+      return checkPermission([roleTRecord.billListInvoiceStat])
+    },
   },
   created () {
-    this.activeName = this.has_partner_wallet ? "partner" : this.has_channel_wallet ? "channel" : this.has_openapi_wallet?'openapi': "supplier"
+    this.activeName = this.has_partner_wallet ? "partner" : this.has_channel_wallet ? "channel" :this.has_supplier_wallet?'supplier':this.has_openapi_wallet?'openapi': "invoice"
   },
   methods: {
 

package/library/viewModules/viewsFinance/viewsFinance/index.vue

@@ -201,8 +201,10 @@ export default {
     headers(){
       return [
         { "type": "normal", "prop": "partner_id", "align": "center", "label": "ID" },
-        { "type": "normal", "prop": "wallet_type_name", "align": "center", "minWidth": 200, "label": "账户类型" },
-        { "type": "price", "prop": "amount", "align": "center", "width": 100, "label": "账户余额", "unit": "元"},
+        { "type": "normal", "prop": "wallet_type_name", "align": "center", "minWidth": 100, "label": "账户类型" },
+        { "type": "price", "prop": "amount", "align": "center", "minWidth": 100, "label": "账户余额", "unit": "元"},
+        { "type": "price", "prop": "today_pure_amount", "align": "center", "minWidth": 100, "label": "今日消费", "unit": "元"},
+        { "type": "price", "prop": "yesterday_pure_amount", "align": "center", "minWidth": 100, "label": "昨日消费", "unit": "元"},
         { "type": "normal", "prop": "updated_time", "align": "center", "minWidth": 200, "label": "更新时间" },
         checkPermission([roleTRecord.listPartner]) && {
           "type": "operate", "align": "center", "label": "操作",
@@ -239,7 +241,7 @@ export default {
       let params = {
         ...this.searchParams,
         page_token: this.page_token,
-        page_size: this.page_size
+        page_size: this.page_size,
       };
       console.log(params)
       let loading = this.$loading({});
@@ -247,6 +249,8 @@ export default {
         loading.close();
         this.tables = res.data.list.map(item => {
           item['updated_time'] = item['updated_time'] ? baseJsDateToTime(item['updated_time']) : "";
+          item.today_pure_amount = item['trade_stat']['today_pure_amount']
+          item.yesterday_pure_amount = item['trade_stat']['yesterday_pure_amount']
           return item;
         });
         this.total = res.data.total_size;

package/library/viewModules/viewsMaterial/viewsMaterial/components/CusUpload.vue

@@ -630,9 +630,12 @@
         return new Promise((resolve, reject) => {
           this.isImageInfo(file)
             .then((res) => {
+
+              let size = this.size
+              if(file.type === 'image/gif')  size = 2 * size //gif放到到2倍
               //判断文件大小
-              if (isLt2M > this.size) {
-                this.message(`上传文件大小: ${this.size} MB, 当前上传文件: ${isLt2M.toFixed(2)}MB.`);
+              if (isLt2M > size) {
+                this.message(`上传文件大小: ${size} MB, 当前上传文件: ${isLt2M.toFixed(2)}MB.`);
                 reject();
                 return;
               }

package/library/viewModules/viewsMaterial/viewsMaterial/components/form.vue

@@ -26,7 +26,7 @@
             :is-material="false"
             action="action"
             :size="5"
-            :type="['jpg', 'jpeg', 'png']"
+            :type="['jpg', 'jpeg', 'png','gif']"
             tipsformet="上传文件格式：@imageType@，不超过@size@MB."
             styleType="list"
             uploadName="替换"

package/library/viewModules/viewsMaterial/viewsMaterial/components/uploadForm.vue

@@ -3,12 +3,12 @@
     <div class="form-wrap">
       <div class="form-input">
         <div>
-          <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG，不超过5MB)</span></div>
+          <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
           <cus-upload
             v-model="form.file_info"
             action="action"
             :size="5"
-            :type="['jpg', 'jpeg', 'png']"
+            :type="['jpg', 'jpeg', 'png','gif']"
             tipsformet="上传文件格式：@imageType@，不超过@size@MB."
             styleType="list"
             uploadType="aliyun"
@@ -226,4 +226,4 @@ export default {
   color: #409eff;
   background: #ecf5ff;
 }
-</style>
+</style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/company.vue

@@ -136,13 +136,13 @@
       width="width"
     >
       <div>
-        <div style="margin-bottom: 10px">添加素材：<span style="color: #999999; font-size: 12px">(上传文件格式：JPG/PNG/JPEG，不超过5MB)</span></div>
+        <div style="margin-bottom: 10px">添加素材：<span style="color: #999999; font-size: 12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
         <cus-upload
           v-model="file_info"
           :isMaterial="false"
           action="action"
           :size="5"
-          :type="['jpg', 'jpeg', 'png']"
+          :type="['jpg', 'jpeg', 'png','gif']"
           tipsformet="上传文件格式：@imageType@，不超过@size@MB."
           styleType="list"
           uploadType="aliyun"

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/my.vue

@@ -147,14 +147,14 @@
       width="width"
     >
       <div>
-        <div style="margin-bottom: 10px">添加素材：<span style="color: #999999; font-size: 12px">(上传文件格式：JPG/PNG/JPEG，不超过5MB)</span>
+        <div style="margin-bottom: 10px">添加素材：<span style="color: #999999; font-size: 12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span>
         </div>
         <cus-upload
           v-model="file_info"
           :isMaterial="false"
           action="action"
           :size="5"
-          :type="['jpg', 'jpeg', 'png']"
+          :type="['jpg', 'jpeg', 'png', 'gif']"
           tipsformet="上传文件格式：@imageType@，不超过@size@MB."
           styleType="list"
           uploadType="aliyun"

package/package.json

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