|
@@ -41,18 +41,18 @@
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="单据状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.voidFlag"
|
|
|
+ ref="voidFlag"
|
|
|
+ id="pushOrder-voidFlag"
|
|
|
+ code="VOID_FLAG"
|
|
|
+ placeholder="请选择单据状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="单据状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.voidFlag"
|
|
|
- ref="voidFlag"
|
|
|
- id="pushOrder-voidFlag"
|
|
|
- code="VOID_FLAG"
|
|
|
- placeholder="请选择单据状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="备货打印状态">
|
|
|
<v-select
|
|
@@ -98,9 +98,9 @@
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="新客户首笔订单">
|
|
|
<v-select
|
|
|
- v-model="queryParam.firstFlag"
|
|
|
- ref="firstFlag"
|
|
|
- id="pushOrder-firstFlag"
|
|
|
+ v-model="queryParam.newCustFlag"
|
|
|
+ ref="newCustFlag"
|
|
|
+ id="pushOrder-newCustFlag"
|
|
|
code="FLAG"
|
|
|
placeholder="请选择是否新客户首笔订单"
|
|
|
allowClear></v-select>
|
|
@@ -138,7 +138,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ y:tableHeight, x:1890 }"
|
|
|
+ :scroll="{ y:tableHeight, x:1900 }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<!-- 销售单号 -->
|
|
@@ -148,8 +148,11 @@
|
|
|
</template>
|
|
|
<!-- 备货单号 -->
|
|
|
<template slot="dispatchBillNo" slot-scope="text, record">
|
|
|
- <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
+ <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">
|
|
|
+ {{ record.dispatchBillNo }}
|
|
|
+ </span>
|
|
|
<span v-else>{{ record.dispatchBillNo }}</span>
|
|
|
+ <a-tag v-if="record.newCustFlag==1">新</a-tag>
|
|
|
</template>
|
|
|
<!-- 发货说明 -->
|
|
|
<template slot="explainInfo" slot-scope="text, record">
|
|
@@ -257,7 +260,8 @@ export default {
|
|
|
printStatus: undefined, // 备货打印状态
|
|
|
checkStatus: undefined, // 对单状态
|
|
|
warehouseSn: undefined, // 仓库
|
|
|
- bizUserSn: undefined // 客服
|
|
|
+ bizUserSn: undefined, // 客服
|
|
|
+ newCustFlag: undefined
|
|
|
},
|
|
|
totalData: { // 统计数据
|
|
|
totalAmount: 0, // 总金额
|
|
@@ -296,7 +300,7 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
|
|
|
{ title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
|
|
|
- { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
|
+ { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '130px', align: 'center' },
|
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
@@ -405,6 +409,7 @@ export default {
|
|
|
this.queryParam.checkStatus = undefined
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
this.queryParam.bizUserSn = undefined
|
|
|
+ this.queryParam.newCustFlag = undefined
|
|
|
|
|
|
if (this.advanced) {
|
|
|
this.$refs.subarea.clearData()
|