客户需求

This commit is contained in:
‘huanghaiixia’
2026-01-22 17:31:32 +08:00
parent 021b5074b5
commit acdc3555ac
11 changed files with 527 additions and 284 deletions

View File

@ -23,7 +23,7 @@
</a-col>
</a-row>
<Card :title="titleNew" :bordered="false" v-if="currentRoute.query.type=='compare'&&titleNew">
<basicForm ref="basicFormRef" :formObj="formStateNew" :list="dataListNew" :disable="currentRoute.query.type"></basicForm>
<basicForm ref="basicFormRef" :formObj="formStateNew" :changeList="diffResultList" :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>
@ -102,6 +102,7 @@
const dataList = ref([])
const dataListNew = ref([])
const basicFormRef = ref()
const diffResultList = ref([])
let optionSelect= reactive({
approCodeList: [],
});
@ -121,17 +122,18 @@
try {
let data = await getLngPngApproCompare(id) || []
spinning.value = false
diffResultList.value = data.diffResultList || []
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.newBean)
let obj1 = changeData(data.newBean || {})
Object.assign(formStateNew, {...obj1.params})
Object.assign(dataListNew.value, obj1.list || [{}])
titleNew.value = '版本V'+ formStateNew.verNo
titleNew.value = formStateNew.verNo ? ('版本V'+ formStateNew.verNo) : ''
} catch (error) {
spinning.value = false
@ -151,6 +153,7 @@
}
}
const changeData = (obj) => {
console.log(obj.lngPngApproPurList, 9999)
let arr = obj.lngPngApproPurList || [{}]
// const startDate = dayjs(obj.datePlan);
// const endDate = dayjs(new Date());
@ -170,7 +173,7 @@
obj.qtySalesM3 = Number(obj.qtySalesM3)/10000
let num = 0;
let num1 = 0;
arr.forEach(v => {
arr.length && arr.forEach(v => {
v.qtyDemandM3 = Number(v.qtyDemandM3)/10000
v.qtySalesM3 = Number(v.qtySalesM3)/10000
num+=(Number(v.qtySalesGj) || 0)