|
@@ -6,7 +6,7 @@
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="创建时间">
|
|
|
|
|
|
+ <a-form-item label="下推时间">
|
|
<rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
<rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
@@ -204,8 +204,8 @@ export default {
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
],
|
|
],
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
- beginDate: getDate.getThreeMonthDays().starttime,
|
|
|
|
- endDate: getDate.getCurrMonthDays().endtime,
|
|
|
|
|
|
+ pushedBeginDate: getDate.getThreeMonthDays().starttime,
|
|
|
|
+ pushedEndDate: getDate.getCurrMonthDays().endtime,
|
|
buyerSn: undefined, // 客户名称
|
|
buyerSn: undefined, // 客户名称
|
|
salesBillNo: '', // 销售单号
|
|
salesBillNo: '', // 销售单号
|
|
dispatchBillNo: '', // 备货单号
|
|
dispatchBillNo: '', // 备货单号
|
|
@@ -261,7 +261,7 @@ export default {
|
|
columns () {
|
|
columns () {
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
- { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '下推时间', dataIndex: 'pushedDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据来源', dataIndex: 'salesBillEntity.salesBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据来源', dataIndex: 'salesBillEntity.salesBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '9%', align: 'center' },
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '9%', align: 'center' },
|
|
@@ -274,10 +274,10 @@ export default {
|
|
{ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
]
|
|
]
|
|
- // 仓库管理权限设置是否显示 (当客户有且只有一条仓库管理权限时,不显示仓库信息)
|
|
|
|
- if (this.isShowWarehouse) {
|
|
|
|
- arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
|
- }
|
|
|
|
|
|
+ // 仓库管理权限设置是否显示 (当客户有且只有一条仓库管理权限时,不显示仓库信息)
|
|
|
|
+ if (this.isShowWarehouse) {
|
|
|
|
+ arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
|
+ }
|
|
if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { // 售价权限
|
|
if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { // 售价权限
|
|
arr.splice(this.isShowWarehouse ? 9 : 8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
arr.splice(this.isShowWarehouse ? 9 : 8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
@@ -291,8 +291,8 @@ export default {
|
|
},
|
|
},
|
|
// 时间 change
|
|
// 时间 change
|
|
dateChange (date) {
|
|
dateChange (date) {
|
|
- this.queryParam.beginDate = date[0]
|
|
|
|
- this.queryParam.endDate = date[1]
|
|
|
|
|
|
+ this.queryParam.pushedBeginDate = date[0]
|
|
|
|
+ this.queryParam.pushedEndDate = date[1]
|
|
},
|
|
},
|
|
subareaChange (val) {
|
|
subareaChange (val) {
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
@@ -301,8 +301,8 @@ export default {
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
- this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
|
|
- this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
|
|
|
|
+ this.queryParam.pushedBeginDate = getDate.getThreeMonthDays().starttime
|
|
|
|
+ this.queryParam.pushedEndDate = getDate.getCurrMonthDays().endtime
|
|
this.queryParam.buyerSn = undefined
|
|
this.queryParam.buyerSn = undefined
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
this.queryParam.salesBillNo = ''
|
|
this.queryParam.salesBillNo = ''
|