关联主合同优化
This commit is contained in:
@ -221,7 +221,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract,getParameter } from '/@/api/contract/ContractProc';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
import { h } from 'vue';
|
||||
@ -577,10 +577,10 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'S')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
@ -588,19 +588,8 @@
|
||||
formState.curCode = formState.curCode ? formState.curCode : res?.curCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -285,7 +285,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurInt';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getAllCurrency } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
@ -631,10 +631,10 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'S')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
@ -642,19 +642,8 @@
|
||||
formState.curCode = formState.curCode ? formState.curCode : res?.curCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -127,7 +127,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractPurLng';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getAllCurrency } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
@ -394,10 +394,10 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'S')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
@ -405,19 +405,8 @@
|
||||
formState.curCode = formState.curCode ? formState.curCode : res?.curCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -187,7 +187,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractPurPng';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
import { h } from 'vue';
|
||||
@ -526,29 +526,18 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].id || a[0].idNew)
|
||||
const res = await getMainContractById(a[0].id || a[0].idNew, 'S')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -189,7 +189,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSales';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
import { getAppEnvConfig } from '/@/utils/env';
|
||||
@ -557,29 +557,18 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'C')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -286,7 +286,7 @@
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import {getAllPriceTerm} from '/@/api/contract/ContractPurInt';
|
||||
import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractSalesInt';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getAllCurrency } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
@ -633,10 +633,10 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'C')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
@ -644,19 +644,8 @@
|
||||
formState.curCode = formState.curCode ? formState.curCode : res?.curCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -164,7 +164,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSalesLng';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
import { getAppEnvConfig } from '/@/utils/env';
|
||||
@ -482,29 +482,18 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].id || a[0].idNew)
|
||||
const res = await getMainContractById(a[0].id || a[0].idNew, 'C')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
@ -225,7 +225,7 @@
|
||||
import { getDictionary } from '/@/api/sales/Customer';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractTransPng';
|
||||
import { getLngContractFact } from '/@/api/contract/ContractFact';
|
||||
import { getMainContractById } from '/@/api/contract/ContractFact';
|
||||
import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
|
||||
import dayjs from 'dayjs';
|
||||
import { h } from 'vue';
|
||||
@ -595,10 +595,10 @@
|
||||
a.push(v)
|
||||
}
|
||||
})
|
||||
if(a.length == 1) {
|
||||
if(a.length >= 1) {
|
||||
spinning.value = true
|
||||
try {
|
||||
const res = await getLngContractFact(a[0].kFactId)
|
||||
const res = await getMainContractById(a[0].kFactId, 'S')
|
||||
spinning.value = false
|
||||
formState.kNo = formState.kNo ? formState.kNo : res?.kNo
|
||||
formState.kName = formState.kName ? formState.kName : res?.kName
|
||||
@ -606,19 +606,8 @@
|
||||
formState.curCode = formState.curCode ? formState.curCode : res?.curCode
|
||||
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
|
||||
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
|
||||
let arr = res?.lngContractFactCpList || []
|
||||
let arrSales = []
|
||||
let arrSupplier = []
|
||||
arr.forEach(v=> {
|
||||
if (v.cpTableName == 'lng_customer') {
|
||||
arrSales.push(v)
|
||||
}
|
||||
if (v.cpTableName == 'lng_supplier') {
|
||||
arrSupplier.push(v)
|
||||
}
|
||||
})
|
||||
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
|
||||
formState.cpName = formState.cpName ? formState.cpName : res?.cpName
|
||||
formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
|
||||
|
||||
} catch (error) {
|
||||
spinning.value = false
|
||||
|
||||
Reference in New Issue
Block a user