|
@@ -19,20 +19,33 @@
|
|
|
</a-col>
|
|
|
<a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="入库单号">
|
|
|
- <a-input id="warehousingOrderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入退货单号"/>
|
|
|
+ <a-input id="warehousingOrderList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入退货单号"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="入库类型">
|
|
|
<v-select
|
|
|
- v-model="queryParam.dealerLevel"
|
|
|
- ref="dealerLevel"
|
|
|
- id="warehousingOrderList-dealerLevel"
|
|
|
+ v-model="queryParam.putBizType"
|
|
|
+ ref="putBizType"
|
|
|
+ id="warehousingOrderList-putBizType"
|
|
|
code="PUT_STOCK_TYPE"
|
|
|
placeholder="请选择入库类型"
|
|
|
allowClear></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
+ <template v-if="advanced">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-model-item label="散件入库子类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.sparePartsType"
|
|
|
+ ref="sparePartsType"
|
|
|
+ id="warehousingOrderList-sparePartsType"
|
|
|
+ code="SPARE_PARTS_TYPE"
|
|
|
+ placeholder="请选择散件入库子类型"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ </template>
|
|
|
<a-col :md="8" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button
|
|
|
type="primary"
|
|
@@ -49,17 +62,13 @@
|
|
|
@click="handleExport"
|
|
|
:disabled="disabled"
|
|
|
:loading="exportLoading"
|
|
|
+ v-if="$hasPermissions('B_warehousingOrderExport')"
|
|
|
id="warehousingOrderList-export">导出</a-button>
|
|
|
-<!-- <a-button
|
|
|
- style="margin-left: 5px"
|
|
|
- type="primary"
|
|
|
- class="button-warning"
|
|
|
- @click="handleExport"
|
|
|
- :disabled="disabled"
|
|
|
- :loading="exportLoading"
|
|
|
- v-if="$hasPermissions('B_salesOrderTotalExport')"
|
|
|
- id="warehousingOrderList-export">导出</a-button>
|
|
|
- --> </a-col>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ </a>
|
|
|
+ </a-col>
|
|
|
</a-row>
|
|
|
</a-form-model>
|
|
|
</div>
|
|
@@ -76,10 +85,10 @@
|
|
|
<template slot="footer">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="4" :sm="24">
|
|
|
- 总数量:{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}
|
|
|
+ 总数量:{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
- 总金额:{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? totalData.totalPutAmount : '--' }}
|
|
|
+ 总金额:{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? totalData.productTotalCost : '--' }}
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</template>
|
|
@@ -92,23 +101,21 @@
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDateTime from '@/views/common/rangeDateTime.vue'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
-import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
|
|
|
+import { reportStockPutList, reportStockPutCount, reportStockPutExport } from '@/api/reportData'
|
|
|
export default {
|
|
|
components: { STable, VSelect, rangeDateTime },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
|
+ advanced: false,
|
|
|
tableHeight: 0,
|
|
|
queryParam: { // 查询条件
|
|
|
time: [],
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
- salesBillNo: '',
|
|
|
- dealerName: '',
|
|
|
- dealerLevel: undefined,
|
|
|
- creatorId: undefined,
|
|
|
- subareaSn: undefined,
|
|
|
- dealerProvinceSn: undefined
|
|
|
+ stockPutNo: '',
|
|
|
+ putBizType: undefined,
|
|
|
+ sparePartsType: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
|
|
@@ -116,12 +123,13 @@ export default {
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
exportLoading: false,
|
|
|
columns: [
|
|
|
- { title: '入库单号', dataIndex: 'salesBillNo', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '入库开单日期', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '供应商名称', dataIndex: 'dealerName', width: '27%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '入库数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '入库金额', dataIndex: 'totalRealSaleAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '入库类型', dataIndex: 'operatorName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
+ { title: '入库单号', dataIndex: 'stockPutNo', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '入库开单日期', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '供应商名称', dataIndex: 'supplierName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '入库数量', dataIndex: 'productTotalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -129,7 +137,7 @@ export default {
|
|
|
this.spinning = true
|
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
|
delete params.time
|
|
|
- return reportStockPutDetailList(params).then(res => {
|
|
|
+ return reportStockPutList(params).then(res => {
|
|
|
this.getCount(params)
|
|
|
const data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
@@ -151,7 +159,7 @@ export default {
|
|
|
},
|
|
|
// 总计
|
|
|
getCount (params) {
|
|
|
- reportStockPutDetailCount(params).then(res => {
|
|
|
+ reportStockPutCount(params).then(res => {
|
|
|
if (res.status == 200 && res.data) {
|
|
|
this.totalData = res.data
|
|
|
} else {
|
|
@@ -171,7 +179,11 @@ export default {
|
|
|
},
|
|
|
// 创建时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.time = date
|
|
|
+ if (date[0] && date[1]) {
|
|
|
+ this.queryParam.time = date
|
|
|
+ } else {
|
|
|
+ this.queryParam.time = []
|
|
|
+ }
|
|
|
this.queryParam.beginDate = date[0] || ''
|
|
|
this.queryParam.endDate = date[1] || ''
|
|
|
},
|
|
@@ -181,12 +193,9 @@ export default {
|
|
|
this.queryParam.time = []
|
|
|
this.queryParam.beginDate = ''
|
|
|
this.queryParam.endDate = ''
|
|
|
- this.queryParam.salesBillNo = ''
|
|
|
- this.queryParam.dealerName = ''
|
|
|
- this.queryParam.dealerLevel = undefined
|
|
|
- this.queryParam.creatorId = undefined
|
|
|
- this.queryParam.subareaSn = undefined
|
|
|
- this.queryParam.dealerProvinceSn = undefined
|
|
|
+ this.queryParam.stockPutNo = ''
|
|
|
+ this.queryParam.putBizType = undefined
|
|
|
+ this.queryParam.sparePartsType = undefined
|
|
|
this.totalData = null
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
this.$refs.table.clearTable()
|
|
@@ -194,12 +203,18 @@ export default {
|
|
|
// 导出
|
|
|
handleExport () {
|
|
|
const _this = this
|
|
|
- const params = this.queryParam
|
|
|
- this.exportLoading = true
|
|
|
- this.spinning = true
|
|
|
- hdExportExcel(reportStockPutDetailExport, params, '入库单报表', function () {
|
|
|
- _this.exportLoading = false
|
|
|
- _this.spinning = false
|
|
|
+ this.$refs.ruleForm.validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ const params = _this.queryParam
|
|
|
+ _this.exportLoading = true
|
|
|
+ _this.spinning = true
|
|
|
+ hdExportExcel(reportStockPutExport, params, '入库单明细报表', function () {
|
|
|
+ _this.exportLoading = false
|
|
|
+ _this.spinning = false
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
filterOption (input, option) {
|