|
@@ -4,34 +4,34 @@
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
<div ref="tableSearch">
|
|
<div ref="tableSearch">
|
|
<a-form layout="inline" @keyup.enter.native="searchForm">
|
|
<a-form layout="inline" @keyup.enter.native="searchForm">
|
|
- <a-row :gutter="15">
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-row type="flex" justify="start" :gutter="15">
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="创建时间">
|
|
<a-form-item label="创建时间">
|
|
<rangeDate :allowClear="isByCustQuery" :hasDisabledAreaTime="false" ref="rangeDate" :value="time" @change="dateChange" />
|
|
<rangeDate :allowClear="isByCustQuery" :hasDisabledAreaTime="false" ref="rangeDate" :value="time" @change="dateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}" :required="isByCustQuery">
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}" :required="isByCustQuery">
|
|
<custList ref="custList" @change="custChange"></custList>
|
|
<custList ref="custList" @change="custChange"></custList>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="销售单号">
|
|
<a-form-item label="销售单号">
|
|
<a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
<a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="审核时间">
|
|
|
|
- <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="审核时间">
|
|
|
|
+ <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="出库时间">
|
|
<a-form-item label="出库时间">
|
|
<rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
|
|
<rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="单据来源">
|
|
<a-form-item label="单据来源">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.sourceType"
|
|
v-model="queryParam.sourceType"
|
|
@@ -42,7 +42,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="收款方式">
|
|
<a-form-item label="收款方式">
|
|
<v-select
|
|
<v-select
|
|
code="SETTLE_STYLE"
|
|
code="SETTLE_STYLE"
|
|
@@ -53,7 +53,7 @@
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="业务状态">
|
|
<a-form-item label="业务状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.billStatus"
|
|
v-model="queryParam.billStatus"
|
|
@@ -64,7 +64,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="财务状态">
|
|
<a-form-item label="财务状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.financialStatus"
|
|
v-model="queryParam.financialStatus"
|
|
@@ -75,7 +75,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :span="6">
|
|
<a-form-item label="采购单号">
|
|
<a-form-item label="采购单号">
|
|
<a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
|
|
<a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -86,21 +86,32 @@
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
- <a-col :span="24" style="display:flex;justify-content: center;align-items: center;">
|
|
|
|
- <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
|
|
|
|
- <a-button style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
|
- <a-button
|
|
|
|
- type="primary"
|
|
|
|
- v-if="$hasPermissions('B_salesExport')"
|
|
|
|
- class="button-warning"
|
|
|
|
- @click="handleExport"
|
|
|
|
- :disabled="disabled"
|
|
|
|
- :loading="exportLoading"
|
|
|
|
- id="salesManagementList-export">导出</a-button>
|
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
- </a>
|
|
|
|
|
|
+ <a-col :span="24" style="display:flex;align-items: center;">
|
|
|
|
+ <div style="text-align:left;width:50%;">
|
|
|
|
+ <a-checkbox v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
|
|
|
|
+ <a-popover placement="right">
|
|
|
|
+ <template slot="content">
|
|
|
|
+ 使用此查询时,时间可清空,必须选择一个客户
|
|
|
|
+ </template>
|
|
|
|
+ <a-icon type="question-circle" />
|
|
|
|
+ </a-popover>
|
|
|
|
+ </div>
|
|
|
|
+ <div style="text-align:left;margin-left: -120px;width:50%;">
|
|
|
|
+ <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
|
|
|
|
+ <a-button style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ type="primary"
|
|
|
|
+ v-if="$hasPermissions('B_salesExport')"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ @click="handleExport"
|
|
|
|
+ :disabled="disabled"
|
|
|
|
+ :loading="exportLoading"
|
|
|
|
+ id="salesManagementList-export">导出</a-button>
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
+ </a>
|
|
|
|
+ </div>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
@@ -110,26 +121,19 @@
|
|
<a-card size="small" :bordered="false">
|
|
<a-card size="small" :bordered="false">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<!-- 操作按钮 -->
|
|
<!-- 操作按钮 -->
|
|
- <div class="table-operator">
|
|
|
|
- <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
|
|
|
|
- <a-button type="primary" class="button-warning" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
|
|
|
|
- <a-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
|
|
|
|
- <a-popover placement="right">
|
|
|
|
- <template slot="content">
|
|
|
|
- 使用此查询时,时间可清空,必须选择一个客户
|
|
|
|
- </template>
|
|
|
|
- <a-icon type="question-circle" />
|
|
|
|
- </a-popover>
|
|
|
|
-
|
|
|
|
- </div>
|
|
|
|
- <a-alert type="info" style="margin-bottom:10px">
|
|
|
|
- <div slot="message">
|
|
|
|
- 总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>元;
|
|
|
|
- 总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
|
|
- 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
|
|
|
|
- 总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
|
|
|
|
+ <div class="table-operator" style="display:flex;align-items:center;justify-content: space-between;">
|
|
|
|
+ <div class="alert-message">
|
|
|
|
+ 销售单数合计:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
|
|
+ 销售款数合计:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
|
|
|
|
+ 销售数量合计:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
|
|
+ 销售金额合计:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
|
|
|
|
+ </div>
|
|
|
|
+ <div class="action-buttons">
|
|
|
|
+ <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
|
|
|
|
+ <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
- </a-alert>
|
|
|
|
|
|
+
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
@@ -296,6 +300,7 @@ export default {
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '折后总售价', dataIndex: 'discountedAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '折后总售价', dataIndex: 'discountedAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -534,7 +539,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 265
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 260
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|
|
const _this = this
|
|
const _this = this
|