mg-ocr-invoice 0.3.4 → 0.3.6

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

@@ -1,4 +1,3 @@
-import 'vant/lib/index.css';
 import '@/utils/disableZoom';
 declare const _default: import("vue").DefineComponent<{
     listId: {
@@ -10,6 +9,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
     };
     catchList: {};
+    businessLicense: {
+        required: false;
+        type: StringConstructor;
+    };
+    taxCode: {
+        required: false;
+        type: StringConstructor;
+    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     ok: (...args: any[]) => void;
     edit: (...args: any[]) => void;
@@ -23,6 +30,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
     };
     catchList: {};
+    businessLicense: {
+        required: false;
+        type: StringConstructor;
+    };
+    taxCode: {
+        required: false;
+        type: StringConstructor;
+    };
 }>> & {
     onOk?: ((...args: any[]) => any) | undefined;
     onEdit?: ((...args: any[]) => any) | undefined;

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

@@ -16,6 +16,12 @@ declare const _default: import("vue").DefineComponent<{
     batchId: {
         required: false;
     };
+    businessLicense: {
+        required: false;
+    };
+    taxCode: {
+        required: false;
+    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     submit: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -36,6 +42,12 @@ declare const _default: import("vue").DefineComponent<{
     batchId: {
         required: false;
     };
+    businessLicense: {
+        required: false;
+    };
+    taxCode: {
+        required: false;
+    };
 }>> & {
     onSubmit?: ((...args: any[]) => any) | undefined;
 }, {

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

@@ -1,16 +1,22 @@
 import '@/utils/disableZoom';
 declare const _default: import("vue").DefineComponent<Readonly<{
     multiple?: any;
+    businessLicense?: any;
+    taxCode?: any;
     batchId?: any;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     uploadSuccess: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<Readonly<{
     multiple?: any;
+    businessLicense?: any;
+    taxCode?: any;
     batchId?: any;
 }>>> & {
     onUploadSuccess?: ((...args: any[]) => any) | undefined;
 }, {
     readonly multiple?: any;
+    readonly businessLicense?: any;
+    readonly taxCode?: any;
     readonly batchId?: any;
 }, {}>;
 export default _default;

package/dist/types/main.d.ts

@@ -1,2 +1,3 @@
 import './styles/mu-invoice.css';
 import 'element-plus/dist/index.css';
+import 'vant/lib/index.css';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mg-ocr-invoice",
   "private": false,
-  "version": "0.3.4",
+  "version": "0.3.6",
   "type": "module",
   "types": "dist/types/index.d.ts",
   "module": "dist/index.es.js",
@@ -23,7 +23,7 @@
     "element-plus": "^2.3.7",
     "js-cookie": "^3.0.5",
     "swiper": "^9.3.2",
-    "vant": "^4.4.1",
+    "vant": "^4.0.9",
     "vconsole": "^3.15.1",
     "vue": "^3.2.47"
   },

package/src/components/InvoiceList/index.vue

@@ -34,7 +34,10 @@
               </div>
               <div
                 class="title"
-                :class="{ person: item.invoiceCompanyType === '公司' }">
+                :class="{
+                  company: item.invoiceCompanyType === '公司',
+                  err: item.invoiceCompanyType === '异常抬头',
+                }">
                 {{ item.invoiceCompanyType }}
               </div>
               <div class="storeName">
@@ -152,7 +155,11 @@
       </div>
     </div>
   </div>
-  <Popup v-model:show="showPopup" position="bottom" closeable>
+  <Popup
+    v-model:show="showPopup"
+    teleport="#iDOCRInvoice"
+    position="bottom"
+    closeable>
     <div class="boxPopup">
       <div class="title">
         <span>添加发票</span>
@@ -169,7 +176,6 @@
 </template>
 <!-- 异常发票, 已使用的, 使用中的, 识别失败 禁止提交 -->
 <script setup lang="ts">
-import 'vant/lib/index.css'
 import { ref, onMounted, computed } from 'vue'
 import {
   Popup,
@@ -178,6 +184,7 @@ import {
   showToast,
   showConfirmDialog,
   Overlay,
+  showImagePreview
 } from 'vant'
 import '@/utils/disableZoom'
 import { selectPhoto, takePhoto } from '@/utils/upload'
@@ -189,14 +196,12 @@ import {
 import {
   const_invoiceStatus,
   const_realStatus,
-  const_taskStatus,
   const_invoiceExceptionInfo,
   setClass,
   VerificationOfTruth,
 } from './const'
-import { showImagePreview } from 'vant'
 const emit = defineEmits(['edit', 'ok'])
-const { listId, multiple, catchList } = defineProps({
+const $props = defineProps({
   listId: {
     required: false,
     type: String,
@@ -206,13 +211,21 @@ const { listId, multiple, catchList } = defineProps({
     type: Boolean,
   },
   catchList: {},
+  businessLicense: {
+    required: false,
+    type: String,
+  },
+  taxCode: {
+    required: false,
+    type: String,
+  },
 })
 const token: any = ref(sessionStorage.getItem('token'))
 const showLoading = ref(false)
 const showPopup = ref(false)
 const list: any = ref<Array<any>>([])
-if (catchList) {
-  list.value = catchList
+if ($props.catchList) {
+  list.value = $props.catchList
 }
 const batchId = ref('')
 const selectId = computed(() => {
@@ -224,7 +237,7 @@ const selectId = computed(() => {
 const getList = async () => {
   return new Promise(async (resolve, reject) => {
     const data: any = {}
-    data.batchId = listId
+    data.batchId = $props.listId
     if (!data.batchId) return
     try {
       const res: any = await __getUploadInvoiceList(data, token.value)
@@ -288,15 +301,6 @@ const selectStatus = (item: any) => {
   } else {
     return false
   }
-  // if (item.invoiceStatus==='unused') {
-  //   return true
-  // } else if (item.manualModify) {
-  //   return true
-  // } else if (!item.invoiceExceptionInfo) {
-  //   return true
-  // } else {
-  //   return false
-  // }
 }
 const selectedAll: any = ref(false)
 const changeSelectAll = (v: any) => {
@@ -319,12 +323,17 @@ const changeItemCheckbox = () => {
 }
 const deleteSelectItem = () => {
   if (selectId.value.length <= 0) {
-    showToast({ type: 'text', message: '请先选择发票' ,teleport: '#iDOCRInvoice',})
+    showToast({
+      type: 'text',
+      message: '请先选择发票',
+      teleport: '#iDOCRInvoice',
+    })
     return
   }
   showConfirmDialog({
     title: '提醒',
     message: '请确认是否需要移除选中项，移除后不可恢复!',
+    teleport: '#iDOCRInvoice',
   })
     .then(async () => {
       var urlencoded = new URLSearchParams()
@@ -333,7 +342,11 @@ const deleteSelectItem = () => {
       urlencoded.append('taskIds', idsStr)
       const res: any = await __deleteInvoice(urlencoded, token.value)
       if (res.code === 200) {
-        showToast({ type: 'success', message: '移除成功',teleport: '#iDOCRInvoice', })
+        showToast({
+          type: 'success',
+          message: '移除成功',
+          teleport: '#iDOCRInvoice',
+        })
         getList()
       }
     })
@@ -348,11 +361,13 @@ const add = () => {
 const selectImg = async (type: number) => {
   let fd: FormData
   if (type === 1) {
-    fd = await selectPhoto(multiple)
+    fd = await selectPhoto($props.multiple)
   } else {
     fd = await takePhoto()
   }
   fd.append('batchId', batchId.value)
+  fd.append('businessLicense', $props.businessLicense || '')
+  fd.append('taxCode', $props.taxCode || '')
   showLoading.value = true
   showPopup.value = false
   try {
@@ -391,7 +406,11 @@ const openErrImg = (url: any) => {
 }
 const ok = () => {
   if (selectId.value.length <= 0) {
-    showToast({ type: 'text', message: '请先选择发票',teleport: '#iDOCRInvoice', })
+    showToast({
+      type: 'text',
+      message: '请先选择发票',
+      teleport: '#iDOCRInvoice',
+    })
     return
   }
   if (!submitBtn.value) {
@@ -403,7 +422,7 @@ const ok = () => {
     return
   }
   // showDeleteBtn.value = false
-  const selectData = list.value
+  const selectData: Array<any> = list.value
     .filter((item: any) => item.selected)
     .map((item: any) => {
       VerificationOfTruth
@@ -411,6 +430,24 @@ const ok = () => {
       let obj: any = { ...item, ...data }
       return obj
     })
+  const filterTitleErr = selectData.some(
+    (item) => item.invoiceCompanyType === '异常抬头'
+  )
+  if (filterTitleErr) {
+    showConfirmDialog({
+      title: '提醒',
+      message: '存在异常抬头发票，请确认是否继续提交？',
+      teleport: '#iDOCRInvoice',
+      cancelButtonText: '返回修改',
+      confirmButtonText: '继续提交',
+    })
+      .then(() => {
+        emit('ok', selectData, batchId.value)
+      })
+      .catch(() => {})
+
+    return
+  }
   emit('ok', selectData, batchId.value)
 }
 const timeID: any = ref(null)
@@ -491,9 +528,12 @@ onMounted(() => {
             color: #333;
             border-radius: 2px;
           }
-          div.person {
+          div.company {
             background-color: #ff8b26;
           }
+          div.err {
+            background-color: #d5001c;
+          }
           .title {
             color: #fff;
             display: flex;

package/src/components/OCRInvoice/index.vue

@@ -2,14 +2,22 @@
   <div class="OCRInvoice" id="iDOCRInvoice">
     <div v-if="activePage === 1" class="box">
       <PaymentMode
-        :batchId="batchId"
-        :multiple="multiple"
+        :batchId="$props.batchId"
+        :businessLicense="
+          $props.businessLicense || computed_params.businessLicense
+        "
+        :taxCode="$props.taxCode || computed_params.taxCode"
+        :multiple="$props.multiple"
         @uploadSuccess="uploadSuccess"></PaymentMode>
     </div>
     <div v-if="activePage === 2" class="box">
       <InvoiceList
-        :multiple="multiple"
+        :multiple="$props.multiple"
         :listId="listId"
+        :businessLicense="
+          $props.businessLicense || computed_params.businessLicense
+        "
+        :taxCode="$props.taxCode || computed_params.taxCode"
         :catchList="catchList"
         @ok="submit"
         @edit="edit">
@@ -24,16 +32,11 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { PaymentMode, Invoice, InvoiceList } from '@/components/index'
 import { getUrlParams } from '@/utils/getUrlParams'
-import { showToast } from 'vant'
 import Cookies from 'js-cookie'
-// import eruda from 'eruda'
-// eruda.init()
 import VConsole from 'vconsole'
-// import { data as dataObj } from './const'
-
 const setLog = () => {
   if (getUrlParams(window.location.href).log == 1) {
     const vConsole = new VConsole()
@@ -41,7 +44,7 @@ const setLog = () => {
 }
 setLog()
 const emit = defineEmits(['submit'])
-const { token, multiple, Base_URL, OCR_AuthDomain, batchId } = defineProps({
+const $props = defineProps({
   token: {
     required: false,
     type: String,
@@ -58,23 +61,31 @@ const { token, multiple, Base_URL, OCR_AuthDomain, batchId } = defineProps({
   },
   batchId: {
     required: false,
-    
   },
+  businessLicense: {
+    required: false,
+  },
+  taxCode: {
+    required: false,
+  },
+})
+const computed_params = computed(() => {
+  return getUrlParams(window.location.href)
 })
-
 const initToken = () => {
   activePage.value = 1
   const params = getUrlParams(window.location.href)
   const linkToken = params.token
-  Cookies.set('token', linkToken || token)
+  console.log(linkToken, 'linkToken')
+  Cookies.set('token', linkToken || $props.token)
 }
 const init_Base_URL = () => {
   const params = getUrlParams(window.location.href)
   Cookies.set(
     'OCR_Base_URL',
-    params.Base_URL || Base_URL || 'https://invoice.imugua.team/'
+    params.Base_URL || $props.Base_URL || 'https://invoice.imugua.team/'
   )
-  Cookies.set('OCR_AuthDomain', params.OCR_AuthDomain || OCR_AuthDomain)
+  Cookies.set('OCR_AuthDomain', params.OCR_AuthDomain || $props.OCR_AuthDomain)
 }
 const activePage = ref(0)
 const listId: any = ref(null)

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 props = defineProps(['multiple', 'batchId'])
+const props = defineProps(['multiple', 'batchId', 'taxCode','businessLicense'])
 const emit = defineEmits(['uploadSuccess'])
 const payList: any = [
   {
@@ -65,6 +65,8 @@ const handleClickText = async (text: any) => {
   if (props.batchId) {
     fd.append('batchId', props.batchId)
   }
+  fd.append('businessLicense',props.businessLicense||'')
+  fd.append('taxCode',props.taxCode||'')
   showLoading.value = true
   try {
     const res: any = await __uploadInvoice(fd)

package/dist/types/components/Invoice copy/index.vue.d.ts

@@ -1,25 +0,0 @@
-import '@/utils/disableZoom';
-declare const _default: import("vue").DefineComponent<{
-    ids: {
-        type: ObjectConstructor;
-        required: true;
-    };
-    invoiceData: {
-        type: ObjectConstructor;
-        required: true;
-    };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    saveSuccess: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    ids: {
-        type: ObjectConstructor;
-        required: true;
-    };
-    invoiceData: {
-        type: ObjectConstructor;
-        required: true;
-    };
-}>> & {
-    onSaveSuccess?: ((...args: any[]) => any) | undefined;
-}, {}, {}>;
-export default _default;