|
@@ -52,6 +52,17 @@
|
|
|
<a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="出入库状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.state"
|
|
|
+ ref="state"
|
|
|
+ id="inventoryQueryWarehouseDetail-state"
|
|
|
+ code="STOCK_FLOW_STATE"
|
|
|
+ placeholder="请选择出入库状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
|
|
@@ -80,7 +91,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ x: 1590, y: tableHeight }"
|
|
|
+ :scroll="{ x: 1870, y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<!-- 数量 -->
|
|
@@ -114,7 +125,8 @@ export default {
|
|
|
bizType: undefined,
|
|
|
flowType: undefined,
|
|
|
unitName: '',
|
|
|
- warehouseSn: undefined
|
|
|
+ warehouseSn: undefined,
|
|
|
+ state: undefined
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -152,15 +164,17 @@ export default {
|
|
|
{ title: '原厂编码', dataIndex: 'productOrigCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '批次号', dataIndex: 'stockBatchNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单据类型', dataIndex: 'bizTypeDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '关联单号', dataIndex: 'bizNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单据审核时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单位名称', dataIndex: 'unitName', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '数量', scopedSlots: { customRender: 'qty' }, width: 80, align: 'center' },
|
|
|
+ { title: '出入库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '总售价', dataIndex: 'totalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowCost')) {
|
|
|
- arr.splice(11, 0, { title: '总成本', dataIndex: 'totalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
+ arr.splice(13, 0, { title: '总成本', dataIndex: 'totalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
}
|
|
|
return arr
|
|
|
}
|
|
@@ -192,6 +206,7 @@ export default {
|
|
|
this.queryParam.flowType = undefined
|
|
|
this.queryParam.unitName = ''
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
+ this.queryParam.state = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
// 返回列表
|
|
@@ -217,7 +232,7 @@ export default {
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 230 - 52
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 230 - 62
|
|
|
}
|
|
|
},
|
|
|
watch: {
|