|
@@ -12,12 +12,12 @@
|
|
</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}">
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
- <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturnRemove-buyerSn" @change="custChange" />
|
|
+ <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturnRemove-dealerSn" @change="custChange" />
|
|
</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="总部销退单号">
|
|
<a-form-item label="总部销退单号">
|
|
- <a-input id="salesReturnRemove-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
+ <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入总部销退单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -38,6 +38,7 @@
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
</a-card>
|
|
</a-card>
|
|
|
|
+ <!-- 表格 -->
|
|
<a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
<a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
|
|
<div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
|
|
@@ -68,12 +69,14 @@
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
class="button-info"
|
|
class="button-info"
|
|
|
|
+ v-if="record.show"
|
|
@click="handleEdit(record)"
|
|
@click="handleEdit(record)"
|
|
:id="'salesReturnRemove-edit-btn'+index">编辑</a-button>
|
|
:id="'salesReturnRemove-edit-btn'+index">编辑</a-button>
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
class="button-error"
|
|
class="button-error"
|
|
|
|
+ v-if="record.show"
|
|
@click="handleDel(record)"
|
|
@click="handleDel(record)"
|
|
:id="'salesReturnRemove-del-btn'+index">删除</a-button>
|
|
:id="'salesReturnRemove-del-btn'+index">删除</a-button>
|
|
</div>
|
|
</div>
|
|
@@ -81,7 +84,7 @@
|
|
</s-table>
|
|
</s-table>
|
|
</a-spin>
|
|
</a-spin>
|
|
<!-- 选择客户弹框 -->
|
|
<!-- 选择客户弹框 -->
|
|
- <baseModal :show="openModal" ref="openModal" @ok="handleEdit" @cancel="openModal=false"></baseModal>
|
|
+ <baseModal :show="openModal" ref="openModal" @ok="handleOk" @cancel="openModal=false"></baseModal>
|
|
</a-card>
|
|
</a-card>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -90,13 +93,14 @@
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import baseModal from './baseModal.vue'
|
|
import baseModal from './baseModal.vue'
|
|
|
|
+import { hdExportExcel } from '@/libs/exportExcel'
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
-import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnCancelBill, salesReturnSubmit, submitVerify } from '@/api/salesReturn'
|
|
+import { bizRemoveConfigPageList, bizRemoveConfigDelete, bizRemoveConfigReportExport } from '@/api/bizRemove'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
import getDate from '@/libs/getDate.js'
|
|
import getDate from '@/libs/getDate.js'
|
|
export default {
|
|
export default {
|
|
- name: 'SalesReturnList',
|
|
+ name: 'SalesReturnRemove',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
components: {
|
|
components: {
|
|
STable,
|
|
STable,
|
|
@@ -121,23 +125,25 @@ export default {
|
|
openDepartUserModal: false,
|
|
openDepartUserModal: false,
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
|
|
+ configType: 'BILLING_REPORT',
|
|
beginDate: getDate.getThreeMonthDays().starttime,
|
|
beginDate: getDate.getThreeMonthDays().starttime,
|
|
endDate: getDate.getCurrMonthDays().endtime,
|
|
endDate: getDate.getCurrMonthDays().endtime,
|
|
- buyerSn: undefined, // 客户名称
|
|
+ dealerSn: undefined, // 客户名称
|
|
- salesReturnBillNo: undefined // 总部销退单号
|
|
+ bizNo: undefined // 总部销退单号
|
|
},
|
|
},
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
this.spinning = true
|
|
this.spinning = true
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
- return salesReturnList(params).then(res => {
|
|
+ return bizRemoveConfigPageList(params).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
|
|
+ data.list[i].show = new Date(data.list[i].bizDate).getMonth() == new Date().getMonth()
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|
|
}
|
|
}
|
|
@@ -150,17 +156,16 @@ export default {
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
columns () {
|
|
columns () {
|
|
|
|
+ const a = ['', '剔除']
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '总部销退单号', dataIndex: 'salesReturnBillNo', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '退货日期', dataIndex: 'createDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '退货日期', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
+ { title: '客户名称', dataIndex: 'dealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '全国销售日报', dataIndex: 'goodFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '开单统计(客户)', dataIndex: 'salesStatsDealer', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
|
|
- { title: '项目销售日报1', dataIndex: 'salesReturnTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '开单统计(省份)', dataIndex: 'salesStatsProvince', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
|
|
- { title: '项目销售日报2', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '分区销售日报', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
- { title: '创建时间', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
|
|
|
|
]
|
|
]
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
@@ -173,27 +178,15 @@ export default {
|
|
},
|
|
},
|
|
// 选择客户
|
|
// 选择客户
|
|
custChange (val) {
|
|
custChange (val) {
|
|
- this.queryParam.buyerSn = val.key
|
|
+ this.queryParam.dealerSn = val.key
|
|
- },
|
|
|
|
- // 导出 必填判断
|
|
|
|
- handleExport () {
|
|
|
|
- const _this = this
|
|
|
|
- this.$refs.ruleForm.validate(valid => {
|
|
|
|
- if (valid) {
|
|
|
|
- _this.exportList()
|
|
|
|
- } else {
|
|
|
|
- _this.$message.error('请选择时间')
|
|
|
|
- return false
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
},
|
|
},
|
|
// 导出
|
|
// 导出
|
|
- exportList () {
|
|
+ handleExport () {
|
|
const _this = this
|
|
const _this = this
|
|
const params = JSON.parse(JSON.stringify(_this.queryParam))
|
|
const params = JSON.parse(JSON.stringify(_this.queryParam))
|
|
_this.exportLoading = true
|
|
_this.exportLoading = true
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
- hdExportExcel(manageAnalysisReportExport, params, '各品类经营分析表-' + this.monthVal + '-', function () {
|
|
+ hdExportExcel(bizRemoveConfigReportExport, params, '开单剔除配置-', function () {
|
|
_this.exportLoading = false
|
|
_this.exportLoading = false
|
|
_this.spinning = false
|
|
_this.spinning = false
|
|
})
|
|
})
|
|
@@ -203,16 +196,19 @@ export default {
|
|
this.openModal = true
|
|
this.openModal = true
|
|
this.$refs.openModal.edit(row)
|
|
this.$refs.openModal.edit(row)
|
|
},
|
|
},
|
|
|
|
+ handleOk (res) {
|
|
|
|
+ this.$refs.table.refresh()
|
|
|
|
+ },
|
|
// 删除
|
|
// 删除
|
|
handleDel (row) {
|
|
handleDel (row) {
|
|
const _this = this
|
|
const _this = this
|
|
this.$confirm({
|
|
this.$confirm({
|
|
title: '提示',
|
|
title: '提示',
|
|
- content: '确认要删除吗?',
|
|
+ content: <div>销退单号:{row.bizNo}<div>确认要删除吗?</div></div>,
|
|
centered: true,
|
|
centered: true,
|
|
onOk () {
|
|
onOk () {
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
- salesReturnDel({ salesReturnBillSn: row.salesReturnBillSn }).then(res => {
|
|
+ bizRemoveConfigDelete({ bizSn: row.bizSn, configType: 'BILLING_REPORT' }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
_this.$message.success(res.message)
|
|
_this.$message.success(res.message)
|
|
_this.$refs.table.refresh()
|
|
_this.$refs.table.refresh()
|
|
@@ -222,13 +218,14 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 重置查询
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.$refs.rangeCreateDate.resetDate(this.createDate)
|
|
this.$refs.rangeCreateDate.resetDate(this.createDate)
|
|
this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
- this.queryParam.buyerSn = undefined
|
|
+ this.queryParam.dealerSn = undefined
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
- this.queryParam.salesReturnBillNo = ''
|
|
+ this.queryParam.bizNo = ''
|
|
|
|
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
@@ -240,7 +237,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 250
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 245
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|