mg-ocr-invoice 0.2.4-beta0.5 → 0.2.4-beta0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mg-ocr-invoice",
   "private": false,
-  "version": "0.2.4-beta0.5",
+  "version": "0.2.4-beta0.6",
   "type": "module",
   "types": "dist/types/index.d.ts",
   "module": "dist/index.es.js",

package/src/components/Invoice/index.vue

@@ -121,7 +121,15 @@
           <div class="marPX">
             <Cell title="价税合计" :value="computed_amount">
               <template #value>
-                <div style="color: #333;font-weight: 400; font-size: 16px;margin-right: 12px;">{{ computed_amount }}</div>
+                <div
+                  style="
+                    color: #333;
+                    font-weight: 400;
+                    font-size: 16px;
+                    margin-right: 12px;
+                  ">
+                  {{ computed_amount }}
+                </div>
               </template>
               <template #right-icon>
                 <div @click="expandObj.showPrice = !expandObj.showPrice">
@@ -325,7 +333,7 @@ const isEdit = computed(() => {
     props.invoiceData.manualModify ||
     props.invoiceData.rerealStatus === 'checkFail'
   )
-}) 
+})
 const submit = async () => {
   showLoading.value = true
   try {
@@ -400,7 +408,12 @@ const blurInput = (e: any, key: any) => {
 const computed_amount = computed(() => {
   let count = new Decimal(0)
   formData.value.itemAmountReqs.forEach((item) => {
-    count = count.plus(new Decimal(item.itemExTaxAmount))
+    let tax_amount = new Decimal(filterNumber(item.itemExTaxAmount)).times(
+      new Decimal(filterNumber(item.itemTaxRate / 100))
+    )
+    count = count.plus(
+      new Decimal(filterNumber(item.itemExTaxAmount)).plus(tax_amount)
+    )
   })
   return count.toFixed(2)
 })

package/src/components/InvoiceList/index.vue

@@ -273,11 +273,11 @@ const selectStatus = (item: any) => {
     (item.realStatus === 'checked' ||
       item.realStatus === 'noNeed' ||
       item.manualModify ||
-      item.realStatus === 'checkFail' ||
-      !item.invoiceExceptionInfo) &&
+      item.realStatus === 'checkFail') &&
     (item.taskStatus === 'ocr_success' ||
       item.taskStatus === 'repeat' ||
-      item.taskStatus === 'finish')
+      item.taskStatus === 'finish') &&
+    !item.invoiceExceptionInfo
   )
 }
 const selectedAll: any = ref(false)