|
@@ -1,141 +1,148 @@
|
|
<template>
|
|
<template>
|
|
|
|
+ <div>
|
|
<a-card size="small" :bordered="false" class="salesReturn-wrap">
|
|
<a-card size="small" :bordered="false" class="salesReturn-wrap">
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
- <!-- 搜索条件 -->
|
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
- <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
|
- <a-row :gutter="15">
|
|
|
|
|
|
+ <!-- 搜索条件 -->
|
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
+ <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
|
+ <a-row :gutter="15">
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="创建时间">
|
|
|
|
+ <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="审核时间">
|
|
|
|
+ <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
|
+ <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="退货类别" prop="goodFlag">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.goodFlag"
|
|
|
|
+ ref="goodFlag"
|
|
|
|
+ id="returnSchedule-goodFlag"
|
|
|
|
+ code="GOOD_FLAG"
|
|
|
|
+ placeholder="请选择退货类别"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="退货类型">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.salesReturnType"
|
|
|
|
+ id="departUser-salesReturnType"
|
|
|
|
+ code="SALES_RETURN_TYPE"
|
|
|
|
+ placeholder="请选择退货类型"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="总部销退单号">
|
|
|
|
+ <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" 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="创建时间">
|
|
|
|
- <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
|
|
|
|
|
|
+ <a-form-item label="客户采退申请单号">
|
|
|
|
+ <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
|
|
</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="审核时间">
|
|
|
|
- <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
|
|
|
|
+ <a-form-item label="单据来源">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.salesReturnBillSource"
|
|
|
|
+ ref="salesReturnBillSource"
|
|
|
|
+ id="salesReturn-salesReturnBillSource"
|
|
|
|
+ code="SALES_SOURCE"
|
|
|
|
+ placeholder="请选择单据来源"
|
|
|
|
+ allowClear></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="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
|
- <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
|
|
|
|
|
|
+ <a-form-item label="是否同步给客户">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.syncFlag"
|
|
|
|
+ ref="syncFlag"
|
|
|
|
+ id="salesReturn-syncFlag"
|
|
|
|
+ code="FLAG"
|
|
|
|
+ placeholder="请选择是否同步给客户"
|
|
|
|
+ allowClear></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-model-item label="退货类别" prop="goodFlag">
|
|
|
|
|
|
+ <a-form-item label="业务状态">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.goodFlag"
|
|
|
|
- ref="goodFlag"
|
|
|
|
- id="returnSchedule-goodFlag"
|
|
|
|
- code="GOOD_FLAG"
|
|
|
|
- placeholder="请选择退货类别"
|
|
|
|
|
|
+ v-model="queryParam.billStatus"
|
|
|
|
+ ref="billStatus"
|
|
|
|
+ id="salesReturn-billStatus"
|
|
|
|
+ code="SALES_RETURN_BILL_STATUS"
|
|
|
|
+ placeholder="请选择业务状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
- </a-form-model-item>
|
|
|
|
|
|
+ </a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="退货类型">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.salesReturnType"
|
|
|
|
- id="departUser-salesReturnType"
|
|
|
|
- code="SALES_RETURN_TYPE"
|
|
|
|
- placeholder="请选择退货类型"
|
|
|
|
- allowClear></v-select>
|
|
|
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
|
+ <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="总部销退单号">
|
|
|
|
- <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
|
|
- </a-form-item>
|
|
|
|
|
|
+ <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
|
|
+ <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <template v-if="advanced">
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="客户采退申请单号">
|
|
|
|
- <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="单据来源">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.salesReturnBillSource"
|
|
|
|
- ref="salesReturnBillSource"
|
|
|
|
- id="salesReturn-salesReturnBillSource"
|
|
|
|
- code="SALES_SOURCE"
|
|
|
|
- placeholder="请选择单据来源"
|
|
|
|
- allowClear></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="是否同步给客户">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.syncFlag"
|
|
|
|
- ref="syncFlag"
|
|
|
|
- id="salesReturn-syncFlag"
|
|
|
|
- code="FLAG"
|
|
|
|
- placeholder="请选择是否同步给客户"
|
|
|
|
- allowClear></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="业务状态">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="salesReturn-billStatus"
|
|
|
|
- code="SALES_RETURN_BILL_STATUS"
|
|
|
|
- placeholder="请选择业务状态"
|
|
|
|
- allowClear></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="所在区域">
|
|
|
|
- <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
|
|
- <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="退货仓库">
|
|
|
|
- <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- </template>
|
|
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <span class="table-page-search-submitButtons">
|
|
|
|
- <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 @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
- </a>
|
|
|
|
- </span>
|
|
|
|
|
|
+ <a-form-model-item label="退货仓库">
|
|
|
|
+ <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- </a-row>
|
|
|
|
- </a-form>
|
|
|
|
- <!-- 操作按钮 -->
|
|
|
|
- <div class="table-operator">
|
|
|
|
- <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
|
|
|
|
- </div>
|
|
|
|
- <a-alert type="info" style="margin-bottom:10px">
|
|
|
|
- <div slot="message">
|
|
|
|
- 总单数:{{ countData&&countData.totalRecord||0 }};
|
|
|
|
- 申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
|
|
|
|
- 仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
|
|
|
|
- 坏件数量:{{ countData&&countData.totalBadQty||0 }};
|
|
|
|
- 良品数量:{{ countData&&countData.totalGoodQty||0 }};
|
|
|
|
- 返库数量:{{ countData&&countData.totalBackStockQty||0 }};
|
|
|
|
- <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
|
|
|
|
- 实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
|
|
|
|
|
|
+ </template>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
|
+ <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 @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
+ </a>
|
|
</span>
|
|
</span>
|
|
- </div>
|
|
|
|
- </a-alert>
|
|
|
|
|
|
+ </a-col>
|
|
|
|
+ </a-row>
|
|
|
|
+ </a-form>
|
|
|
|
+ </div>
|
|
|
|
+ </a-card>
|
|
|
|
+
|
|
|
|
+ <a-card size="small" :bordered="false" class="salesReturn-wrap">
|
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
+ <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
|
|
|
|
+ <div style="flex-grow: 1;display: flex;align-items: center;">
|
|
|
|
+ <!-- 操作按钮 -->
|
|
|
|
+ <div>
|
|
|
|
+ <a-button type="primary" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
|
|
|
|
+ </div>
|
|
|
|
+ <div class="tongji-bar">
|
|
|
|
+ 总单数:{{ countData&&countData.totalRecord||0 }};
|
|
|
|
+ 申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
|
|
|
|
+ 仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
|
|
|
|
+ 坏件数量:{{ countData&&countData.totalBadQty||0 }};
|
|
|
|
+ 良品数量:{{ countData&&countData.totalGoodQty||0 }};
|
|
|
|
+ 返库数量:{{ countData&&countData.totalBackStockQty||0 }};
|
|
|
|
+ <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
|
|
|
|
+ 实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
|
|
|
|
+ </span>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div></div>
|
|
</div>
|
|
</div>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
- :style="{ height: tableHeight+94.5+'px' }"
|
|
|
|
|
|
+ :style="{ height: tableHeight+85+'px' }"
|
|
size="small"
|
|
size="small"
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
@@ -227,6 +234,7 @@
|
|
<!-- 选择审核人员 -->
|
|
<!-- 选择审核人员 -->
|
|
<chooseDepartUserModal v-drag :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
|
|
<chooseDepartUserModal v-drag :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
|
|
</a-card>
|
|
</a-card>
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
@@ -329,11 +337,11 @@ export default {
|
|
{ title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
|
|
{ title: '同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
|
|
- { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '7%', align: 'center' },
|
|
{ title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '7%', align: 'center' },
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '7%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '7%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -512,7 +520,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 215
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 255
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
@@ -551,6 +559,12 @@ export default {
|
|
</script>
|
|
</script>
|
|
<style lang="less">
|
|
<style lang="less">
|
|
.salesReturn-wrap{
|
|
.salesReturn-wrap{
|
|
|
|
+ margin-bottom: 6px;
|
|
|
|
+ &:first-child{
|
|
|
|
+ .ant-card-body{
|
|
|
|
+ padding-bottom: 0;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.sTable{
|
|
.sTable{
|
|
.badge-con-t{
|
|
.badge-con-t{
|
|
.ant-badge-count{
|
|
.ant-badge-count{
|