|
@@ -1,8 +1,8 @@
|
|
|
<template>
|
|
|
+ <div>
|
|
|
<a-card size="small" :bordered="false" class="salesManagementList-wrap">
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <!-- 搜索条件 -->
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper" style="margin: 0;">
|
|
|
<a-form layout="inline">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -20,12 +20,12 @@
|
|
|
<a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="采购单号">
|
|
|
<a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="备货打印状态">
|
|
|
<v-select
|
|
@@ -85,9 +85,18 @@
|
|
|
<chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="促销单">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.cxFlag"
|
|
|
+ ref="cxFlag"
|
|
|
+ code="FLAG"
|
|
|
+ placeholder="请选择是否促销单"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
+ <a-col :md="24" :sm="24" style="text-align: center;">
|
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
<a-button
|
|
@@ -103,19 +112,17 @@
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
</a>
|
|
|
- </span>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
+ </a-card>
|
|
|
+ <a-card size="small" :bordered="false" class="salesManagementList-wrap">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
<!-- 操作按钮 -->
|
|
|
- <div class="table-operator">
|
|
|
- <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button>
|
|
|
- </div>
|
|
|
- <!-- alert -->
|
|
|
- <a-alert type="info" style="margin-bottom:10px">
|
|
|
- <div slot="message">
|
|
|
- <div style="display: flex;justify-content: space-between;align-items: center;">
|
|
|
+ <div class="table-operator" style="display: flex;justify-content: space-between;align-items: center;">
|
|
|
+ <div style="padding-right: 15px;"><a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button></div>
|
|
|
+ <div style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
|
|
|
<div>
|
|
|
<div>
|
|
|
总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
@@ -134,10 +141,13 @@
|
|
|
已发货金额:<strong>{{ totalData&&(totalData.totalDispatchAmount || totalData.totalDispatchAmount==0) ? toThousands(totalData.totalDispatchAmount) : '--' }}</strong>;
|
|
|
</div>
|
|
|
</div>
|
|
|
- <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示取消数量</span></a-checkbox>
|
|
|
+ <div>
|
|
|
+ <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示促销单</span></a-checkbox>
|
|
|
+ <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示取消数量</span></a-checkbox>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </a-alert>
|
|
|
+ </div>
|
|
|
+
|
|
|
<!-- 列表 -->
|
|
|
<s-table
|
|
|
class="sTable fixPagination"
|
|
@@ -263,6 +273,7 @@
|
|
|
<!-- 导出提示框 -->
|
|
|
<reportModal :visible="showExport" @close="showExport=false"></reportModal>
|
|
|
</a-card>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
@@ -387,9 +398,7 @@ export default {
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
|
|
|
- // { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
@@ -399,15 +408,16 @@ export default {
|
|
|
{ title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
|
|
|
]
|
|
|
+
|
|
|
+ if (this.$hasPermissions('M_salesQueryList_salesPrice')) { // 售价权限
|
|
|
+ arr.splice(6, 0, { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.splice(8, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ }
|
|
|
if (this.showCancelNum) {
|
|
|
const ind = this.$hasPermissions('M_salesQueryList_salesPrice') ? 10 : 8
|
|
|
arr.splice(ind, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
arr.splice(ind + 1, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
}
|
|
|
- if (this.$hasPermissions('M_salesQueryList_salesPrice')) { // 售价权限
|
|
|
- arr.splice(6, 0, { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
- arr.splice(8, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
- }
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
@@ -568,7 +578,7 @@ export default {
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 290
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 265
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -608,8 +618,8 @@ export default {
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
|
|
.salesManagementList-wrap{
|
|
|
+ margin-bottom: 6px;
|
|
|
.sTable{
|
|
|
- margin-top: 10px;
|
|
|
.badge-con-t{
|
|
|
.ant-badge-count{
|
|
|
transform: scale(0.8);
|