|
@@ -8,99 +8,115 @@
|
|
|
</a-tab-pane>
|
|
|
</a-tabs>
|
|
|
</div>
|
|
|
- <a-card style="margin-top: 5px;" size="small" :bordered="false">
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <!-- 搜索条件 -->
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
- <a-form layout="inline">
|
|
|
- <a-row :gutter="15">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <a-card style="margin-top: 5px;" class="search-box" size="small" :bordered="false">
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
+ <a-form layout="inline">
|
|
|
+ <a-row :gutter="15">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="创建时间">
|
|
|
+ <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <dealerSubareaScopeList ref="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="销售单号">
|
|
|
+ <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="创建时间">
|
|
|
- <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
+ <a-form-item label="备货单号">
|
|
|
+ <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <dealerSubareaScopeList ref="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
|
|
|
+ <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="销售单号">
|
|
|
- <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
+ <a-form-item label="业务状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.billStatus"
|
|
|
+ ref="billStatus"
|
|
|
+ id="stockPrint-billStatus"
|
|
|
+ code="DISPATCH_BILL_STATUS"
|
|
|
+ placeholder="请选择业务状态"
|
|
|
+ allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="备货单号">
|
|
|
- <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
+ <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
+ <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="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="业务状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.billStatus"
|
|
|
- ref="billStatus"
|
|
|
- id="stockPrint-billStatus"
|
|
|
- code="DISPATCH_BILL_STATUS"
|
|
|
- placeholder="请选择业务状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
- <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" v-if="currentTab == 1">
|
|
|
- <a-form-item label="备货打印状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.printStatus"
|
|
|
- ref="printStatus"
|
|
|
- id="pushOrder-printStatus"
|
|
|
- code="PRINT_STATUS"
|
|
|
- placeholder="请选择备货打印状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="所在区域">
|
|
|
- <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
|
- <Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
|
- <a-form-model-item label="仓库">
|
|
|
- <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- </template>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
- <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
- </span>
|
|
|
+ <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
+ <a-form-item label="备货打印状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.printStatus"
|
|
|
+ ref="printStatus"
|
|
|
+ id="pushOrder-printStatus"
|
|
|
+ code="PRINT_STATUS"
|
|
|
+ placeholder="请选择备货打印状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
- </a-row>
|
|
|
- </a-form>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
+ <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
|
+ <Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
|
+ <a-form-model-item label="仓库">
|
|
|
+ <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ </template>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
+ <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ </a>
|
|
|
+ </span>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
+ </a-form>
|
|
|
+ </div>
|
|
|
+ </a-card>
|
|
|
+ <a-card style="margin-top: 5px;" size="small" :bordered="false">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <div style="display:flex;align-items:center;justify-content: flex-end;">
|
|
|
+ <span>显示:</span>
|
|
|
+ <a-tree-select
|
|
|
+ size="small"
|
|
|
+ v-model="showCols"
|
|
|
+ style="min-width: 200px"
|
|
|
+ dropdownMatchSelectWidth
|
|
|
+ :maxTagCount="3"
|
|
|
+ :tree-data="colsArr"
|
|
|
+ tree-checkable
|
|
|
+ :show-checked-strategy="SHOW_PARENT"
|
|
|
+ placeholder="请选择要显示的列"
|
|
|
+ />
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
<s-table
|
|
@@ -111,7 +127,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ y:tableHeight, x: 1380 }"
|
|
|
+ :scroll="{ y:tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<!-- 销售单号 -->
|
|
@@ -264,41 +280,81 @@ export default {
|
|
|
},
|
|
|
tipData: null,
|
|
|
showPrintModal: false,
|
|
|
- showInfoModal: false
|
|
|
+ showInfoModal: false,
|
|
|
+ showCols:[],
|
|
|
+ colsArr:[
|
|
|
+ {
|
|
|
+ title: '仓库',
|
|
|
+ value: 'warehouseName',
|
|
|
+ key: 'warehouseName'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '业务状态',
|
|
|
+ value: 'billStatusDictValue',
|
|
|
+ key: 'billStatusDictValue'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '单据状态',
|
|
|
+ value: 'voidFlagDictValue',
|
|
|
+ key: 'voidFlagDictValue'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '允许打印时间',
|
|
|
+ value: 'allowPrintTime',
|
|
|
+ key: 'allowPrintTime'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '打印次数',
|
|
|
+ value: 'stockUpPrintTimes',
|
|
|
+ key: 'stockUpPrintTimes'
|
|
|
+ }
|
|
|
+ ]
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
|
|
|
- { title: '创建时间', dataIndex: 'createDate', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '100px', align: 'center' },
|
|
|
- { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '110px', align: 'center' },
|
|
|
+ { title: '创建时间', dataIndex: 'createDate', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '90px', align: 'center' },
|
|
|
+ { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '90px', align: 'center' },
|
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
|
|
|
+ { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '50px', align: 'center', ellipsis: true },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品款数', dataIndex: 'totalCategory', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '产品数量', dataIndex: 'totalQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备货打印状态', width: '60px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
|
|
|
- { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center',fixed:'right'}
|
|
|
+ { title: '产品款数', dataIndex: 'totalCategory', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '产品数量', dataIndex: 'totalQty', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
]
|
|
|
|
|
|
if (this.$hasPermissions('M_stockPrintList_salesPrice')) { // 售价权限
|
|
|
const ind = this.isShowWarehouse ? 10 : 9
|
|
|
arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
- arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
- arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
- arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
- arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ }
|
|
|
+
|
|
|
+ if(this.showCols.includes('warehouseName')){
|
|
|
+ arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
+ }
|
|
|
+ if(this.showCols.includes('billStatusDictValue')){
|
|
|
+ arr.push({ title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
+ }
|
|
|
+ if(this.showCols.includes('voidFlagDictValue')){
|
|
|
+ arr.push({ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
}
|
|
|
+ arr.push({ title: '备货打印状态', width: '50px', align: 'center', scopedSlots: { customRender: 'printStatus' } })
|
|
|
+ if(this.showCols.includes('allowPrintTime')){
|
|
|
+ arr.push({ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '70px', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
+ }
|
|
|
+ if(this.showCols.includes('stockUpPrintTimes')){
|
|
|
+ arr.push({ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
+ }
|
|
|
+
|
|
|
+ arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center'})
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
@@ -440,7 +496,7 @@ export default {
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 253
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 295
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -485,5 +541,10 @@ export default {
|
|
|
.ant-tabs-bar{
|
|
|
margin:0;
|
|
|
}
|
|
|
+ .search-box{
|
|
|
+ .ant-card-body{
|
|
|
+ padding-bottom: 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|