From 2e09c9b04e72de04378d4cf16584f74275a1f5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 23 Aug 2024 15:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ2/index.vue            | 16 ++++++++++------
 src/views/qms/inspectionQ2/inspectionQ2.data.ts |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 518e78a42..dfa5503f9 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -197,7 +197,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       setV['standardCostPrice'] = ''
       setV['lightQty'] = 0
       setV['claimAmount'] = ''
-      setV['otherclaimAmount'] = 0
+      setV['otherClaimAmount'] = 0
       setV['summaryAmount'] = 0
       setV['disbursementAmount'] = 0
       setV['remainingAmount'] = 0
@@ -280,7 +280,7 @@ const onChange = (field, e) => {
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -295,17 +295,17 @@ const onChange = (field, e) => {
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
       parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
     ).toFixed(6)
   }
-  if (field == 'otherclaimAmount') {
+  if (field == 'otherClaimAmount') {
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -315,7 +315,7 @@ const onChange = (field, e) => {
   if (field == 'claimAmount') {
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -521,6 +521,10 @@ const formsSuccess = async (formType, data) => {
     message.error('整灯数量不能为0')
     return
   }
+  if (!data.standardCostPrice) {
+    message.error('整灯数量不能为0或空数据')
+    return
+  }
   if (data.activeTime == 0) data.activeTime = null
   if (data.expireTime == 0) data.expireTime = null
 
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 39e526e7e..98d642deb 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -390,7 +390,7 @@ export const Q2 = useCrudSchemas(
     },
     {
       label: '其他索赔金额',
-      field: 'otherclaimAmount',
+      field: 'otherClaimAmount',
       sort: 'custom',
       isSearch: false,
       isTable: true,