|
@@ -35,9 +35,7 @@
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="收款方式">
|
|
|
- <a-select id="salesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
|
|
|
- <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
+ <v-select code="SETTLE_STYLE" id="salesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式" ></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -181,7 +179,6 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { downloadExcel } from '@/libs/JGPrint.js'
|
|
|
import { getArea } from '@/api/data'
|
|
|
import { custTypeFindAllList } from '@/api/custType'
|
|
|
-import { settleStyleFindAllList } from '@/api/customer'
|
|
|
import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
|
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
|
import { warehouseCascadeList } from '@/api/warehouse'
|
|
@@ -229,7 +226,7 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '客户名称', dataIndex: 'salesTargetName', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -269,7 +266,6 @@ export default {
|
|
|
linkageGroupData: [],
|
|
|
allocateTypeList: [], // 调拨类型
|
|
|
custTypeList: [], // 客户类型 下拉数据
|
|
|
- settleStyleList: [], // 收款方式 下拉数据
|
|
|
productBrandList: [], // 品牌下拉数据
|
|
|
productType: [],
|
|
|
productTypeList: [], // 分类下拉数据
|
|
@@ -367,16 +363,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 收款方式
|
|
|
- getSettleStyleList () {
|
|
|
- settleStyleFindAllList().then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.settleStyleList = res.data
|
|
|
- } else {
|
|
|
- this.settleStyleList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
// 产品品牌 列表
|
|
|
getProductBrand () {
|
|
|
dealerProductBrandQuery({}).then(res => {
|
|
@@ -482,7 +468,6 @@ export default {
|
|
|
this.spinning = false
|
|
|
this.getArea('province')
|
|
|
this.getCustTypeList()
|
|
|
- this.getSettleStyleList()
|
|
|
this.getProductBrand()
|
|
|
this.getProductType()
|
|
|
this.getWarehouseCascade()
|