|
@@ -54,7 +54,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="单位名称">
|
|
|
- <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
|
|
|
+ <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitNameCurrent" allowClear placeholder="请输入单位名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
@@ -105,6 +105,11 @@
|
|
|
:scroll="{ y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
+ <!-- 单位名称 -->
|
|
|
+ <template slot="newUnitName" slot-scope="text, record">
|
|
|
+ <span v-if="record.unitType&&record.unitType=='CUSTOMER'">{{ record.unitNameCurrent||'--' }}</span>
|
|
|
+ <span v-else>{{ record.unitName||'--' }}</span>
|
|
|
+ </template>
|
|
|
<!-- 数量 -->
|
|
|
<template slot="qty" slot-scope="text, record">
|
|
|
<p :class="record.flowType=='PUT' ? 'green':'red'" style="margin: 0;">
|
|
@@ -140,7 +145,7 @@ export default {
|
|
|
bizType: undefined,
|
|
|
bizNo: '',
|
|
|
flowType: undefined,
|
|
|
- unitName: '',
|
|
|
+ unitNameCurrent: '',
|
|
|
warehouseSn: undefined,
|
|
|
state: undefined
|
|
|
},
|
|
@@ -186,7 +191,7 @@ export default {
|
|
|
{ title: '关联单据号', dataIndex: 'bizNo', width: '10%', 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: 'unitName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
+ { 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: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
|
|
@@ -226,7 +231,7 @@ export default {
|
|
|
this.queryParam.bizType = undefined
|
|
|
this.queryParam.bizNo = ''
|
|
|
this.queryParam.flowType = undefined
|
|
|
- this.queryParam.unitName = ''
|
|
|
+ this.queryParam.unitNameCurrent = ''
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
this.queryParam.state = undefined
|
|
|
this.$refs.table.refresh(true)
|