优化
This commit is contained in:
@ -103,15 +103,15 @@ import { useI18n } from '/@/hooks/web/useI18n';
|
||||
|
||||
});
|
||||
const columns= ref([
|
||||
{ title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
|
||||
{ title: t('上载点'), dataIndex: 'pointUpName', sorter: true, width:400},
|
||||
{ title: t('供应商'), dataIndex: 'suName', sorter: true, width: 400},
|
||||
{ title: t('采购合同'), dataIndex: 'kpName', sorter: true, width: 400},
|
||||
{ title: t('指定量(吉焦)'), dataIndex: 'qtyDemandGj', sorter: true, width: 300},
|
||||
{ title: t('指定量(方)'), dataIndex: 'qtyDemandM3', sorter: true, width: 200},
|
||||
{ title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', sorter: true, width: 200},
|
||||
{ title: t('批复量(方)'), dataIndex: 'qtySalesM3', sorter: true, width: 200},
|
||||
{ title: t('备注'), dataIndex: 'note', sorter: true, width: 300},
|
||||
{ title: t('序号'), dataIndex: 'index', key: 'index', customRender: (column) => `${column.index + 1}` ,width: 100},
|
||||
{ title: t('上载点'), dataIndex: 'pointUpName', width:400},
|
||||
{ title: t('供应商'), dataIndex: 'suName', width: 400},
|
||||
{ title: t('采购合同'), dataIndex: 'kpName', width: 400},
|
||||
{ title: t('指定量(吉焦)'), dataIndex: 'qtyDemandGj', width: 300},
|
||||
{ title: t('指定量(方)'), dataIndex: 'qtyDemandM3', width: 200},
|
||||
{ title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', width: 200},
|
||||
{ title: t('批复量(方)'), dataIndex: 'qtySalesM3', width: 200},
|
||||
{ title: t('备注'), dataIndex: 'note', width: 300},
|
||||
]);
|
||||
const formState = ref()
|
||||
const dataList = ref([])
|
||||
|
||||
@ -22,12 +22,12 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<Card :title="title" :bordered="false" >
|
||||
<basicForm ref="basicFormRef" :formObj="formState" :list="dataList" :disable="currentRoute.query.type"></basicForm>
|
||||
</Card>
|
||||
<Card :title="titleNew" :bordered="false" v-if="currentRoute.query.type=='compare'&&titleNew">
|
||||
<basicForm ref="basicFormRef" :formObj="formStateNew" :list="dataListNew" :disable="currentRoute.query.type"></basicForm>
|
||||
</Card>
|
||||
<Card :title="title" :bordered="false" >
|
||||
<basicForm ref="basicFormRef" :formObj="formState" :list="dataList" :disable="currentRoute.query.type"></basicForm>
|
||||
</Card>
|
||||
</a-form>
|
||||
</div>
|
||||
</a-spin>
|
||||
@ -121,23 +121,17 @@
|
||||
try {
|
||||
let data = await getLngPngApproCompare(id) || []
|
||||
spinning.value = false
|
||||
if (data.length == 1) {
|
||||
let obj = changeData(data[0])
|
||||
Object.assign(formState, {...obj.params})
|
||||
Object.assign(dataList.value, obj.list || [{}])
|
||||
title.value = '版本V'+ formState.verNo
|
||||
}
|
||||
if (data.length > 1) {
|
||||
let obj = changeData(data[0])
|
||||
|
||||
let obj = changeData(data.oldBean)
|
||||
Object.assign(formState, {...obj.params})
|
||||
Object.assign(dataList.value, obj.list || [{}])
|
||||
title.value = '版本V'+ formState.verNo
|
||||
|
||||
let obj1 = changeData(data[1])
|
||||
let obj1 = changeData(data.newBean)
|
||||
Object.assign(formStateNew, {...obj1.params})
|
||||
Object.assign(dataListNew.value, obj1.list || [{}])
|
||||
titleNew.value = '版本V'+ formStateNew.verNo
|
||||
}
|
||||
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
Reference in New Issue
Block a user