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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mg-ocr-invoice",
   "private": false,
-  "version": "0.2.4-beta",
+  "version": "0.2.4-beta0.5",
   "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">
@@ -211,11 +211,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 +317,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 {
@@ -525,9 +533,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/const.ts

@@ -15,8 +15,8 @@ export const const_invoiceExceptionInfo: any = {
   invalid: '无效发票',
 }
 export const const_manualModify: any = {
-  '手动录入': true,
-  '非手动录入': false,
+  手动录入: true,
+  非手动录入: false,
 }
 export const const_taskStatus: any = {
   init: '初始状态',
@@ -39,7 +39,6 @@ export const setClass = (type: any) => {
       return 'ok'
     case 'used':
       return 'default'
-
     case 'noNeed':
       return 'ok'
     case 'notCheck':
@@ -48,6 +47,10 @@ export const setClass = (type: any) => {
       return 'ok'
     case 'checkFail':
       return 'error'
+    case 'abnormal':
+      return 'error'
+    case 'invalid':
+      return 'error'
     default:
       return 'ok'
   }

package/src/components/InvoiceList/index.vue

@@ -48,6 +48,11 @@
                   <span v-if="item.manualModify" class="manual">
                     手工录入
                   </span>
+                  <div v-else-if="item.invoiceExceptionInfo">
+                    <span :class="setClass(item.invoiceExceptionInfo)">{{
+                      const_invoiceExceptionInfo[item.invoiceExceptionInfo]
+                    }}</span>
+                  </div>
                   <span v-else :class="setClass(item.realStatus)">{{
                     const_realStatus[item.realStatus]
                   }}</span>
@@ -185,6 +190,7 @@ import {
   const_invoiceStatus,
   const_realStatus,
   const_taskStatus,
+  const_invoiceExceptionInfo,
   setClass,
 } from './const'
 import { showImagePreview } from 'vant'
@@ -245,10 +251,11 @@ const getList = async () => {
 const clickItem = (row: any) => {
   row.selected = !row.selected
 }
+
 const openDetails = (row: any) => {
-  if (row.taskStatus !== 'finish' && row.taskStatus !== 'repeat') {
-    return
-  }
+  // if (!isEdit(row)) {
+  //   return
+  // }
   emit(
     'edit',
     {
@@ -259,28 +266,29 @@ const openDetails = (row: any) => {
     list.value
   )
 }
-const everyStatus = (item: any) => {
+const selectStatus = (item: any) => {
+  // 未使用&& (验真通过||无需验真|| 手工录入||验真异常) && 发票推断状态错误值为空 && 发票识别任务已完成
   return (
-    item.invoiceStatus === 'unused' ||
-    item.invoiceStatus === 'invalid' ||
-    item.taskStatus === 'ocr_success' ||
-    item.taskStatus === 'repeat' ||
-    item.taskStatus === 'finish' ||
-    item.realStatus === 'noNeed' ||
-    item.realStatus === 'notCheck' ||
-    item.realStatus === 'checked' ||
-    item.realStatus === 'checkFail'
+    item.invoiceStatus === 'unused' &&
+    (item.realStatus === 'checked' ||
+      item.realStatus === 'noNeed' ||
+      item.manualModify ||
+      item.realStatus === 'checkFail' ||
+      !item.invoiceExceptionInfo) &&
+    (item.taskStatus === 'ocr_success' ||
+      item.taskStatus === 'repeat' ||
+      item.taskStatus === 'finish')
   )
 }
 const selectedAll: any = ref(false)
 const changeSelectAll = (v: any) => {
   list.value.forEach((item: any) => {
-    item.selected = everyStatus(item) && selectedAll.value
+    item.selected = selectStatus(item) && selectedAll.value
   })
 }
 const changeItemCheckbox = () => {
   const status = list.value
-    .filter((item: any) => everyStatus(item))
+    .filter((item: any) => selectStatus(item))
     .every((item: any) => item.selected)
   selectedAll.value = status
 }
@@ -341,16 +349,16 @@ const submitBtn = computed(() => {
   const flag = list.value
     .filter((item: any) => item.selected)
     .every((item: any) => {
-      return everyStatus(item)
+      return selectStatus(item)
     })
   return flag && list.value.filter((item: any) => item.selected).length > 0
 })
 const selectedLength = computed(() => {
-  return list.value.filter((item: any) => item.selected && everyStatus(item))
+  return list.value.filter((item: any) => item.selected && selectStatus(item))
     .length
 })
 const selectedLengthCount = computed(() => {
-  return list.value.filter((item: any) => everyStatus(item)).length
+  return list.value.filter((item: any) => selectStatus(item)).length
 })
 const openErrImg = (url: any) => {
   showImagePreview([url])
@@ -361,7 +369,10 @@ const ok = () => {
     return
   }
   if (!submitBtn.value) {
-    showToast({ type: 'text', message: '存在异常发票，无法提交' })
+    showToast({
+      type: 'text',
+      message: '存在异常发票，无法提交, 请先去修改发票金额',
+    })
     return
   }
   // showDeleteBtn.value = false
@@ -370,9 +381,6 @@ const ok = () => {
     .map((item: any) => {
       let obj: any = { ...item }
       // 验真状态 1,绿色 2,黄色, 3,红色
-      // 绿色: 验真成功或(无需验真且金额校验成功)或无需验证
-      // 黄色: (未验真或验真异常)且金额校验失败
-      // 剩下的场景都为红色
       if (
         item.realStatus === 'checked' ||
         (item.realStatus === 'noNeed' && !item.manualModify)