chenrui vor 6 Monaten
Ursprung
Commit
287752506f

+ 8 - 7
src/api/merchant.js

@@ -9,7 +9,7 @@ export const queryMerchantCashOutPage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('列表查询')
     }
   })
@@ -20,12 +20,12 @@ export const saveMerchantCashOut = (params) => {
     url: '/merchant/saveMerchantCashOut',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('申请提现')
     }
   })
 }
-// 账户明细
+// 账户明细  暂时弃用
 export const queryTradeFlowPage = (params) => {
   const url = `/merchant/queryTradeFlowPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -34,7 +34,7 @@ export const queryTradeFlowPage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('账户明细列表')
     }
   })
@@ -46,6 +46,7 @@ export const merchantCashOut = params => {
     method: 'get'
   })
 }
+
 export const merchantCashOutDetail = (params) => {
   return axios({
     url: '/merchant/queryMerchantAccount',
@@ -63,7 +64,7 @@ export const queryShelfSettleRulePage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('列表查询')
     }
   })
@@ -87,7 +88,7 @@ export const querySettleBillPage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('明细列表')
     }
   })
@@ -101,7 +102,7 @@ export const queryOrderBillDetailPage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('明细列表')
     }
   })

+ 114 - 0
src/api/merchantNew.js

@@ -0,0 +1,114 @@
+import { axios } from '@/utils/request'
+
+//  提现列表  有分页
+export const queryMerchantCashOutPage = (params) => {
+  const url = `/merchantNew/queryMerchantCashOutPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
+  })
+}
+//  申请提现  保存
+export const saveMerchantCashOut = (params) => {
+  return axios({
+    url: '/merchantNew/saveMerchantCashOut',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('申请提现')
+    }
+  })
+}
+// 申请提现 获取显示信息
+export const merchantCashOutDetail = (params) => {
+  return axios({
+    url: '/merchantNew/queryMerchantAccount',
+    data: {},
+    method: 'get'
+  })
+}
+
+// 账单流水 列表   有分页
+export const bizTradeList = (params) => {
+  const url = `/bizTrade/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('账单流水列表')
+    }
+  })
+}
+
+// 账单流水 统计
+export const bizTradeQueryGroupCount = (params) => {
+  const url = `/bizTrade/queryGroupCount `
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+/* 线上支付订单页面
+ * 接口请求
+*/
+
+// 线上支付订单 列表 有分页
+export const queryShelfSettleRulePage = (params) => {
+  const url = `/bizTrade/queryShelfSumPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
+  })
+}
+
+// 线上支付订单 合计
+export const queryShelfSettleRuleCount = (params) => {
+  const url = `/bizTrade/querySumBizTradeByShelf`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 线上支付订单 明细列表 有分页
+export const queryByBizTradeList = (params) => {
+  const url = `/sales/queryByBizTrade/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('明细列表')
+    }
+  })
+}
+
+// 线上支付订单   明细   统计
+export const queryByBizTradeCount = (params) => {
+  const url = `/sales/queryByBizTradeSum`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 1 - 1
src/config/router.config.js

@@ -731,7 +731,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'detail/:shelfSn/:shelfName',
+                path: 'detail/:sn/:shelfSn/:shelfName',
                 name: 'onlinePayInvoiceDetail',
                 component: () => import(/* webpackChunkName: "numsGoodsShelves" */ '@/views/numsGoodsShelves/onlinePayInvoice/detail.vue'),
                 meta: {

+ 112 - 126
src/views/numsGoodsShelves/onlinePayInvoice/detail.vue

@@ -1,10 +1,10 @@
 <template>
-  <div v-if="showPage" class="jg-page-wrap onlinePayDetail-wrap">
+  <div class="jg-page-wrap onlinePayDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="onlinePayDetail-cont">
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <span class="billno">【数字货架】:{{ 名称名称 }}</span>
+          <span class="billno">【数字货架】:{{ $route.params.shelfName ||'--' }}</span>
           <a-button id="onlinePayDetail-seeInfo-btn" type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:10px;vertical-align:middle;">
             <a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/>
             {{ isShowBisiceInfo?'隐藏':'查看' }}信息
@@ -19,10 +19,10 @@
             <div slot="title" style="display:flex;justify-content:space-between;align-items:center;">
               数据统计
             </div>
-            <a-descriptions-item label="账单总金额">{{ detailData&&detailData.consigneeTel || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收款金额">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="退款中金额">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="已退款金额">{{ detailData&&detailData.operatorName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="账单总金额">{{ detailData&&(detailData.totalAmount||detailData.totalAmount==0)?toThousands(detailData.totalAmount) :'--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款金额">{{ detailData&&(detailData.skAmount||detailData.skAmount==0)?toThousands(detailData.skAmount) :'--' }}</a-descriptions-item>
+            <a-descriptions-item label="退款中金额">{{ detailData&&(detailData.tkzAmount||detailData.tkzAmount==0)?toThousands(detailData.tkzAmount) :'--' }}</a-descriptions-item>
+            <a-descriptions-item label="已退款金额">{{ detailData&&(detailData.tkAmount||detailData.tkAmount==0)?toThousands(detailData.tkAmount) :'--' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
         <a-card size="small" :bordered="false" class="pages-wrap">
@@ -31,56 +31,62 @@
               <a-row :gutter="15">
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="下单时间">
-                    <rangeDate id="onlinePayDetail-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
+                    <rangeDate id="onlinePayDetail-time" ref="rangeDate" :value="orderDate" @change="orderDateChange" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="付款时间">
-                    <rangeDate id="onlinePayDetail-qhtime" ref="rangeDate" :value="time" @change="dateChange" />
+                    <rangeDate id="onlinePayDetail-qhtime" ref="rangePayDate" :value="payDate" @change="date=>{dataChange(date,'pay')}" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="退款时间">
-                    <rangeDate id="onlinePayDetail-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
+                    <rangeDate id="onlinePayDetail-time" ref="rangeRefundDate" :value="refundDate" @change="date=>{dataChange(date,'refund')}" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="采购单号">
-                    <a-input id="onlinePayDetail-orderNo" placeholder="请输入采购单号" v-model.trim="queryParam.orderBillNo" allowClear/>
+                    <a-input id="onlinePayDetail-purchaseBillNo" placeholder="请输入采购单号" v-model.trim="queryParam.purchaseBillNo" allowClear/>
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="销售单号">
-                    <a-input id="onlinePayDetail-orderNo" placeholder="请输入销售单号" v-model.trim="queryParam.orderBillNo" allowClear/>
+                    <a-input id="onlinePayDetail-salesBillNo" placeholder="请输入销售单号" v-model.trim="queryParam.salesBillNo" allowClear/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="业务状态">
-                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择业务状态"></v-select>
+                    <v-select
+                      id="onlinePayDetail-billStatus"
+                      code="SALES_BILL_STATUS"
+                      :notIn="['WAIT_SUBMIT','SUPERIOR_CHANGE']"
+                      v-model="queryParam.billStatus"
+                      allowClear
+                      placeholder="请选择业务状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="财务状态">
-                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择财务状态"></v-select>
+                    <v-select id="onlinePayDetail-financialStatus" code="FINANCIAL_ONLINE_RECEIVE_STATUS" v-model="queryParam.financialStatus" allowClear placeholder="请选择财务状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="到账状态">
-                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择到账状态"></v-select>
+                    <v-select id="onlinePayDetail-receivedMoneyFlag" code="RECEIVED_MONEY_FLAG" v-model="queryParam.receivedMoneyFlag" allowClear placeholder="请选择到账状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :xl="24" :lg="24" :md="24" :sm="24" style="text-align:center;">
-                  <a-button type="primary" @click="getRefresh" :disabled="disabled" id="onlinePayDetail-refresh" >查询</a-button>
+                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="onlinePayDetail-refresh" >查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="onlinePayDetail-reset">重置</a-button>
                 </a-col>
               </a-row>
             </a-form>
           </div>
           <div style="margin-bottom:8px;">
-            账单总金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
-            其中收款金额:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
-            退款中金额:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
-            已退款金额:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
+            账单总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '--' }}</strong>;
+            其中收款金额:<strong>{{ countData&&(countData.skAmount || countData.skAmount==0) ? toThousands(countData.skAmount) : '--' }}</strong>;
+            退款中金额:<strong>{{ countData&&(countData.refundingAmount || countData.refundingAmount==0) ? toThousands(countData.refundingAmount) : '--' }}</strong>;
+            已退款金额:<strong>{{ countData&&(countData.refundedAmount || countData.refundedAmount ==0) ? toThousands(countData.refundedAmount) : '--' }}</strong>;
           </div>
           <!-- 列表 -->
           <s-table
@@ -92,23 +98,25 @@
             :data="loadData"
             :defaultLoadData="false"
             bordered>
-            <!-- 操作 -->
-            <template slot="action" slot-scope="text, record">
-              <a-button
-                :id="'online-pay-detail-'+record.id"
-                size="small"
-                type="link"
-                v-if="record.oosFlag == 0 && (isOwerEdit || isAudit)"
-                class="button-primary"
-                @click="handleViewDetail(record)">出库明细</a-button>
-              <span v-else>--</span>
+            <!-- 付款时间 -->
+            <template slot="auditDateInfo" slot-scope="text, record">
+              <div v-if="record.billStatus&&(record.billStatus=='WAIT_OUT_WAREHOUSE'||record.billStatus=='FINISH')">
+                {{ record.auditDate }}
+              </div>
+              <div v-else>--</div>
+            </template>
+            <!-- 财务状态 -->
+            <template slot="financialStatusInfo" slot-scope="text, record">
+              <div v-if="record.financialStatus&&record.financialStatusDictValue">
+                <span v-if="record.financialStatus=='REFUNDING'" style="color:#ED1C24;">{{ record.financialStatusDictValue }}</span>
+                <span v-else>{{ record.financialStatusDictValue }}</span>
+              </div>
+              <div v-else>--</div>
             </template>
           </s-table>
         </a-card>
       </div>
     </a-spin>
-    <!-- 出入库明细 -->
-    <outInDetialModal ref="outInDetialModal" outBizType="SALES" :openModal="showOutInModal" @close="showOutInModal=false"></outInDetialModal>
     <!-- 编辑备注 -->
     <editRemarkModal :openModal="openEditModal" @close="openEditModal=false" @ok="handleEditOk"></editRemarkModal>
   </div>
@@ -116,17 +124,14 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { hdPrint } from '@/libs/JGPrint'
 // 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import PrintPanel from '@/views/common/printPanel.vue'
 // 接口
-import { salesDetailBySn, salesDetailPrint, salesDetailExport } from '@/api/sales'
-import { salesDetailList } from '@/api/salesDetail'
+import { queryByBizTradeList, queryShelfSettleRuleCount, bizTradeQueryGroupCount } from '@/api/merchantNew'
 export default {
   name: 'OnlinePayInvoiceDetail',
-  components: { STable, VSelect, PrintPanel, rangeDate },
+  components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   props: {
     outBizSn: { //  有值则为弹框,无值则为页面
@@ -136,108 +141,91 @@ export default {
   },
   data () {
     return {
-      showPage: false, // 是否显示组件
       spinning: false,
       disabled: false,
-      showCost: false, // 是否显示成本价
-      printOrgCode: false, // 是否打印原创编码
-      printAllName: false, // 是否打印全部名称
-      printRemarks: false, // 是否打印备注
-      printPrice: false, // 是否打印价格
-      printNo: true, // 是否打印销售单号
-      showOutInModal: false, // 出库明细弹框
       openEditModal: false, // 打开编辑备注弹窗
+      orderDate: [],
+      payDate: [],
+      refundDate: [],
       queryParam: {
-        shelfSn: undefined, // 货架sn
-        settleType: undefined, // 结算方式
-        customerName: undefined, // 客户名称
-        beginAmount: '', // 开始金额
-        endAmount: ''//
+        beginDate: undefined, // 下单时间
+        endDate: undefined,
+        payStartData: undefined, // 付款时间
+        payEndData: undefined,
+        refundStartData: undefined, // 退款时间
+        refundEndData: undefined,
+        purchaseBillNo: '', // 采购单号
+        salesBillNo: '', // 销售单号
+        billStatus: undefined, // 业务状态
+        financialStatus: undefined, // 财务状态
+        receivedMoneyFlag: undefined// 到账
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return salesDetailList(Object.assign(parameter, { orderBy: 'sales_bill_detail.CREATE_DATE desc', salesBillSn: this.outBizSn || this.$route.params.sn })).then(res => {
+        this.queryParam.buyerSn = this.$route.params.sn
+        const params = Object.assign(parameter, this.queryParam)
+        return queryByBizTradeList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            this.getCount(params)
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
             }
-            this.localDataSource = data.list
             this.disabled = false
           }
           return data
         })
       },
-      localDataSource: [], // 原始列表数据
       detailData: null, //  详情数据
-      isShowBisiceInfo: false// 显示基础内容
+      isShowBisiceInfo: false, // 显示基础内容
+      countData: null// 统计信息
     }
   },
   computed: {
-    // 是否自建单据
-    isOwerEdit () {
-      return this.detailData && this.detailData.sourceType == 'SALES'
-    },
-    // 是否审核通过
-    isAudit () {
-      return this.detailData ? (this.detailData.billStatus == 'WAIT_OUT_WAREHOUSE' || this.detailData.billStatus == 'FINISH') : false
-    },
     // 列定义
     columns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '下单时间', dataIndex: 'dealerProductEntity.code', width: '11%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
-        { title: '采购单号', dataIndex: 'productName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '关联销售单号', dataIndex: 'productOrigCode', width: '9%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
-        { title: '财务收款单号', dataIndex: 'price', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '订单金额', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结算方式', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '付款时间', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退款时间', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '到账状态', dataIndex: 'oosFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '下单时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '关联销售单号', dataIndex: 'salesBillNo', width: '9%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '财务收款单号', dataIndex: 'settleNo', width: '9%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '订单金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结算方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '付款时间', dataIndex: 'auditDate', width: '8%', align: 'center', scopedSlots: { customRender: 'auditDateInfo' } },
+        { title: '退款时间', dataIndex: 'refundData', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', scopedSlots: { customRender: 'financialStatusInfo' } },
+        { title: '到账状态', dataIndex: 'receivedMoneyFlag', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-
+      // 审核不通过/已取消/待审核 不显示付款时间
       return arr
     }
   },
   methods: {
+    // 编辑备注完成
     handleEditOk () {
       this.openEditModal = false
     },
-    // 打印预览/快捷打印
-    handlePrint (type, printerType) {
-      const _this = this
-      _this.spinning = true
-      let url = salesDetailPrint
-      const params = {
-        sn: this.outBizSn || this.$route.params.sn,
-        printOrgCode: this.printOrgCode ? 1 : 0,
-        printAllName: this.printAllName ? 1 : 0,
-        remarksShowFlag: this.printRemarks ? 1 : 0,
-        printNo: this.printNo ? 1 : 0,
-        priceFlag: this.printPrice ? 1 : 0
-      }
-      if (type == 'export') { //  导出
-        url = salesDetailExport
-      }
-      // 打印或导出
-      hdPrint(printerType, type, url, params, '销售单', function () {
-        _this.spinning = false
+    // 统计
+    getCount (val) {
+      bizTradeQueryGroupCount(val).then(res => {
+        if (res.status == 200) {
+          this.countData = res.data
+        }
       })
     },
     //  返回
     handleBack () {
-      this.$router.push({ name: 'onlinePayOrderList' })
+      this.$router.push({ name: 'onlinePayInvoiceList' })
     },
     //  详情
     getDetail () {
-      salesDetailBySn({ salesBillSn: this.outBizSn || this.$route.params.sn }).then(res => {
+      queryShelfSettleRuleCount({ shelfSn: this.$route.params.shelfSn, buyerSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data
         } else {
@@ -245,10 +233,36 @@ export default {
         }
       })
     },
-    // 打开出入库明细
-    handleViewDetail (row) {
-      this.showOutInModal = true
-      this.$refs.outInDetialModal.getData(row)
+    orderDateChange (date) {
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
+    },
+    dataChange (val, name) {
+      this.queryParam[name + 'StartData'] = val[0]
+      this.queryParam[name + 'EndData'] = val[1]
+    },
+    // 重置
+    resetSearchForm () {
+      this.queryParam = {
+        beginDate: undefined, // 下单时间
+        endDate: undefined,
+        payStartData: undefined, // 付款时间
+        payEndData: undefined,
+        refundStartData: undefined, // 退款时间
+        refundEndData: undefined,
+        purchaseBillNo: '', // 采购单号
+        salesBillNo: '', // 销售单号
+        billStatus: undefined, // 业务状态
+        financialStatus: undefined, // 财务状态
+        receivedMoneyFlag: undefined// 到账
+      }
+      this.orderDate = []
+      this.payDate = []
+      this.refundDate = []
+      this.$refs.rangeDate.resetDate([])
+      this.$refs.rangePayDate.resetDate([])
+      this.$refs.rangeRefundDate.resetDate([])
+      this.$refs.table.refresh(true)
     },
     // 页面初始
     pageInit () {
@@ -256,14 +270,6 @@ export default {
       vm.$nextTick(() => {
         vm.spinning = false
         vm.disabled = false
-        // 是否默认打印原厂编码
-        vm.printOrgCode = localStorage.getItem('printOrgCode-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
-        const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
-        console.log(printNo)
-        vm.printNo = printNo ? printNo == 'true' : true
         // 查询列表
         vm.$refs.table.refresh(true)
         // 获取单据详情
@@ -271,32 +277,12 @@ export default {
       })
     }
   },
-  watch: {
-    // 打印选项变化
-    printOrgCode (newValue, oldValue) {
-      localStorage.setItem('printOrgCode-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printRemarks (newValue, oldValue) {
-      localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printPrice (newValue, oldValue) {
-      localStorage.setItem('printPrice-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printAllName (newValue, oldValue) {
-      localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printNo (newValue, oldValue) {
-      localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
-    }
-  },
   mounted () {
     if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新时调用
-      this.showPage = true
       this.pageInit()
     }
   },
   activated () {
-    this.showPage = true
     this.pageInit()
   },
   beforeRouteEnter (to, from, next) {

+ 34 - 90
src/views/numsGoodsShelves/onlinePayInvoice/list.vue

@@ -25,9 +25,9 @@
       <div class="table-operator">
         <div class="alert-message">
           账单总金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
-          其中收款金额:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
-          待退款金额:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
-          已退款金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;
+          其中收款金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>;
+          待退款金额:<strong>{{ detailData&&(detailData.tkzAmount || detailData.tkzAmount==0) ? toThousands(detailData.tkzAmount) : '--' }}</strong>;
+          已退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>;
         </div>
       </div>
       <s-table
@@ -57,75 +57,60 @@
 <script>
 import moment from 'moment'
 import { commonMixin } from '@/utils/mixin'
-import { toThousands } from '@/libs/tools.js'
-import { STable, VSelect } from '@/components'
+import { STable } from '@/components'
 import shelfList from '@/views/common/shelfList'
 import custList from '@/views/common/custList.vue'
-import { queryShelfSettleRulePage, queryShelfSettleRuleCount } from '@/api/merchant'
+import { queryShelfSettleRulePage, queryShelfSettleRuleCount } from '@/api/merchantNew'
 export default {
-  components: { STable, shelfList, custList, VSelect },
+  components: { STable, shelfList, custList },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
-      toThousands,
       advanced: true, // 高级搜索 展开/关闭
       spinning: false,
       disabled: false,
       tableHeight: 0, // 表格高度
-      total: 0, // 待结算金额合计
-      count: 0, // 总记录
       time: [], // 时间
       queryParam: {
         shelfSn: undefined, // 货架sn
-        settleType: undefined, // 结算方式
+        customerSn: undefined,
         customerName: undefined, // 客户名称
-        beginAmount: '', // 开始金额
-        endAmount: ''//
+        dealerSn: undefined// 登录用户的sn
       },
+      detailData: null,
       // 列
       columns: [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '货架名称', dataIndex: 'shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联客户', dataIndex: 'customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '账单总金额', dataIndex: 'waitSettleAmount', width: '15%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
-        { title: '收款金额', dataIndex: 'waitSettleAmount', width: '15%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
-        { title: '待退款金额', dataIndex: 'waitSettleAmount', width: '15%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
-        { title: '已退款金额', dataIndex: 'waitSettleAmount', width: '15%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
-        { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
+        { title: '账单总金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
+        { title: '收款金额', dataIndex: 'skAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
+        { title: '待退款金额', dataIndex: 'tkzAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
+        { title: '已退款金额', dataIndex: 'tkAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
+        { title: '操作', width: '15%', align: 'center', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const _this = this
         _this.disabled = true
         _this.spinning = true
+        _this.queryParam.dealerSn = _this.$store.state.user.authOrgs[0].orgSn
         const paramsPage = Object.assign(parameter, this.queryParam) //  有分页
-        // 校验待结金额数值范围是否正确
-        if (this.checkValueRange()) {
-          return queryShelfSettleRulePage(paramsPage).then(res => {
-            let data
-            if (res.status == 200) {
-              data = res.data
-              this.getCount(paramsPage)
-              const no = (data.pageNo - 1) * data.pageSize
-              for (var i = 0; i < data.list.length; i++) {
-                data.list[i].no = no + i + 1
-              }
-              this.disabled = false
+        return queryShelfSettleRulePage(paramsPage).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
             }
-            this.spinning = false
-            return data
-          })
-        } else {
-          const _this = this
-          this.disabled = true
-          this.spinning = true
-          return new Promise(function (resolve, reject) {
-            const data = []
-            _this.disabled = false
-            _this.spinning = false
-            resolve(data)
-          })
-        }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
       }
     }
   },
@@ -140,47 +125,12 @@ export default {
         this.queryParam.customerSn = undefined
       }
     },
-    // 禁止选择今天之后的日期
-    disabledDate (current) {
-      return current && current > moment().endOf('day')
-    },
-    // 校验待结金额数值范围
-    checkValueRange () {
-      const isONull = this.queryParam.beginAmount === null || this.queryParam.beginAmount === undefined
-      const isOEmpty = this.queryParam.beginAmount === ''
-      const isOZero = this.queryParam.beginAmount === 0
-      const isTNull = this.queryParam.endAmount === null || this.queryParam.endAmount === undefined
-      const isTEmpty = this.queryParam.endAmount === ''
-      const isTZero = this.queryParam.endAmount === 0
-      //  第一个为空(可为null可为空字符)第二个不为空
-      //  第一个不为空第二个为空(可为null可为空字符)
-      //  第一个大于第二个
-      if ((isONull || isOEmpty) && (this.queryParam.endAmount || isTZero)) {
-        this.$message.info('请输入正确的待结金额查询范围!')
-        return false
-      }
-      if ((this.queryParam.beginAmount || isOZero) && (isTNull || isTEmpty)) {
-        this.$message.info('请输入正确的待结金额查询范围!')
-        return false
-      }
-      if (this.queryParam.beginAmount > this.queryParam.endAmount) {
-        this.$message.info('请输入正确的待结金额查询范围!')
-        return false
-      }
-      this.queryParam.beginAmount = this.queryParam.beginAmount > 999999999 ? 999999999 : this.queryParam.beginAmount
-      this.queryParam.endAmount = this.queryParam.endAmount > 999999999 ? 999999999 : this.queryParam.endAmount
-      return true
-    },
     // 重置
     resetSearchForm () {
-      this.time = []
       this.queryParam = {
-        shelfSn: undefined,
-        settleType: undefined,
-        customerName: undefined,
+        shelfSn: undefined, // 货架sn
         customerSn: undefined,
-        beginAmount: '',
-        endAmount: ''
+        customerName: undefined // 客户名称
       }
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
@@ -189,19 +139,13 @@ export default {
     getCount (val) {
       queryShelfSettleRuleCount(val).then(res => {
         if (res.status == 200) {
-          this.count = res.data.size || 0
-          this.total = res.data.waitSettleAmount || 0
+          this.detailData = res.data
         }
       })
     },
-    // 待结明细
+    // 明细
     handleUndetail (row) {
-      this.$router.push({ name: 'onlinePayInvoiceDetail', params: { shelfSn: row.shelfSn, settleType: row.settleType, shelfName: row.shelfName } })
-    },
-    // 结算历史
-    handleDetail (row) {
-      sessionStorage.setItem('settlementDetail', JSON.stringify(row))
-      this.$router.push({ name: 'settlementDetail', params: { shelfSn: row.shelfSn, shelfName: row.shelfName } })
+      this.$router.push({ name: 'onlinePayInvoiceDetail', params: { sn: row.customerSn, shelfSn: row.shelfSn, shelfName: row.shelfName } })
     },
     // 计算表格高度
     setTableH () {

+ 1 - 7
src/views/numsGoodsShelves/withdrawalManagementNew/applyWithdrawal.vue

@@ -46,19 +46,13 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { saveMerchantCashOut, merchantCashOutDetail } from '@/api/merchant'
+import { saveMerchantCashOut, merchantCashOutDetail } from '@/api/merchantNew'
 export default {
   mixins: [commonMixin],
   props: {
     isOpenModal: {
       type: Boolean,
       default: false
-    },
-    currentData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
     }
   },
   computed: {

+ 64 - 39
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -13,7 +13,7 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="10" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate id="billFlowModal-createDate" ref="createDate" @change="createDateChange" />
               </a-form-item>
@@ -23,34 +23,43 @@
                 <custList id="billFlowModal-custList" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="关联财务单号">
                 <a-input id="billFlowModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联财务单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="7" :sm="24">
-              <a-form-item label="交易类型">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="收支类型">
                 <v-select
                   v-model="queryParam.bizType"
                   ref="bizType"
                   id="billFlowModal-bizType"
-                  code="SETTLE_BIZ_TYPE"
-                  placeholder="请选择交易类型"
+                  code="SHOP_PROMO_IN_OUT_TYPE"
+                  placeholder="请选择收支类型"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="7" :sm="24">
+              <a-form-item label="交易类型">
+                <v-select
+                  v-model="queryParam.tradeType"
+                  id="billFlowModal-tradeType"
+                  code="BIZ_TRADE_TRADE_TYPE"
+                  placeholder="请选择交易类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
               <a-form-item label="交易状态">
                 <v-select
-                  v-model="queryParam.bizType"
-                  ref="bizType"
-                  id="billFlowModal-bizType"
-                  code="SETTLE_BIZ_TYPE"
+                  v-model="queryParam.dealState"
+                  id="billFlowModal-dealState"
+                  code="BIZ_TRADE_DEAL_STATE"
                   placeholder="请选择交易状态"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="billFlowModal-refresh">查询</a-button>
               <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="billFlowModal-reset">重置</a-button>
             </a-col>
@@ -59,27 +68,34 @@
       </div>
       <div class="table-operator">
         <div class="alert-message">
-          收入金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
-          其中到账金额:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
-          在途金额:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
-          支出金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;
-          其中退款金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;
-          提现金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;
-          提现服务费:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;
+          收入金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>;
+          其中到账金额:<strong>{{ detailData&&(detailData.skdzAmount || detailData.skdzAmount==0) ? toThousands(detailData.skdzAmount) : '--' }}</strong>;
+          在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>;
+          支出金额:<strong>{{ detailData&&(detailData.kkAmount || detailData.kkAmount==0) ? toThousands(detailData.kkAmount) : '--' }}</strong>;
+          其中退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>;
+          提现金额:<strong>{{ detailData&&(detailData.txAmount || detailData.txAmount==0) ? toThousands(detailData.txAmount) : '--' }}</strong>;
+          提现服务费:<strong>{{ detailData&&(detailData.txfwfAmount || detailData.txfwfAmount==0) ? toThousands(detailData.txfwfAmount) : '--' }}</strong>;
         </div>
       </div>
       <!-- 列表 -->
       <s-table
-        class="sTable"
+        class="sTable fixPagination"
         ref="table"
         size="small"
         :rowKey="(record) => record.id"
+        :style="{ height: 510+'px' }"
         :columns="columns"
         :data="loadData"
-        :showPagination="false"
-        :scroll="{ y: 400 }"
+        :scroll="{ y: 450 }"
         :defaultLoadData="false"
         bordered>
+        <!-- 交易状态 -->
+        <template slot="status" slot-scope="text, record">
+          <div v-if="record.dealState&&record.dealStateDictValue">
+            <span :style="{color:(record.dealState=='KK'||record.dealState=='YTK')?'#Ed1c24':record.dealState=='DZ'?'#2ac30f':''}">{{ record.dealStateDictValue }}</span>
+          </div>
+          <div v-else>--</div>
+        </template>
       </s-table>
     </a-spin>
   </a-drawer>
@@ -90,7 +106,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
-import { settleInfoAllList } from '@/api/settle'
+import { bizTradeList, bizTradeQueryGroupCount } from '@/api/merchantNew.js'
 export default {
   name: 'BillFlowModal',
   components: { STable, VSelect, rangeDate, custList },
@@ -118,38 +134,47 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '创建时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'bizNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '关联单号', dataIndex: 'bizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '交易类型', dataIndex: 'checked', width: '6%', align: 'center', customRender: function (text) { return text ? '已选' : '--' } },
-        { title: '交易状态', dataIndex: 'checked', width: '6%', align: 'center', scopedSlots: { customRender: 'status' } }
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'customerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '关联单号', dataIndex: 'bizOrderNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额', dataIndex: 'tradeAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '交易类型', dataIndex: 'tradeTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text ? '已选' : '--' } },
+        { title: '交易状态', dataIndex: 'dealStateDictValue', width: '8%', align: 'center', scopedSlots: { customRender: 'status' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const _this = this
-        return settleInfoAllList(Object.assign(this.queryParam, { settleClientType: this.settleClientType, settleClientSn: this.settleClientSn, notEqZero: 1 })).then(res => {
+        const parames = Object.assign(parameter, _this.queryParam)
+        return bizTradeList(parames).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
-            for (var i = 0; i < data.length; i++) {
-              data[i].no = i + 1
-              data[i].settleAmount = data[i].unsettleAmount
-              const has = _this.nowChoose.find(item => item.id == data[i].id)
-              data[i].checked = !!has
+            _this.getCount(parames)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
             }
-            this.disabled = false
+            _this.disabled = false
           }
-          this.spinning = false
+          _this.spinning = false
           return data
         })
       },
+      detailData: null,
       rowSelectionInfo: null // 已选数据
     }
   },
   methods: {
+    // 统计
+    getCount (val) {
+      bizTradeQueryGroupCount(val).then(res => {
+        if (res.status == 200) {
+          this.detailData = res.data
+        }
+      })
+    },
     // 表格选中项
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
@@ -204,9 +229,9 @@ export default {
         _this.$emit('close')
         _this.resetSearchForm()
       } else {
-        // setTimeout(() => {
-        //   _this.$refs.table.refresh(true)
-        // }, 200)
+        setTimeout(() => {
+          _this.$refs.table.refresh(true)
+        }, 200)
       }
     }
   }

+ 15 - 20
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -11,7 +11,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
-              <a-button type="primary" @click="getRefresh" :disabled="disabled" id="withdrawal-refresh" >查询</a-button>
+              <a-button type="primary" @click="getPageInfo" :disabled="disabled" id="withdrawal-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="withdrawal-reset">重置</a-button>
             </a-col>
           </a-row>
@@ -19,7 +19,7 @@
       </div>
       <div style="margin:10px 0">
         <div style="margin:10px 0">
-          账户总金额:¥100.00(包含可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:¥12.00
+          账户总金额:{{ pageInfo&&pageInfo.totalAmount?toThousands(pageInfo.totalAmount):'--' }}(包含可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:{{ pageInfo&&pageInfo.floatAmount?toThousands(pageInfo.floatAmount):'--' }}
           <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③销售单需审核通过后才能提现;④销售单审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
         </div>
         <a-button id="withdrawal-tixian" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
@@ -39,7 +39,7 @@
       </s-table>
     </a-spin>
     <!-- 申请提现 -->
-    <applyWithdrawal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
+    <applyWithdrawal :isOpenModal="showModal" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
     <!-- 交易流水 -->
     <billFlowModal :openModal="showBillFlowModal" @close="showBillFlowModal=false" @ok="showBillFlowModal=false"></billFlowModal>
   </a-card>
@@ -47,12 +47,13 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+// 组件
 import { STable } from '@/components'
 import applyWithdrawal from './applyWithdrawal.vue'
 import billFlowModal from './billFlowModal.vue'
-
 import rangeDate from '@/views/common/rangeDate.vue'
-import { queryMerchantCashOutPage, merchantCashOutDetail } from '@/api/merchant'
+// 接口
+import { queryMerchantCashOutPage, merchantCashOutDetail } from '@/api/merchantNew'
 export default {
   mixins: [commonMixin],
   components: { STable, applyWithdrawal, billFlowModal, rangeDate },
@@ -63,8 +64,7 @@ export default {
       disabled: false,
       tableHeight: 0, // 表格高度
       showModal: false, // 是否显示申请提现弹窗
-      currentData: null, // 当前行数据
-      showBillFlowModal: false,
+      showBillFlowModal: false, // 打开交易流水 弹窗
       time: [], // 提现时间
       pageInfo: null, // 详情信息
       queryParam: {
@@ -73,15 +73,15 @@ export default {
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '提现单号', dataIndex: 'cashOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '提现时间', dataIndex: 'cashOutDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请提现金额', dataIndex: 'amount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
-        { title: '开户名', dataIndex: 'bankAccount', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '开户银行', dataIndex: 'bankAccount', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '银行卡号', dataIndex: 'bankCard', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '提现单号', dataIndex: 'cashOutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '提现时间', dataIndex: 'cashOutDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '申请提现金额', dataIndex: 'amount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
+        { title: '开户名', dataIndex: 'bankAccount1', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '开户银行', dataIndex: 'bankAccount', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '银行卡号', dataIndex: 'bankCard', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '提现人', dataIndex: 'operName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remarks', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -124,11 +124,6 @@ export default {
         }
       })
     },
-    // 刷新页面
-    getRefresh () {
-      this.getPageInfo()
-      this.$refs.table.refresh(true)
-    },
     // 重置
     resetSearchForm () {
       this.time = []

+ 3 - 3
src/views/salesManagement/onlinePayOrder/detail.vue

@@ -109,9 +109,9 @@
                 <span>{{ text }}</span>
                 <a-badge count="急" v-if="(isOwerEdit&&record.oosFlag == 1) || (!isOwerEdit&&isAudit&&record.oosFlag == 1)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
                 <a-badge count="缺" v-if="!isOwerEdit&&!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
-                <a-badge count="赠" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
-                <a-badge count="券" :number-style="{ backgroundColor: '#FF5500', zoom:'80%',marginLeft:'5px' }"></a-badge>
-                <a-badge count="特" :number-style="{ backgroundColor: '#FED714',zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="赠" v-if="record.promoProductType=='GIFT_PRODUCT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="券" v-if="record.promoProductType=='TICKET_PRODUCT'" :number-style="{ backgroundColor: '#FF5500', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="特" v-if="record.promoProductType=='SPECIAL_PRODUCT'" :number-style="{ backgroundColor: '#FED714',zoom:'80%',marginLeft:'5px' }"></a-badge>
               </div>
             </template>
             <!-- 操作 -->