|
@@ -1,10 +1,10 @@
|
|
<template>
|
|
<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-spin :spinning="spinning" tip="Loading...">
|
|
<a-page-header :ghost="false" :backIcon="false" class="onlinePayDetail-cont">
|
|
<a-page-header :ghost="false" :backIcon="false" class="onlinePayDetail-cont">
|
|
<!-- 自定义的二级文字标题 -->
|
|
<!-- 自定义的二级文字标题 -->
|
|
<template slot="subTitle">
|
|
<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-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'"/>
|
|
<a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/>
|
|
{{ isShowBisiceInfo?'隐藏':'查看' }}信息
|
|
{{ isShowBisiceInfo?'隐藏':'查看' }}信息
|
|
@@ -19,10 +19,10 @@
|
|
<div slot="title" style="display:flex;justify-content:space-between;align-items:center;">
|
|
<div slot="title" style="display:flex;justify-content:space-between;align-items:center;">
|
|
数据统计
|
|
数据统计
|
|
</div>
|
|
</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-descriptions>
|
|
</a-card>
|
|
</a-card>
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
@@ -31,56 +31,62 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="下单时间">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="付款时间">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="退款时间">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="采购单号">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="销售单号">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="业务状态">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="财务状态">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="到账状态">
|
|
<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-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="24" :lg="24" :md="24" :sm="24" style="text-align:center;">
|
|
<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-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="onlinePayDetail-reset">重置</a-button>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
<div style="margin-bottom:8px;">
|
|
<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>
|
|
</div>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<s-table
|
|
<s-table
|
|
@@ -92,23 +98,25 @@
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
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>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-card>
|
|
</a-card>
|
|
</div>
|
|
</div>
|
|
</a-spin>
|
|
</a-spin>
|
|
- <!-- 出入库明细 -->
|
|
|
|
- <outInDetialModal ref="outInDetialModal" outBizType="SALES" :openModal="showOutInModal" @close="showOutInModal=false"></outInDetialModal>
|
|
|
|
<!-- 编辑备注 -->
|
|
<!-- 编辑备注 -->
|
|
<editRemarkModal :openModal="openEditModal" @close="openEditModal=false" @ok="handleEditOk"></editRemarkModal>
|
|
<editRemarkModal :openModal="openEditModal" @close="openEditModal=false" @ok="handleEditOk"></editRemarkModal>
|
|
</div>
|
|
</div>
|
|
@@ -116,17 +124,14 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
-import { hdPrint } from '@/libs/JGPrint'
|
|
|
|
// 组件
|
|
// 组件
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
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 {
|
|
export default {
|
|
name: 'OnlinePayInvoiceDetail',
|
|
name: 'OnlinePayInvoiceDetail',
|
|
- components: { STable, VSelect, PrintPanel, rangeDate },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
props: {
|
|
props: {
|
|
outBizSn: { // 有值则为弹框,无值则为页面
|
|
outBizSn: { // 有值则为弹框,无值则为页面
|
|
@@ -136,108 +141,91 @@ export default {
|
|
},
|
|
},
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
- showPage: false, // 是否显示组件
|
|
|
|
spinning: false,
|
|
spinning: false,
|
|
disabled: false,
|
|
disabled: false,
|
|
- showCost: false, // 是否显示成本价
|
|
|
|
- printOrgCode: false, // 是否打印原创编码
|
|
|
|
- printAllName: false, // 是否打印全部名称
|
|
|
|
- printRemarks: false, // 是否打印备注
|
|
|
|
- printPrice: false, // 是否打印价格
|
|
|
|
- printNo: true, // 是否打印销售单号
|
|
|
|
- showOutInModal: false, // 出库明细弹框
|
|
|
|
openEditModal: false, // 打开编辑备注弹窗
|
|
openEditModal: false, // 打开编辑备注弹窗
|
|
|
|
+ orderDate: [],
|
|
|
|
+ payDate: [],
|
|
|
|
+ refundDate: [],
|
|
queryParam: {
|
|
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 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
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
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
|
|
+ this.getCount(params)
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
}
|
|
}
|
|
- this.localDataSource = data.list
|
|
|
|
this.disabled = false
|
|
this.disabled = false
|
|
}
|
|
}
|
|
return data
|
|
return data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- localDataSource: [], // 原始列表数据
|
|
|
|
detailData: null, // 详情数据
|
|
detailData: null, // 详情数据
|
|
- isShowBisiceInfo: false// 显示基础内容
|
|
|
|
|
|
+ isShowBisiceInfo: false, // 显示基础内容
|
|
|
|
+ countData: null// 统计信息
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
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 () {
|
|
columns () {
|
|
const _this = this
|
|
const _this = this
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ 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
|
|
return arr
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 编辑备注完成
|
|
handleEditOk () {
|
|
handleEditOk () {
|
|
this.openEditModal = false
|
|
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 () {
|
|
handleBack () {
|
|
- this.$router.push({ name: 'onlinePayOrderList' })
|
|
|
|
|
|
+ this.$router.push({ name: 'onlinePayInvoiceList' })
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
getDetail () {
|
|
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) {
|
|
if (res.status == 200) {
|
|
this.detailData = res.data
|
|
this.detailData = res.data
|
|
} else {
|
|
} 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 () {
|
|
pageInit () {
|
|
@@ -256,14 +270,6 @@ export default {
|
|
vm.$nextTick(() => {
|
|
vm.$nextTick(() => {
|
|
vm.spinning = false
|
|
vm.spinning = false
|
|
vm.disabled = 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)
|
|
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 () {
|
|
mounted () {
|
|
if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新时调用
|
|
if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新时调用
|
|
- this.showPage = true
|
|
|
|
this.pageInit()
|
|
this.pageInit()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
activated () {
|
|
activated () {
|
|
- this.showPage = true
|
|
|
|
this.pageInit()
|
|
this.pageInit()
|
|
},
|
|
},
|
|
beforeRouteEnter (to, from, next) {
|
|
beforeRouteEnter (to, from, next) {
|