|
|
@@ -100,6 +100,9 @@
|
|
|
<template #status="text">
|
|
|
<badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.LONG_YAN_PURCHASE_ORDER_STATUS[text]"/>
|
|
|
</template>
|
|
|
+ <template #mergeId="text">
|
|
|
+ <badge :text="text?'已合并':'未合并'" :status="text?'success':'default'"/>
|
|
|
+ </template>
|
|
|
</s-table>
|
|
|
</div>
|
|
|
<BaseForm ref="baseForm" @ok="handleOk"/>
|
|
|
@@ -229,7 +232,15 @@ export default {
|
|
|
width: 100,
|
|
|
dataIndex: 'errorMessage'
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ title: '合并状态',
|
|
|
+ dataIndex: 'mergeId',
|
|
|
+ width: '100px',
|
|
|
+ fixed: 'right',
|
|
|
+ checked: true,
|
|
|
+ align: 'center',
|
|
|
+ scopedSlots: { customRender: 'mergeId' }
|
|
|
+ },
|
|
|
{
|
|
|
title: '状态',
|
|
|
dataIndex: 'status',
|
