mg-ocr-invoice 0.4.6 → 0.4.8

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

@@ -3,6 +3,8 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     multiple?: any;
     businessLicense?: any;
     taxCode?: any;
+    allUrlParams?: any;
+    allParams?: any;
     batchId?: any;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     uploadSuccess: (...args: any[]) => void;
@@ -10,6 +12,8 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     multiple?: any;
     businessLicense?: any;
     taxCode?: any;
+    allUrlParams?: any;
+    allParams?: any;
     batchId?: any;
 }>>> & {
     onUploadSuccess?: ((...args: any[]) => any) | undefined;
@@ -17,6 +21,8 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     readonly multiple?: any;
     readonly businessLicense?: any;
     readonly taxCode?: any;
+    readonly allUrlParams?: any;
+    readonly allParams?: any;
     readonly batchId?: any;
 }, {}>;
 export default _default;

package/package.json

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

package/src/components/InvoiceList/index.vue

@@ -141,7 +141,7 @@
         </div>
         <div class="right-btn">
           <span class="add" @click="add">继续添加发票</span>
-          <span class="ok" :class="{ disabledColor: !submitBtn }" @click="ok"
+          <span class="ok" :class="{ disabledColor: !submitBtn }" @click="submitData"
             >确定选择</span
           >
         </div>
@@ -217,6 +217,20 @@ const $props = defineProps({
     required: false,
     type: String,
   },
+  allUrlParams: {
+    required: false,
+    type: Object,
+    default: () => {
+      return {}
+    },
+  },
+  allParams: {
+    required: false,
+    type: Object,
+    default: () => {
+      return {}
+    },
+  },
 })
 const token: any = ref(sessionStorage.getItem('token'))
 const showLoading = ref(false)
@@ -231,11 +245,14 @@ const selectId = computed(() => {
     .filter((item: any) => item.selected)
     .map((item: any) => item.taskId)
 })
-
+const paramsObj = computed(() => {
+  return Object.assign({}, $props.allParams, $props.allUrlParams)
+})
 const getList = async () => {
   return new Promise(async (resolve, reject) => {
-    const data: any = {}
+    let data: any = {}
     data.batchId = $props.listId
+    data = Object.assign(data, paramsObj.value)
     if (!data.batchId) return
     try {
       const res: any = await __getUploadInvoiceList(data, token.value)
@@ -351,10 +368,16 @@ const deleteSelectItem = () => {
     overlayClass: 'OCR-Zindex-OCR',
   })
     .then(async () => {
-      var urlencoded = new URLSearchParams()
-      urlencoded.append('batchId', batchId.value)
       const idsStr = selectId.value.join(',')
-      urlencoded.append('taskIds', idsStr)
+      let newData: any = {
+        batchId: batchId.value,
+        taskIds: idsStr,
+      }
+      newData = Object.assign(newData, paramsObj.value)
+      var urlencoded = new URLSearchParams()
+      for (const key in newData) {
+        urlencoded.append(key, newData[key])
+      }
       const res: any = await __deleteInvoice(urlencoded, token.value)
       if (res.code === 200) {
         showToast({
@@ -381,9 +404,16 @@ const selectImg = async (type: number) => {
   } else {
     fd = await takePhoto()
   }
-  fd.append('batchId', batchId.value)
-  fd.append('businessLicense', $props.businessLicense || '')
-  fd.append('taxCode', $props.taxCode || '')
+
+  let newData: any = {
+    businessLicense: $props.businessLicense || '',
+    taxCode: $props.taxCode || '',
+    batchId: batchId.value,
+  }
+  newData = Object.assign(newData, paramsObj.value)
+  for (const key in newData) {
+    fd.append(key, newData[key])
+  }
   showLoading.value = true
   showPopup.value = false
   try {
@@ -421,7 +451,7 @@ const selectedLengthCount = computed(() => {
 const openErrImg = (url: any) => {
   showImagePreview([url])
 }
-const ok = () => {
+const submitData = () => {
   if (selectId.value.length <= 0) {
     showToast({
       type: 'text',
@@ -454,15 +484,16 @@ const ok = () => {
       item.invoiceCompanyType === '异常税号'
   )
   const ProhibitSubmissionFlag = filterTitleErr.some(
-    (item) => item.invoiceRootType === '专票'
+    (item) => item.invoiceRootType === '专票' || item.invoiceRootType === '普票'
   )
   if (ProhibitSubmissionFlag) {
-    console.log('专票不允许出现异常抬头或异常税号，请取消勾选后继续提交')
+    console.log('专票和普票不允许出现异常抬头或异常税号，请取消勾选后继续提交')
     showConfirmDialog({
       message: () => {
         return h('div', {
           style: 'color:#EF1725;',
-          innerHTML: '专票不允许出现异常抬头或异常税号，请取消勾选后继续提交',
+          innerHTML:
+            '专票和普票不允许出现异常抬头或异常税号，请取消勾选后继续提交',
         })
       },
       teleport: Cookies.get('teleport') || null,

package/src/components/OCRInvoice/index.vue

@@ -3,6 +3,8 @@
     <div v-if="activePage === 1" class="box">
       <PaymentMode
         :batchId="$props.batchId"
+        :allParams="$props.allParams"
+        :allUrlParams="computed_params"
         :businessLicense="
           $props.businessLicense || computed_params.businessLicense
         "
@@ -12,8 +14,10 @@
     </div>
     <div v-if="activePage === 2" class="box">
       <InvoiceList
+        :allParams="$props.allParams"
         :multiple="$props.multiple"
         :listId="listId"
+        :allUrlParams="computed_params"
         :businessLicense="
           $props.businessLicense || computed_params.businessLicense
         "
@@ -72,6 +76,10 @@ const $props = defineProps({
     required: false,
     type: String,
   },
+  allParams: {
+    required: false,
+    type: Object,
+  },
 })
 const computed_params = computed(() => {
   return getUrlParams(window.location.href)

package/src/components/PaymentMode/index.vue

@@ -28,13 +28,20 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import '@/utils/disableZoom'
 import { selectPhoto, takePhoto } from '@/utils/upload'
 import { __uploadInvoice } from '@/api/invoice'
 import { showToast, Overlay, Loading } from 'vant'
 import Cookies from 'js-cookie'
-const props = defineProps(['multiple', 'batchId', 'taxCode', 'businessLicense'])
+const props = defineProps([
+  'multiple',
+  'batchId',
+  'taxCode',
+  'businessLicense',
+  'allUrlParams',
+  'allParams',
+])
 const emit = defineEmits(['uploadSuccess'])
 const payList: any = [
   {
@@ -55,6 +62,9 @@ const payList: any = [
   // },
 ]
 document.title = '请选择添加费用方式'
+const paramsObj = computed(() => {
+  return Object.assign({}, props.allParams, props.allUrlParams)
+})
 const showLoading = ref(false)
 const handleClickText = async (text: any) => {
   let fd: any
@@ -64,11 +74,18 @@ const handleClickText = async (text: any) => {
   if (text == '相册') {
     fd = await selectPhoto(props.multiple)
   }
+  let newData: any = {
+    businessLicense: props.businessLicense || '',
+    taxCode: props.taxCode || '',
+  }
   if (props.batchId) {
-    fd.append('batchId', props.batchId)
+    newData.batchId = props.batchId
+  }
+  newData = Object.assign(newData, paramsObj.value)
+  for (const key in newData) {
+    fd.append(key, newData[key])
   }
-  fd.append('businessLicense', props.businessLicense || '')
-  fd.append('taxCode', props.taxCode || '')
+  console.log(newData,'newData')
   showLoading.value = true
   try {
     const res: any = await __uploadInvoice(fd)