diff --git a/src/views/inventory/LngInventoryIn/components/createForm.vue b/src/views/inventory/LngInventoryIn/components/createForm.vue index 3ddb816..2cc4c59 100644 --- a/src/views/inventory/LngInventoryIn/components/createForm.vue +++ b/src/views/inventory/LngInventoryIn/components/createForm.vue @@ -151,7 +151,7 @@ - + {{ item.fullName }} @@ -275,7 +275,7 @@ comId: [{ required: true, message: "该项为必填项", trigger: 'change' }], ssTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }], typeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }], - kName: [{ required: true, message: "该项为必填项", trigger: 'change' }], + kName: [{ required: false, message: "该项为必填项", trigger: 'change' }], staName: [{ required: true, message: "该项为必填项", trigger: 'change' }], dateIn: [{ required: true, message: "该项为必填项", trigger: 'change' }], qtyUnloadMmbtu: [{ required: true, message: "该项为必填项", trigger: 'change' }], @@ -372,22 +372,23 @@ } } const numCount = (k) => { - formState.qtyLostMmbtu = Number(formState.qtyUnloadMmbtu || 0)*Number(formState.rateLost || 0)/100 - formState.qtyLostGj = Number(formState.qtyUnloadGj || 0)*Number(formState.rateLost || 0)/100 - formState.qtyLostTon = Number(formState.qtyUnloadTon || 0)*Number(formState.rateLost || 0)/100 - formState.qtyLostM3L = Number(formState.qtyUnloadM3L || 0)*Number(formState.rateLost || 0)/100 - formState.qtyLostM3 = Number(formState.qtyUnloadM3 || 0)*Number(formState.rateLost || 0)/100 + formState.qtyLostMmbtu = (Number(formState.qtyUnloadMmbtu || 0)*Number(formState.rateLost || 0)/100).toFixed(3) + formState.qtyLostGj = (Number(formState.qtyUnloadGj || 0)*Number(formState.rateLost || 0)/100).toFixed(3) + formState.qtyLostTon = (Number(formState.qtyUnloadTon || 0)*Number(formState.rateLost || 0)/100).toFixed(3) + formState.qtyLostM3L = (Number(formState.qtyUnloadM3L || 0)*Number(formState.rateLost || 0)/100).toFixed(3) + formState.qtyLostM3 = (Number(formState.qtyUnloadM3 || 0)*Number(formState.rateLost || 0)/100).toFixed(3) - formState.qtyMmbtu = Number(formState.qtyUnloadMmbtu || 0) - Number(formState.qtyLostMmbtu || 0) - formState.qtyGj = Number(formState.qtyUnloadGj || 0) - Number(formState.qtyLostGj || 0) - formState.qtyTon = Number(formState.qtyUnloadTon || 0) - Number(formState.qtyLostTon || 0) - formState.qtyM3L = Number(formState.qtyUnloadM3L || 0) - Number(formState.qtyLostM3L || 0) - formState.qtyM3 = Number(formState.qtyUnloadM3 || 0) - Number(formState.qtyLostM3 || 0) + formState.qtyMmbtu = (Number(formState.qtyUnloadMmbtu || 0) - Number(formState.qtyLostMmbtu || 0)).toFixed(3) + formState.qtyGj = (Number(formState.qtyUnloadGj || 0) - Number(formState.qtyLostGj || 0)).toFixed(3) + formState.qtyTon = (Number(formState.qtyUnloadTon || 0) - Number(formState.qtyLostTon || 0)).toFixed(3) + formState.qtyM3L = (Number(formState.qtyUnloadM3L || 0) - Number(formState.qtyLostM3L || 0)).toFixed(3) + formState.qtyM3 = (Number(formState.qtyUnloadM3 || 0) - Number(formState.qtyLostM3 || 0)).toFixed(3) - formState.amountCurr = Number(formState.qtyMmbtu || 0)*Number(formState.priceMmbtu || 0) - formState.amount = Number(formState.amountCurr || 0) * Number(formState.rateExPur || 0) - formState.priceTon = Number(formState.qtyTon) ? Number(formState.amount || 0)/Number(formState.qtyTon) : 0 - formState.priceGj = Number(formState.qtyGj) ? Number(formState.amount || 0)/Number(formState.qtyGj) : 0 + formState.amountCurr = (Number(formState.qtyMmbtu || 0)*Number(formState.priceMmbtu || 0)).toFixed(2) + formState.amount = (Number(formState.amountCurr || 0) * Number(formState.rateExPur || 0)).toFixed(2) + formState.priceTon = (Number(formState.qtyTon) ? Number(formState.amount || 0)/Number(formState.qtyTon) : 0).toFixed(4) + formState.priceGj = (Number(formState.qtyGj) ? Number(formState.amount || 0)/Number(formState.qtyGj) : 0).toFixed(4) + } @@ -451,8 +452,8 @@ formState.kId = val[0].id formState.kName = val[0].kName formState.comId = val[0].comId - formState.suCode = val[0].suCode - formState.suName = val[0].suSname + formState.suCode = val[0].cpCode + formState.suName = val[0].cpName } function close() { tabStore.closeTab(currentRoute.value, router); diff --git a/src/views/inventory/LngInventoryOut/components/createForm.vue b/src/views/inventory/LngInventoryOut/components/createForm.vue index 34b1ec1..4673226 100644 --- a/src/views/inventory/LngInventoryOut/components/createForm.vue +++ b/src/views/inventory/LngInventoryOut/components/createForm.vue @@ -249,7 +249,7 @@ } async function getOption() { optionSelect.uomCodeList = await getDictionary('LNG_UOM') - optionSelect.typeCodeList = await getDictionary('LNG_INV_I') + optionSelect.typeCodeList = await getDictionary('LNG_INV_O') let res = await getAllCom() || [] optionSelect.comIdList = res.map(v=> { return { @@ -278,33 +278,32 @@ if (formState.uomCode == 'GJ') { if (!formState.qtyTon) { - formState.qtyTon = Number(formState.rateTonGj) ? Number(formState.qtyGj || 0)/Number(formState.rateTonGj) : 0 + formState.qtyTon = (Number(formState.rateTonGj) ? Number(formState.qtyGj || 0)/Number(formState.rateTonGj) : 0).toFixed(3) amountCount() } if (!formState.amount) { - formState.amount = Number(formState.qtyGj || 0)*Number(formState.priceGj || 0) - amountCount() - + formState.amount = (Number(formState.qtyGj || 0)*Number(formState.priceGj || 0)).toFixed(2) + amountCount() } } if (formState.uomCode == 'TON') { if (!formState.qtyGj) { - formState.qtyGj = Number(formState.qtyTon || 0)*Number(formState.rateTonGj || 0) + formState.qtyGj = (Number(formState.qtyTon || 0)*Number(formState.rateTonGj || 0)).toFixed(3) amountCount() } if (!formState.amount) { - formState.amount = Number(formState.qtyTon || 0)*Number(formState.priceTon || 0) + formState.amount = (Number(formState.qtyTon || 0)*Number(formState.priceTon || 0)).toFixed(2) amountCount() } } } const amountCount = () => { if (!formState.priceTon) { - formState.priceTon = Number(formState.qtyTon) ? Number(formState.amount || 0)/Number(formState.qtyTon) : null + formState.priceTon = (Number(formState.qtyTon) ? Number(formState.amount || 0)/Number(formState.qtyTon) : 0).toFixed(4) } if (!formState.priceGj) { - formState.priceGj = Number(formState.qtyGj) ? Number(formState.amount || 0)/Number(formState.qtyGj) : null + formState.priceGj = (Number(formState.qtyGj) ? Number(formState.amount || 0)/Number(formState.qtyGj) : 0).toFixed(4) } } const onSearchStation = (val)=> {