mg-ocr-invoice 0.4.1 → 0.4.4

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

@@ -2,5 +2,4 @@ import Invoice from './Invoice/index.vue';
 import InvoiceList from './InvoiceList/index.vue';
 import PaymentMode from './PaymentMode/index.vue';
 import OCRInvoice from './OCRInvoice/index.vue';
-import 'vant/lib/index.css';
 export { Invoice, InvoiceList, PaymentMode, OCRInvoice };

package/dist/types/main.d.ts

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

package/dist/types/styles/vantimpCss.d.ts

@@ -0,0 +1,15 @@
+import 'vant/lib/overlay/index.css';
+import 'vant/lib/loading/index.css';
+import 'vant/lib/image-preview/index.css';
+import 'vant/lib/cell-group/index.css';
+import 'vant/lib/field/index.css';
+import 'vant/lib/form/style/index';
+import 'vant/lib/icon/index.css';
+import 'vant/lib/button/index.css';
+import 'vant/lib/action-sheet/index.css';
+import 'vant/lib/cell/index.css';
+import 'vant/lib/popup/index.css';
+import 'vant/lib/skeleton/index.css';
+import 'vant/lib/dialog/index.css';
+import 'vant/es/toast/index.css';
+import 'vant/lib/skeleton-paragraph/index.css';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mg-ocr-invoice",
   "private": false,
-  "version": "0.4.1",
+  "version": "0.4.4",
   "type": "module",
   "types": "dist/types/index.d.ts",
   "module": "dist/index.es.js",
@@ -36,7 +36,7 @@
     "sass": "^1.69.5",
     "typescript": "^5.0.2",
     "vite": "^4.3.9",
-    "vue-tsc": "^1.4.2"
+    "vue-tsc": "^2.0.24"
   },
   "peerDependencies": {
     "sass": "^1.63.2"

package/src/components/Invoice/index.vue

@@ -158,7 +158,7 @@
                         @click="openEditpopUp(item, index)">
                         <td>{{ item.itemExTaxAmount }}</td>
                         <td>{{ item.itemTaxRate }}</td>
-                        <td>{{item.itemTaxAmount}}</td>
+                        <td>{{ item.itemTaxAmount }}</td>
                       </tr>
                     </tbody>
                   </table>
@@ -221,7 +221,7 @@
       </Form>
     </div>
   </div>
-  <ActionSheet v-model:show="showEdit" :title="editTitle(titleIndex)">
+  <ActionSheet :z-index="9527" v-model:show="showEdit" :title="editTitle(titleIndex)">
     <div class="content">
       <Form ref="REF_editForm">
         <Field
@@ -244,6 +244,7 @@
     </div>
   </ActionSheet>
   <Overlay
+  :z-index="9527"
     style="
       display: flex;
       justify-content: center;
@@ -262,7 +263,6 @@ import {
   showToast,
   Overlay,
   Loading,
-  showFailToast,
   showImagePreview,
   CellGroup,
   Field,
@@ -291,7 +291,7 @@ const formData = ref({
       detailCode: '',
       itemExTaxAmount: 0,
       itemTaxRate: 0,
-      itemTaxAmount:0
+      itemTaxAmount: 0,
     },
   ],
   payerReq: {
@@ -326,7 +326,7 @@ const isEdit = computed(() => {
     props.invoiceData.realStatus === 'noNeed' ||
     props.invoiceData.invoiceExceptionInfo === 'abnormal' ||
     props.invoiceData.manualModify ||
-    props.invoiceData.realStatus === 'checkFail'||
+    props.invoiceData.realStatus === 'checkFail' ||
     props.invoiceData.realStatus === 'notCheck'
   )
 })
@@ -339,11 +339,17 @@ const submit = async () => {
         type: 'success',
         message: '保存成功',
         teleport: Cookies.get('teleport') || null,
+        zIndex: 9527,
       })
       emit('saveSuccess')
     }
   } catch (err: any) {
-    showFailToast(err.msg)
+    showToast({
+      type: 'fail',
+      message: err.msg,
+      teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
+    })
     emit('saveSuccess')
   }
   showLoading.value = false
@@ -373,7 +379,7 @@ const initData = () => {
       detailCode: item.code,
       itemExTaxAmount: item.itemExTaxAmount,
       itemTaxRate: item.itemTaxRate.replace(/%/g, ''),
-      itemTaxAmount:item.itemTaxAmount
+      itemTaxAmount: item.itemTaxAmount,
     }
   })
 }
@@ -396,7 +402,11 @@ const confirmEdit = () => {
     activeRow.value.itemExTaxAmount
   formData.value.itemAmountReqs[titleIndex.value].itemTaxRate =
     activeRow.value.itemTaxRate
-  formData.value.itemAmountReqs[titleIndex.value].itemTaxAmount = Number(new Decimal(filterNumber(activeRow.value.itemExTaxAmount)).times(new Decimal(filterNumber(activeRow.value.itemTaxRate / 100))).toFixed(2))
+  formData.value.itemAmountReqs[titleIndex.value].itemTaxAmount = Number(
+    new Decimal(filterNumber(activeRow.value.itemExTaxAmount))
+      .times(new Decimal(filterNumber(activeRow.value.itemTaxRate / 100)))
+      .toFixed(2)
+  )
   showEdit.value = false
 }
 const blurInput = (e: any, key: any) => {
@@ -414,7 +424,9 @@ const computed_amount = computed(() => {
     //   new Decimal(filterNumber(item.itemExTaxAmount)).plus(tax_amount)
     // )
     count = count.plus(
-      new Decimal(filterNumber(item.itemExTaxAmount)).plus(new Decimal(item.itemTaxAmount))
+      new Decimal(filterNumber(item.itemExTaxAmount)).plus(
+        new Decimal(item.itemTaxAmount)
+      )
     )
   })
   return count.toFixed(2)

package/src/components/InvoiceList/index.vue

@@ -12,14 +12,8 @@
           v-model="selectedAll"
           @click.stop
           class="checkbox" />
-        <!-- <Checkbox
-          @change.self="changeSelectAll"
-          v-model="selectedAll"
-          @click.stop
-          icon-size="22px"></Checkbox> -->
       </div>
     </div>
-
     <div class="card">
       <ul>
         <li v-for="(item, index) in list" :key="index" @click="clickItem(item)">
@@ -36,7 +30,9 @@
                 class="title"
                 :class="{
                   company: item.invoiceCompanyType === '公司',
-                  err: item.invoiceCompanyType === '异常抬头',
+                  err:
+                    item.invoiceCompanyType === '异常抬头' ||
+                    item.invoiceCompanyType === '异常税号',
                 }">
                 {{ item.invoiceCompanyType }}
               </div>
@@ -62,9 +58,6 @@
                   <span :class="setClass(item.invoiceStatus)">{{
                     const_invoiceStatus[item.invoiceStatus]
                   }}</span>
-                  <!-- <span class="error">识别失败</span>
-                  <span class="default">已使用</span>
-                  <span class="success">识别成功</span> -->
                 </div>
                 <div class="InvoiceInfo">
                   <div class="leftinfo">
@@ -156,6 +149,7 @@
     </div>
   </div>
   <Popup
+    :z-index="9527"
     v-model:show="showPopup"
     :teleport="Cookies.get('teleport') || null"
     position="bottom"
@@ -169,6 +163,7 @@
     </div>
   </Popup>
   <Overlay
+    :z-index="9527"
     style="display: flex; justify-content: center; align-items: center"
     :show="showLoading">
     <Loading class="loading" color="#0094ff">上传中...</Loading>
@@ -202,6 +197,7 @@ import {
 } from './const'
 import Cookies from 'js-cookie'
 import { onUnmounted } from 'vue'
+
 const emit = defineEmits(['edit', 'ok'])
 const $props = defineProps({
   listId: {
@@ -269,12 +265,21 @@ const getList = async () => {
   })
 }
 const clickItem = (row: any) => {
-  console.log(row.invoiceStatus)
+  console.log(row)
+  if (!row.invoiceStatus) {
+    return showToast({
+      type: 'text',
+      teleport: Cookies.get('teleport') || null,
+      message: '发票无效！',
+      zIndex: 9527,
+    })
+  }
   if (row.invoiceStatus !== 'unused') {
     return showToast({
       type: 'text',
       teleport: Cookies.get('teleport') || null,
       message: '发票已被使用！',
+      zIndex: 9527,
     })
   }
   row.selected = !row.selected
@@ -313,8 +318,9 @@ const changeSelectAll = (v: any) => {
   if (selectedAll.value) {
     showToast({
       type: 'text',
-      message: '存在已使用或异常发票, 已自动过滤',
+      message: '已选择全部可用发票',
       teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
     })
   }
   list.value.forEach((item: any) => {
@@ -333,6 +339,7 @@ const deleteSelectItem = () => {
       type: 'text',
       message: '请先选择发票',
       teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
     })
     return
   }
@@ -340,6 +347,8 @@ const deleteSelectItem = () => {
     title: '提醒',
     message: '请确认是否需要移除选中项，移除后不可恢复!',
     teleport: Cookies.get('teleport') || null,
+    className: 'OCR-Zindex-OCR',
+    overlayClass: 'OCR-Zindex-OCR',
   })
     .then(async () => {
       var urlencoded = new URLSearchParams()
@@ -352,6 +361,7 @@ const deleteSelectItem = () => {
           type: 'success',
           message: '移除成功',
           teleport: Cookies.get('teleport') || null,
+          zIndex: 9527,
         })
         getList()
       }
@@ -383,6 +393,7 @@ const selectImg = async (type: number) => {
         type: 'success',
         message: '上传成功',
         teleport: Cookies.get('teleport') || null,
+        zIndex: 9527,
       })
       setTimeGetList()
     }
@@ -416,6 +427,7 @@ const ok = () => {
       type: 'text',
       message: '请先选择发票',
       teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
     })
     return
   }
@@ -424,6 +436,7 @@ const ok = () => {
       type: 'text',
       message: '发票无效或已被使用，请进行确认',
       teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
     })
     return
   }
@@ -436,7 +449,9 @@ const ok = () => {
       return obj
     })
   const filterTitleErr = selectData.some(
-    (item) => item.invoiceCompanyType === '异常抬头'
+    (item) =>
+      item.invoiceCompanyType === '异常抬头' ||
+      item.invoiceCompanyType === '异常税号'
   )
   console.log(filterTitleErr, 'filterTitleErr')
   if (filterTitleErr) {
@@ -447,6 +462,8 @@ const ok = () => {
       teleport: Cookies.get('teleport') || null,
       cancelButtonText: '返回修改',
       confirmButtonText: '继续提交',
+      className: 'OCR-Zindex-OCR',
+      overlayClass: 'OCR-Zindex-OCR',
     })
       .then(() => {
         emit('ok', selectData, batchId.value)

package/src/components/PaymentMode/index.vue

@@ -20,6 +20,7 @@
     </div>
   </div>
   <Overlay
+    :z-index="9527"
     style="display: flex; justify-content: center; align-items: center"
     :show="showLoading">
     <Loading class="loading" color="#0094ff">上传中...</Loading>
@@ -31,9 +32,9 @@ import { ref } from 'vue'
 import '@/utils/disableZoom'
 import { selectPhoto, takePhoto } from '@/utils/upload'
 import { __uploadInvoice } from '@/api/invoice'
-import { showToast, Overlay, Loading, showFailToast } from 'vant'
+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'])
 const emit = defineEmits(['uploadSuccess'])
 const payList: any = [
   {
@@ -66,8 +67,8 @@ const handleClickText = async (text: any) => {
   if (props.batchId) {
     fd.append('batchId', props.batchId)
   }
-  fd.append('businessLicense',props.businessLicense||'')
-  fd.append('taxCode',props.taxCode||'')
+  fd.append('businessLicense', props.businessLicense || '')
+  fd.append('taxCode', props.taxCode || '')
   showLoading.value = true
   try {
     const res: any = await __uploadInvoice(fd)
@@ -76,12 +77,18 @@ const handleClickText = async (text: any) => {
         type: 'success',
         message: '上传成功',
         teleport: Cookies.get('teleport') || null,
+        zIndex: 9527,
       })
       emit('uploadSuccess', res.data)
     }
   } catch (err: any) {
     console.log(err)
-    showFailToast(err.msg)
+    showToast({
+      type: 'fail',
+      message: err.msg,
+      teleport: Cookies.get('teleport') || null,
+      zIndex: 9527,
+    })
   }
   showLoading.value = false
 }

package/src/components/index.ts

@@ -2,6 +2,5 @@ import Invoice from './Invoice/index.vue'
 import InvoiceList from './InvoiceList/index.vue'
 import PaymentMode from './PaymentMode/index.vue'
 import OCRInvoice from './OCRInvoice/index.vue'
-import 'vant/lib/index.css';
 
 export { Invoice, InvoiceList, PaymentMode, OCRInvoice }