Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/receivable/documentary/ticket.vue

@@ -114,10 +114,10 @@
           <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :precision="2"
             controls-position="right" @change="handleChange" />
         </el-form-item>
-        <el-form-item v-if="isSettlement" prop="settlementPaymentDifference" label="回款差额">
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount >= countForm.receivableSupervisePremium" prop="settlementPaymentDifference" label="回款差额" >
           <el-input v-model="countForm.settlementPaymentDifference" disabled></el-input>
         </el-form-item>
-        <el-form-item v-if="isSettlement" prop="settlementPaymentReason" label="差额原因">
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount > countForm.receivableSupervisePremium" prop="settlementPaymentReason" label="差额原因">
           <el-input v-model="countForm.settlementPaymentReason" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="invoiceTime" label="开票日期">
@@ -361,8 +361,13 @@ const handleTicket = async (bool: boolean) => {
 
 /** 计算实收金额与应收监管保费的差值，并将结果赋值给付款差额字段 */
 const handleChange = async () => {
-  const num = await calSub(countForm.value.actualReceivedAmount, countForm.value.receivableSupervisePremium)
-  countForm.value.settlementPaymentDifference = num
+  if (countForm.value.actualReceivedAmount > countForm.value.receivableSupervisePremium) {
+    const num = await calSub(countForm.value.actualReceivedAmount, countForm.value.receivableSupervisePremium)
+    countForm.value.settlementPaymentDifference = num
+  } else {
+    countForm.value.settlementPaymentDifference = 0
+  }
+
 }
 /** 计算应收监管保费差额并更新虚增金额 */
 

src/views/receivable/handingFee/ticket.vue

@@ -187,10 +187,10 @@
         <el-form-item prop="paymentReason" label="虚增金额原因">
           <el-input v-model="countForm.paymentReason" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item v-if="isSettlement" prop="settlementPaymentDifference" label="回款差额">
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount >= countForm.receivableSupervisePremium" prop="settlementPaymentDifference" label="回款差额" >
           <el-input v-model="countForm.settlementPaymentDifference" disabled></el-input>
         </el-form-item>
-        <el-form-item v-if="isSettlement" prop="settlementPaymentReason" label="差额原因">
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount > countForm.receivableSupervisePremium" prop="settlementPaymentReason" label="差额原因">
           <el-input v-model="countForm.settlementPaymentReason" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="invoiceTime" label="开票日期">
@@ -635,8 +635,12 @@ const calBeforeInvoice = async (params: any) => {
 
 /** 计算实收金额与应收监管保费的差值，并将结果赋值给付款差额字段 */
 const handleChange = async () => {
-  const num = await calSub(countForm.value.actualReceivedAmount, countForm.value.receivableSupervisePremium)
-  countForm.value.settlementPaymentDifference = num
+  if (countForm.value.actualReceivedAmount > countForm.value.receivableSupervisePremium) {
+    const num = await calSub(countForm.value.actualReceivedAmount, countForm.value.receivableSupervisePremium)
+    countForm.value.settlementPaymentDifference = num
+  } else {
+    countForm.value.settlementPaymentDifference = 0
+  }
 }
 /** 计算应收监管保费差额并更新虚增金额 */