Merge remote-tracking branch 'origin/master'

snowy-admin-web/src/views/yqyc/zero/enterprise-ledger/detail.vue

@@ -169,7 +169,7 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="重量比例因子：" name="weightRatioFactor">
-								<a-input v-model:value="bodyData.weightRatioFactor" :disabled="true" placeholder="备案数量 / 法定数量" @change="onChangeWeightRatioFactor"/>
+								<a-input v-model:value="bodyData.weightRatioFactor" :disabled="true" placeholder="备案数量 / 法定数量"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -1235,10 +1235,11 @@ const onChangeRecordQuantity = () => {
 			bodyData.value.recordTotalPrice = ''
 		}
 		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
-			bodyData.value.weightRatioFactor = Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity)
+			bodyData.value.weightRatioFactor = (Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity) * 100).toFixed(2)
 		} else {
 			bodyData.value.weightRatioFactor = ''
 		}
+		bodyData.value.firstRatioFactor = bodyData.value.weightRatioFactor
 		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.inAccountCumulativeAmount) && proxy.$util.isValue(bodyData.value.outAccountCumulativeAmount)) {
 			bodyData.value.remainingRecordAmount = Number(bodyData.value.inAccountCumulativeAmount) - Number(bodyData.value.outAccountCumulativeAmount) - Number(bodyData.value.recordQuantity)
 		} else {
@@ -1258,14 +1259,10 @@ const onChangeRecordPrice = () => {
 const onChangeLegalQuantity = () => {
 	setTimeout(() => {
 		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
-			bodyData.value.weightRatioFactor = Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity)
+			bodyData.value.weightRatioFactor = (Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity) * 100).toFixed(2)
 		} else {
 			bodyData.value.weightRatioFactor = ''
 		}
-	}, 100)
-}
-const onChangeWeightRatioFactor = () => {
-	setTimeout(() => {
 		bodyData.value.firstRatioFactor = bodyData.value.weightRatioFactor
 	}, 100)
 }
@@ -1319,7 +1316,7 @@ const onChangeSp = (val, obj) => {
 const onChangeSelfRate = () => {
 	setTimeout(() => {
 		if (proxy.$util.isValue(productData.value.domesticSalePrice) && proxy.$util.isValue(productData.value.importTotal) && proxy.$util.isValue(productData.value.domesticTotal) && (Number(productData.value.importTotal) + Number(productData.value.domesticTotal) > 0)) {
-			productData.value.selfRate = (Number(productData.value.domesticSalePrice) - Number(productData.value.importTotal) - Number(productData.value.domesticTotal)) / (Number(productData.value.importTotal) + Number(productData.value.domesticTotal))
+			productData.value.selfRate = ((Number(productData.value.domesticSalePrice) - Number(productData.value.importTotal) - Number(productData.value.domesticTotal)) / (Number(productData.value.importTotal) + Number(productData.value.domesticTotal)) * 100).toFixed(2)
 		} else {
 			productData.value.selfRate = ''
 		}

snowy-admin-web/src/views/yqyc/zero/two/out-nuclear-annotation/detail.vue

@@ -231,7 +231,7 @@
 						<a-col :span="8">
 							<a-form-item label="重量比例因子：" name="weightRatioFactor">
 								<a-input v-model:value="bodyData.weightRatioFactor" :disabled="true"
-										 placeholder="申报数量 / 法定数量" allow-clear @change="onChangeWeightRatioFactor"/>
+										 placeholder="申报数量 / 法定数量" allow-clear/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -1053,7 +1053,7 @@ const onChangProductOrderCode = (val) => {
 const onChangeSbNum = () => {
 	setTimeout(() => {
 		if (proxy.$util.isValue(bodyData.value.sbNum) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
-			bodyData.value.weightRatioFactor = Number(bodyData.value.sbNum) / Number(bodyData.value.legalQuantity)
+			bodyData.value.weightRatioFactor = (Number(bodyData.value.sbNum) / Number(bodyData.value.legalQuantity) * 100).toFixed(2)
 		} else {
 			bodyData.value.weightRatioFactor = ''
 		}
@@ -1062,14 +1062,10 @@ const onChangeSbNum = () => {
 const onChangeLegalQuantity = () => {
 	setTimeout(() => {
 		if (proxy.$util.isValue(bodyData.value.sbNum) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
-			bodyData.value.weightRatioFactor = Number(bodyData.value.sbNum) / Number(bodyData.value.legalQuantity)
+			bodyData.value.weightRatioFactor = (Number(bodyData.value.sbNum) / Number(bodyData.value.legalQuantity) * 100).toFixed(2)
 		} else {
 			bodyData.value.weightRatioFactor = ''
 		}
-	}, 100)
-}
-const onChangeWeightRatioFactor = () => {
-	setTimeout(() => {
 		bodyData.value.firstRatioFactor = bodyData.value.weightRatioFactor
 	}, 100)
 }