|
@@ -39,14 +39,14 @@
|
|
<a-input id="iQWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
|
|
<a-input id="iQWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="仓库">
|
|
|
|
+ <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
|
|
|
|
+ <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="仓库">
|
|
|
|
- <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
|
|
|
|
- <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
|
|
- </a-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="单据审核时间">
|
|
<a-form-item label="单据审核时间">
|
|
<rangeDate id="iQWarehouseDetail-time" ref="rangeDate" @change="dateChange" />
|
|
<rangeDate id="iQWarehouseDetail-time" ref="rangeDate" @change="dateChange" />
|
|
@@ -68,8 +68,13 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="批次号">
|
|
|
|
+ <a-input id="iQWarehouseDetail-stockBatchNo" v-model.trim="queryParam.stockBatchNo" allowClear placeholder="请输入批次号"/>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
</template>
|
|
</template>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :md="24" :sm="24" style="text-align:center;margin-bottom:10px;">
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="iQWarehouseDetail-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="iQWarehouseDetail-refresh">查询</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="iQWarehouseDetail-reset">重置</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="iQWarehouseDetail-reset">重置</a-button>
|
|
<a @click="advanced=!advanced" style="margin-left: 8px" id="iQWarehouseDetail-advanced">
|
|
<a @click="advanced=!advanced" style="margin-left: 8px" id="iQWarehouseDetail-advanced">
|
|
@@ -153,7 +158,8 @@ export default {
|
|
flowType: undefined, // 入库or出库
|
|
flowType: undefined, // 入库or出库
|
|
unitNameCurrent: '', // 单位名称
|
|
unitNameCurrent: '', // 单位名称
|
|
warehouseSn: undefined, // 仓库sn
|
|
warehouseSn: undefined, // 仓库sn
|
|
- state: undefined// 单据状态
|
|
|
|
|
|
+ state: undefined, // 单据状态
|
|
|
|
+ stockBatchNo: ''// 批次号
|
|
},
|
|
},
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -194,12 +200,12 @@ export default {
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
{ title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '批次号', dataIndex: 'stockBatchNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '批次号', dataIndex: 'stockBatchNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '关联单据号', dataIndex: 'bizNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位名称', scopedSlots: { customRender: 'newUnitName' }, width: '9%', align: 'center', ellipsis: true },
|
|
{ title: '单位名称', scopedSlots: { customRender: 'newUnitName' }, width: '9%', align: 'center', ellipsis: true },
|
|
- { title: '仓库', dataIndex: 'warehouseName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
{ title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
|
|
{ title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
|
|
// { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -240,6 +246,7 @@ export default {
|
|
this.queryParam.unitNameCurrent = ''
|
|
this.queryParam.unitNameCurrent = ''
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.state = undefined
|
|
this.queryParam.state = undefined
|
|
|
|
+ this.queryParam.stockBatchNo = ''
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
// 返回列表
|
|
// 返回列表
|
|
@@ -268,7 +275,7 @@ export default {
|
|
// 表格计算高度
|
|
// 表格计算高度
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 298
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 288
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|