|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap">
|
|
|
+ <a-card size="small" :bordered="false" class="allocateReturnDetailReport-wrap">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
<!-- 搜索条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
@@ -17,49 +17,55 @@
|
|
|
<rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-model-item label="退货单号">
|
|
|
- <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="调拨退货单号">
|
|
|
+ <a-input id="allocateReturnDetailReport-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="调拨退货对象名称">
|
|
|
+ <a-input id="allocateReturnDetailReport-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="调拨退货类型">
|
|
|
+ <AllocateType id="allocateReturnDetailReport-allocateReturnTypeSn" v-model="queryParam.allocateReturnTypeSn"></AllocateType>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="调拨退货对象类型">
|
|
|
+ <v-select
|
|
|
+ code="TARGET_TYPE"
|
|
|
+ id="allocateReturnDetailReport-argetType"
|
|
|
+ v-model="queryParam.targetType"
|
|
|
+ allowClear
|
|
|
+ placeholder="请选择调拨退货对象类型"></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
+ <subarea id="allocateReturnDetailReport-subareaSn" v-model="queryParam.subareaSn"></subarea>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-model-item label="产品编码">
|
|
|
- <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-model-item label="所在省份">
|
|
|
+ <a-select v-model="queryParam.dealerProvinceSn" allowClear placeholder="请选择省">
|
|
|
+ <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品名称">
|
|
|
- <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="客户名称">
|
|
|
- <a-input id="salesReturnDetailList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="客户级别">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.dealerLevel"
|
|
|
- ref="dealerLevel"
|
|
|
- id="salesReturnDetailList-dealerLevel"
|
|
|
- code="DEALER_LEVEL"
|
|
|
- placeholder="请选择客户级别"
|
|
|
- allowClear></v-select>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-model-item label="产品品牌">
|
|
|
+ <ProductBrand id="allocateReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
<a-form-model-item label="品牌分类">
|
|
|
- <v-select code="BRAND_TYPE" id="salesReturnDetailList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
|
|
|
+ <v-select code="BRAND_TYPE" id="allocateReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品品牌">
|
|
|
- <ProductBrand id="salesReturnDetailList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="产品分类">
|
|
|
<a-cascader
|
|
|
@change="changeProductType"
|
|
@@ -67,43 +73,21 @@
|
|
|
change-on-select
|
|
|
:options="productTypeList"
|
|
|
:fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
|
|
|
- id="salesReturnDetailList-productType"
|
|
|
+ id="allocateReturnDetailReport-productType"
|
|
|
placeholder="请选择产品分类"
|
|
|
allowClear
|
|
|
v-model="productType" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="所在区域">
|
|
|
- <subarea id="salesReturnDetailList-subareaSn" v-model="queryParam.subareaSn"></subarea>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
+ <a-form-model-item label="产品名称">
|
|
|
+ <a-input id="allocateReturnDetailReport-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="12" :sm="24">
|
|
|
- <a-row>
|
|
|
- <a-form-model-item label="地区">
|
|
|
- <a-col span="7">
|
|
|
- <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealerProvinceSn" allowClear @change="getCityList" placeholder="请选择省">
|
|
|
- <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col span="7" offset="1">
|
|
|
- <a-form-model-item prop="dealerCitySn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealerCitySn" allowClear @change="getAreaList" placeholder="请选择市">
|
|
|
- <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col span="7" offset="1">
|
|
|
- <a-form-model-item prop="dealerCountySn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealerCountySn" allowClear placeholder="请选择区/县">
|
|
|
- <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- </a-form-model-item>
|
|
|
- </a-row>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
+ <a-form-model-item label="产品编码">
|
|
|
+ <a-input id="allocateReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
+ </a-form-model-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
|
<a-col :md="8" :sm="24" style="margin-bottom: 10px;">
|
|
@@ -112,9 +96,9 @@
|
|
|
class="button-info"
|
|
|
size="small"
|
|
|
@click="handleStock"
|
|
|
- id="salesReturnDetailList-stockDate">盘点区间日期</a-button>
|
|
|
- <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
|
|
|
+ id="allocateReturnDetailReport-stockDate">盘点区间日期</a-button>
|
|
|
+ <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="allocateReturnDetailReport-refresh">查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="allocateReturnDetailReport-reset">重置</a-button>
|
|
|
<a-button
|
|
|
style="margin-left: 10px"
|
|
|
type="primary"
|
|
@@ -123,7 +107,7 @@
|
|
|
:disabled="disabled"
|
|
|
:loading="exportLoading"
|
|
|
v-if="$hasPermissions('B_salerReturnDetailTable_export')"
|
|
|
- id="salesReturnDetailList-export">导出</a-button>
|
|
|
+ id="allocateReturnDetailReport-export">导出</a-button>
|
|
|
<a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
@@ -145,15 +129,11 @@
|
|
|
bordered>
|
|
|
<template slot="footer">
|
|
|
<a-row :gutter="15">
|
|
|
- <a-col :md="4" :sm="24">退货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24">返工数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24">坏件数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24">正常退货数量:{{ (totalData && (totalData.totalNormalQty || totalData.totalNormalQty==0)) ? totalData.totalNormalQty : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? totalData.totalNormalPrice : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? totalData.totalNormalCost : '--' }}</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? totalData.totalNormalBalance : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.returnQty || totalData.returnQty==0)) ? totalData.returnQty : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.badQty || totalData.badQty==0)) ? totalData.badQty : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.backStockQty || totalData.backStockQty==0)) ? totalData.backStockQty : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
|
|
|
</a-row>
|
|
|
</template>
|
|
|
</s-table>
|
|
@@ -169,18 +149,17 @@ import getDate from '@/libs/getDate.js'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDateTime from '@/views/common/rangeDateTime.vue'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
-import custList from '@/views/common/custList.vue'
|
|
|
import reportModal from '@/views/common/reportModal.vue'
|
|
|
+import AllocateType from '@/views/common/allocateType.js'
|
|
|
import { getArea } from '@/api/data'
|
|
|
-import { productBrandQuery } from '@/api/productBrand'
|
|
|
import { productTypeQuery } from '@/api/productType'
|
|
|
import ProductBrand from '@/views/common/productBrand.js'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
-import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
|
|
|
+import { allocateReturnReportDetailQueryPage, allocateReturnReportDetailQueryCount, reportSalesReturnDetailExport } from '@/api/reportData'
|
|
|
export default {
|
|
|
name: 'TransferReturnDetailReportList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
|
|
|
+ components: { STable, VSelect, rangeDateTime, subarea, ProductBrand, reportModal, AllocateType },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -194,20 +173,19 @@ export default {
|
|
|
],
|
|
|
beginDate: getDate.getCurrMonthDays().starttime,
|
|
|
endDate: getDate.getCurrMonthDays().endtime,
|
|
|
- salesReturnBillNo: '',
|
|
|
+ allocateReturnNo: '',
|
|
|
productCode: '',
|
|
|
productName: '',
|
|
|
- dealerName: '',
|
|
|
- dealerLevel: undefined,
|
|
|
+ targetName: '',
|
|
|
+ allocateReturnTypeSn: undefined,
|
|
|
+ targetType: undefined,
|
|
|
productBrandTypeSn: undefined,
|
|
|
productBrandSn: undefined, // 产品品牌
|
|
|
productTypeSn1: '', // 产品一级分类
|
|
|
productTypeSn2: '', // 产品二级分类
|
|
|
productTypeSn3: '', // 产品三级分类
|
|
|
subareaSn: undefined,
|
|
|
- dealerProvinceSn: undefined,
|
|
|
- dealerCitySn: undefined,
|
|
|
- dealerCountySn: undefined
|
|
|
+ dealerProvinceSn: undefined
|
|
|
},
|
|
|
productType: [],
|
|
|
rules: {
|
|
@@ -221,7 +199,7 @@ export default {
|
|
|
this.spinning = true
|
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
|
delete params.time
|
|
|
- return reportSalesReturnDetailList(params).then(res => {
|
|
|
+ return allocateReturnReportDetailQueryPage(params).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -240,7 +218,6 @@ export default {
|
|
|
addrProvinceList: [], // 省下拉
|
|
|
addrCityList: [], // 市下拉
|
|
|
addrDistrictList: [], // 区下拉
|
|
|
- productBrandList: [], // 品牌下拉数据
|
|
|
productTypeList: [] // 分类下拉数据
|
|
|
}
|
|
|
},
|
|
@@ -248,50 +225,27 @@ export default {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '客户名称', dataIndex: 'dealerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '退货数量', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '调拨退货单号', dataIndex: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '退货完成日期', dataIndex: 'financeAuditTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '调拨退货对象名称', dataIndex: 'targetName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '调拨退货类型', dataIndex: 'allocateReturnTypeName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '二级分类', dataIndex: 'productEntity.productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productEntity.name', width: 250, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '产品编码', dataIndex: 'productEntity.code', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '退货数量', dataIndex: 'returnQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '坏件数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '退货开单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
- // { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
+ { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '退货单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '退货入库成本', dataIndex: 'totalCost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
|
|
|
- const ind = this.$hasPermissions('B_isShowPrice') ? 23 : 16
|
|
|
- arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
}
|
|
|
if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
|
|
|
- const ind = this.$hasPermissions('B_isShowCost') ? 25 : 24
|
|
|
- arr.splice(16, 0, { title: '退货开单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(17, 0, { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(18, 0, { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(19, 0, { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(20, 0, { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(21, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(22, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(ind, 0, { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
}
|
|
|
return arr
|
|
|
}
|
|
@@ -303,7 +257,7 @@ export default {
|
|
|
},
|
|
|
// 总计
|
|
|
getCount (params) {
|
|
|
- reportSalesReturnDetailCount(params).then(res => {
|
|
|
+ allocateReturnReportDetailQueryCount(params).then(res => {
|
|
|
if (res.status == 200 && res.data) {
|
|
|
this.totalData = res.data
|
|
|
} else {
|
|
@@ -343,11 +297,12 @@ export default {
|
|
|
this.$refs.rangeDate.resetDate(this.queryParam.time)
|
|
|
this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
|
|
|
this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
|
- this.queryParam.salesReturnBillNo = ''
|
|
|
+ this.queryParam.allocateReturnNo = ''
|
|
|
this.queryParam.productCode = ''
|
|
|
this.queryParam.productName = ''
|
|
|
- this.queryParam.dealerName = ''
|
|
|
- this.queryParam.dealerLevel = undefined
|
|
|
+ this.queryParam.targetName = ''
|
|
|
+ this.queryParam.allocateReturnTypeSn = undefined
|
|
|
+ this.queryParam.targetType = undefined
|
|
|
this.queryParam.productBrandTypeSn = undefined
|
|
|
this.queryParam.productBrandSn = undefined
|
|
|
this.queryParam.productTypeSn1 = ''
|
|
@@ -355,8 +310,6 @@ export default {
|
|
|
this.queryParam.productTypeSn3 = ''
|
|
|
this.queryParam.subareaSn = undefined
|
|
|
this.queryParam.dealerProvinceSn = undefined
|
|
|
- this.queryParam.dealerCitySn = undefined
|
|
|
- this.queryParam.dealerCountySn = undefined
|
|
|
this.productType = []
|
|
|
this.totalData = null
|
|
|
this.$refs.ruleForm.resetFields()
|
|
@@ -391,16 +344,6 @@ export default {
|
|
|
this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
|
|
|
this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
|
|
|
},
|
|
|
- // 产品品牌 列表
|
|
|
- getProductBrand () {
|
|
|
- productBrandQuery({}).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.productBrandList = res.data
|
|
|
- } else {
|
|
|
- this.productBrandList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
// 产品分类 列表
|
|
|
getProductType () {
|
|
|
productTypeQuery({}).then(res => {
|
|
@@ -411,24 +354,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 获取城市列表
|
|
|
- getCityList (val) {
|
|
|
- this.addrCityList = []
|
|
|
- this.addrDistrictList = []
|
|
|
- this.queryParam.dealerCitySn = undefined
|
|
|
- this.queryParam.dealerCountySn = undefined
|
|
|
- if (val) {
|
|
|
- this.getArea('city', val)
|
|
|
- }
|
|
|
- },
|
|
|
- // 获取区县列表
|
|
|
- getAreaList (val) {
|
|
|
- this.addrDistrictList = []
|
|
|
- this.queryParam.dealerCountySn = undefined
|
|
|
- if (val) {
|
|
|
- this.getArea('district', val)
|
|
|
- }
|
|
|
- },
|
|
|
// 省/市/区
|
|
|
getArea (leve, sn) {
|
|
|
let params
|
|
@@ -458,7 +383,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
pageInit () {
|
|
|
- this.getProductBrand()
|
|
|
this.getProductType()
|
|
|
this.getArea('province')
|
|
|
}
|