|
@@ -35,6 +35,17 @@
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="7" :sm="24">
|
|
|
+ <a-form-model-item label="散件入库子类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.sparePartsType"
|
|
|
+ ref="sparePartsType"
|
|
|
+ id="warehousingOrderDetailList-sparePartsType"
|
|
|
+ code="SPARE_PARTS_TYPE"
|
|
|
+ placeholder="请选择散件入库子类型"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="供应商">
|
|
|
<a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商"/>
|
|
|
</a-form-model-item>
|
|
@@ -44,7 +55,7 @@
|
|
|
<a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="产品编码">
|
|
|
<a-input id="warehousingOrderDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
</a-form-model-item>
|
|
@@ -129,16 +140,17 @@ export default {
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
exportLoading: false,
|
|
|
columns: [
|
|
|
- { title: '入库单号', dataIndex: 'stockPutNo', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '入库单号', dataIndex: 'stockPutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '入库开单日期', dataIndex: 'openBillTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '供应商名称', dataIndex: 'supplierName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '供应商名称', dataIndex: 'supplierName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '入库数量', dataIndex: 'putQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '进价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '完成日期', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -215,12 +227,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(reportStockPutDetailExport, params, '入库单明细报表', function () {
|
|
|
+ _this.exportLoading = false
|
|
|
+ _this.spinning = false
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
filterOption (input, option) {
|