|
@@ -114,9 +114,9 @@
|
|
|
<Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="仓库">
|
|
|
- <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
+ <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -329,6 +329,7 @@ export default {
|
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收款单号', dataIndex: 'bookNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收款日期', dataIndex: 'receiptDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '付款方类型', dataIndex: 'payerTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
@@ -349,9 +350,6 @@ export default {
|
|
|
{ title: '收款打印状态', scopedSlots: { customRender: 'printStatus' }, align: 'center', width: '8%' },
|
|
|
{ title: '备注', scopedSlots: { customRender: 'note' }, align: 'center', width: '8%' }
|
|
|
]
|
|
|
- if (this.isShowWarehouse) {
|
|
|
- arr.splice(4, 0, { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
- }
|
|
|
return arr
|
|
|
}
|
|
|
},
|