mg-ocr-invoice 0.3.9 → 0.4.1

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

@@ -22,6 +22,10 @@ declare const _default: import("vue").DefineComponent<{
     taxCode: {
         required: false;
     };
+    teleport: {
+        required: false;
+        type: StringConstructor;
+    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     submit: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -48,6 +52,10 @@ declare const _default: import("vue").DefineComponent<{
     taxCode: {
         required: false;
     };
+    teleport: {
+        required: false;
+        type: StringConstructor;
+    };
 }>> & {
     onSubmit?: ((...args: any[]) => any) | undefined;
 }, {

package/package.json

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

package/src/components/Invoice/index.vue

@@ -278,6 +278,7 @@ import { RowAttribute } from './const'
 import { filterNumber } from '@/utils/number'
 import { computed } from 'vue'
 import Decimal from 'decimal.js'
+import Cookies from 'js-cookie'
 const props = defineProps(['ids', 'invoiceData'])
 const formData = ref({
   codeReq: {
@@ -337,7 +338,7 @@ const submit = async () => {
       showToast({
         type: 'success',
         message: '保存成功',
-        teleport:'#iDOCRInvoice'
+        teleport: Cookies.get('teleport') || null,
       })
       emit('saveSuccess')
     }

package/src/components/InvoiceList/index.vue

@@ -157,7 +157,7 @@
   </div>
   <Popup
     v-model:show="showPopup"
-    teleport="#iDOCRInvoice"
+    :teleport="Cookies.get('teleport') || null"
     position="bottom"
     closeable>
     <div class="boxPopup">
@@ -200,6 +200,8 @@ import {
   setClass,
   VerificationOfTruth,
 } from './const'
+import Cookies from 'js-cookie'
+import { onUnmounted } from 'vue'
 const emit = defineEmits(['edit', 'ok'])
 const $props = defineProps({
   listId: {
@@ -247,7 +249,7 @@ const getList = async () => {
           // 保持选择状态
           return {
             ...item,
-            selected: data.selected
+            selected: data.selected,
             // ...Object.assign(data, item),
           }
         })
@@ -271,7 +273,7 @@ const clickItem = (row: any) => {
   if (row.invoiceStatus !== 'unused') {
     return showToast({
       type: 'text',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
       message: '发票已被使用！',
     })
   }
@@ -312,7 +314,7 @@ const changeSelectAll = (v: any) => {
     showToast({
       type: 'text',
       message: '存在已使用或异常发票, 已自动过滤',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
     })
   }
   list.value.forEach((item: any) => {
@@ -330,14 +332,14 @@ const deleteSelectItem = () => {
     showToast({
       type: 'text',
       message: '请先选择发票',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
     })
     return
   }
   showConfirmDialog({
     title: '提醒',
     message: '请确认是否需要移除选中项，移除后不可恢复!',
-    teleport: '#iDOCRInvoice',
+    teleport: Cookies.get('teleport') || null,
   })
     .then(async () => {
       var urlencoded = new URLSearchParams()
@@ -349,7 +351,7 @@ const deleteSelectItem = () => {
         showToast({
           type: 'success',
           message: '移除成功',
-          teleport: '#iDOCRInvoice',
+          teleport: Cookies.get('teleport') || null,
         })
         getList()
       }
@@ -380,7 +382,7 @@ const selectImg = async (type: number) => {
       showToast({
         type: 'success',
         message: '上传成功',
-        teleport: '#iDOCRInvoice',
+        teleport: Cookies.get('teleport') || null,
       })
       setTimeGetList()
     }
@@ -413,7 +415,7 @@ const ok = () => {
     showToast({
       type: 'text',
       message: '请先选择发票',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
     })
     return
   }
@@ -421,7 +423,7 @@ const ok = () => {
     showToast({
       type: 'text',
       message: '发票无效或已被使用，请进行确认',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
     })
     return
   }
@@ -436,12 +438,13 @@ const ok = () => {
   const filterTitleErr = selectData.some(
     (item) => item.invoiceCompanyType === '异常抬头'
   )
-  console.log(filterTitleErr,'filterTitleErr')
+  console.log(filterTitleErr, 'filterTitleErr')
   if (filterTitleErr) {
+    console.log(Cookies.get('teleport'), 'teleport')
     showConfirmDialog({
       title: '提醒',
       message: '存在异常抬头发票，请确认是否继续提交？',
-      teleport: '#iDOCRInvoice',
+      teleport: Cookies.get('teleport') || null,
       cancelButtonText: '返回修改',
       confirmButtonText: '继续提交',
     })
@@ -451,10 +454,12 @@ const ok = () => {
       .catch((error) => {
         console.log(error)
       })
+    return
   }
   emit('ok', selectData, batchId.value)
 }
 const timeID: any = ref(null)
+const timeID2: any = ref(null)
 const setTimeGetList = () => {
   getList()
     .then((res: any) => {
@@ -463,17 +468,23 @@ const setTimeGetList = () => {
           item.taskStatus === 'ocr_doing' || item.taskStatus === 'ocr_success'
       )
       if (!flag) {
+        clearTimeout(timeID.value)
+        clearTimeout(timeID2.value)
         return
       }
-      setTimeout(setTimeGetList, 2000)
+      timeID.value = setTimeout(setTimeGetList, 2000)
     })
     .catch((err) => {
-      setTimeout(setTimeGetList, 2000)
+      timeID2.value = setTimeout(setTimeGetList, 2000)
     })
 }
 onMounted(() => {
   setTimeGetList()
 })
+onUnmounted(() => {
+  clearTimeout(timeID.value)
+  clearTimeout(timeID2.value)
+})
 </script>
 <style lang="scss" scoped>
 .disabledColor {

package/src/components/OCRInvoice/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="OCRInvoice" id="iDOCRInvoice">
+  <div class="OCRInvoice">
     <div v-if="activePage === 1" class="box">
       <PaymentMode
         :batchId="$props.batchId"
@@ -32,7 +32,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { PaymentMode, Invoice, InvoiceList } from '@/components/index'
 import { getUrlParams } from '@/utils/getUrlParams'
 import Cookies from 'js-cookie'
@@ -68,6 +68,10 @@ const $props = defineProps({
   taxCode: {
     required: false,
   },
+  teleport: {
+    required: false,
+    type: String,
+  },
 })
 const computed_params = computed(() => {
   return getUrlParams(window.location.href)
@@ -110,6 +114,8 @@ const submit = (data: any, id: string) => {
   emit('submit', data, id)
 }
 onMounted(() => {
+  console.log($props.teleport, 'teleport')
+  Cookies.set('teleport', $props.teleport || '')
   initToken()
   init_Base_URL()
 })

package/src/components/PaymentMode/index.vue

@@ -32,6 +32,7 @@ import '@/utils/disableZoom'
 import { selectPhoto, takePhoto } from '@/utils/upload'
 import { __uploadInvoice } from '@/api/invoice'
 import { showToast, Overlay, Loading, showFailToast } from 'vant'
+import Cookies from 'js-cookie'
 const props = defineProps(['multiple', 'batchId', 'taxCode','businessLicense'])
 const emit = defineEmits(['uploadSuccess'])
 const payList: any = [
@@ -74,7 +75,7 @@ const handleClickText = async (text: any) => {
       showToast({
         type: 'success',
         message: '上传成功',
-        teleport: '#iDOCRInvoice',
+        teleport: Cookies.get('teleport') || null,
       })
       emit('uploadSuccess', res.data)
     }