mg-ocr-invoice 0.1.8 → 0.2.0

package/dist/types/components/OCRInvoice/index.vue.d.ts

@@ -13,6 +13,9 @@ declare const _default: import("vue").DefineComponent<{
     OCR_AuthDomain: {
         required: false;
     };
+    batchId: {
+        required: false;
+    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "submit"[], "submit", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     token: {
         required: false;
@@ -28,6 +31,9 @@ declare const _default: import("vue").DefineComponent<{
     OCR_AuthDomain: {
         required: false;
     };
+    batchId: {
+        required: false;
+    };
 }>> & {
     onSubmit?: ((...args: any[]) => any) | undefined;
 }, {

package/dist/types/components/PaymentMode/index.vue.d.ts

@@ -1,11 +1,14 @@
 import '@/utils/disableZoom';
 declare const _default: import("vue").DefineComponent<Readonly<{
     multiple?: any;
+    batchId?: any;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "uploadSuccess"[], "uploadSuccess", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Readonly<{
     multiple?: any;
+    batchId?: any;
 }>>> & {
     onUploadSuccess?: ((...args: any[]) => any) | undefined;
 }, {
     readonly multiple?: any;
+    readonly batchId?: any;
 }, {}>;
 export default _default;

package/package.json

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

package/src/components/InvoiceList/const.ts

@@ -1,5 +1,5 @@
 export const const_invoiceStatus: any = {
-  invalid: '无效发票',
+  invalid: '异常发票',
   unused: '未使用',
   using: '使用中',
   used: '已使用',
@@ -8,7 +8,7 @@ export const const_realStatus: any = {
   noNeed: '无需验真',
   notCheck: '未验真',
   checked: '已验真',
-  checkFail: '验真失败',
+  checkFail: '验真异常',
 }
 export const const_taskStatus: any = {
   init: '初始状态',

package/src/components/InvoiceList/index.vue

@@ -135,7 +135,7 @@
     <Loading class="loading" color="#0094ff">上传中...</Loading>
   </Overlay>
 </template>
-<!-- 无效发票, 已使用的, 使用中的, 识别失败 禁止提交 -->
+<!-- 异常发票, 已使用的, 使用中的, 识别失败 禁止提交 -->
 <script setup lang="ts">
 import 'vant/lib/index.css'
 import { ref, onMounted, computed } from 'vue'
@@ -280,7 +280,14 @@ const submitBtn = computed(() => {
         item.invoiceStatus === 'unused' &&
         (item.taskStatus === 'ocr_success' ||
           item.taskStatus === 'repeat' ||
-          item.taskStatus === 'finish')
+          item.taskStatus === 'finish' ||
+          item.invoiceStatus === 'invalid' ||
+          item.invoiceStatus === 'invalid' ||
+          item.invoiceStatus === 'used' ||
+          item.realStatus === 'noNeed' ||
+          item.realStatus === 'notCheck' ||
+          item.realStatus === 'checked' ||
+          item.realStatus === 'checkFail')
       )
     })
   return flag && list.value.filter((item) => item.selected).length > 0
@@ -292,7 +299,7 @@ const ok = () => {
     return
   }
   if (!submitBtn.value) {
-    showToast({ type: 'text', message: '存在无效发票，无法提交' })
+    showToast({ type: 'text', message: '存在异常发票，无法提交' })
     return
   }
   // showDeleteBtn.value = false

package/src/components/OCRInvoice/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="OCRInvoice">
     <PaymentMode
+    :batchId="batchId"
       :multiple="multiple"
       @uploadSuccess="uploadSuccess"
       v-if="activePage === 1"></PaymentMode>
@@ -34,7 +35,7 @@ const setLog = () => {
 }
 setLog()
 const emit = defineEmits(['submit'])
-const { token, multiple, Base_URL, OCR_AuthDomain } = defineProps({
+const { token, multiple, Base_URL, OCR_AuthDomain, batchId } = defineProps({
   token: {
     required: false,
     type: String,
@@ -49,6 +50,9 @@ const { token, multiple, Base_URL, OCR_AuthDomain } = defineProps({
   OCR_AuthDomain: {
     required: false,
   },
+  batchId: {
+    required: false,
+  },
 })
 const tempToken =
   'z7v5gIDRD-sMhb9lRaspBmrWU8y--e5YK2xqWxMCIMTqBReMcoHNTJQ3XyNBdHmLVHiwommCp-HtP4wWSiK9oZDwTWvCW9CZswjLNNL4nGM'

package/src/components/PaymentMode/index.vue

@@ -32,7 +32,7 @@ import '@/utils/disableZoom'
 import { selectPhoto, takePhoto } from '@/utils/upload'
 import { __uploadInvoice } from '@/api/invoice'
 import { showToast, Overlay, Loading, showFailToast } from 'vant'
-const { multiple } = defineProps(['multiple'])
+const props = defineProps(['multiple', 'batchId'])
 const emit = defineEmits(['uploadSuccess'])
 const payList: any = [
   {
@@ -60,8 +60,12 @@ const handleClickText = async (text: any) => {
     fd = await takePhoto()
   }
   if (text == '相册') {
-    fd = await selectPhoto(multiple)
+    fd = await selectPhoto(props.multiple)
   }
+  if (props.batchId) {
+    fd.append('batchId', props.batchId)
+  }
+  console.log(props.batchId,'props.batchIdprops.batchIdprops.batchId')
   showLoading.value = true
   try {
     const res: any = await __uploadInvoice(fd)