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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mg-ocr-invoice",
   "private": false,
-  "version": "0.2.4-beta0.1",
+  "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

@@ -12,7 +12,7 @@
           <template #title>
             <div class="Field-title">
               <span class="titleLeft">公司信息</span>
-              <span class="titleright">重新查验</span>
+              <!-- <span class="titleright">重新查验</span> -->
             </div>
           </template>
           <div class="marPX">
@@ -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">
@@ -211,11 +219,11 @@
         </CellGroup>
         <div class="submit">
           <span
-            style="width: 30%; background-color: #07c160; color: #fff"
+            style="flex: 1; background-color: #07c160; color: #fff"
             @click="close">
             返回
           </span>
-          <span @click="submit">保存</span>
+          <span v-if="isEdit" @click="submit">保存</span>
         </div>
       </Form>
     </div>
@@ -317,7 +325,15 @@ const close = () => {
 const openPreViewImg = () => {
   showImagePreview([props.invoiceData.attachmentLink])
 }
-
+const isEdit = computed(() => {
+  // true 允许
+  return (
+    props.invoiceData.realStatus === 'noNeed' ||
+    props.invoiceData.invoiceExceptionInfo === 'abnormal' ||
+    props.invoiceData.manualModify ||
+    props.invoiceData.rerealStatus === 'checkFail'
+  )
+})
 const submit = async () => {
   showLoading.value = true
   try {
@@ -392,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)
 })
@@ -525,9 +546,11 @@ onMounted(() => {
     padding: 0 12px;
     z-index: 2;
     background-color: #fff;
+    gap: 12px;
     span {
+      flex: 2;
       background-color: #266fe8;
-      width: 68%;
+      // width: 68%;
       font-size: 15px;
       color: #fff;
       height: 44px;

package/src/components/InvoiceList/index.vue

@@ -251,19 +251,11 @@ const getList = async () => {
 const clickItem = (row: any) => {
   row.selected = !row.selected
 }
-const isEdit = (row: any) => {
-  // true 允许
-  return (
-    row.realStatus === 'noNeed' ||
-    row.invoiceExceptionInfo === 'abnormal' ||
-    row.manualModify ||
-    row.rerealStatus === 'checkFail'
-  )
-}
+
 const openDetails = (row: any) => {
-  if (!isEdit(row)) {
-    return
-  }
+  // if (!isEdit(row)) {
+  //   return
+  // }
   emit(
     'edit',
     {
@@ -275,18 +267,17 @@ const openDetails = (row: any) => {
   )
 }
 const selectStatus = (item: any) => {
-  console.log(item)
   // 未使用&& (验真通过||无需验真|| 手工录入||验真异常) && 发票推断状态错误值为空 && 发票识别任务已完成
   return (
     item.invoiceStatus === 'unused' &&
     (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)