story#7062,供应商培训和财务发票上传挂钩--曹智龙,弹框位置

src/views/index/invoicingNotify.vue

@@ -88,7 +88,8 @@
 <script>
 import { Decimal } from 'decimal.js';
 import {myMixins} from "@/utils/myMixins"
-import {notifyInvoiceList} from  "@/api/mine"
+import {notifyInvoiceList, jumpPage} from  "@/api/mine"
+import {Dialog} from "vant";
 export default {
   name: "invoicingNotify",
   mixins:[myMixins],
@@ -154,7 +155,7 @@ export default {
         }
       }
     },
-    changeTabHandler() {
+    async changeTabHandler() {
       this.pageNum = 1;
       this.notifyList = [];
       this.checkList = [];
@@ -166,6 +167,19 @@ export default {
         this.status = 2;
         this.dispatchAppSearchInvoiced = '';
         this.pageSize = 10000
+        let res = await this.getJumpHandler();
+        if(res?.data?.jump) {
+          Dialog.alert({
+            message: '您有没有完成的培训，请在中道调度APP上完成培训，再进行发票上传',
+            confirmButtonText: '去培训',
+            showCancelButton: false,
+          }).then(async() => {
+            this.goPage('trainDocment', { supplierId : this.supplierId })
+          }).catch(() => {
+            // on cancel
+          });
+          return false
+        }
       } else if(this.active == 3) {   // 已开票，需要分页
         this.status = '';
         this.dispatchAppSearchInvoiced = 1;
@@ -173,6 +187,10 @@ export default {
       }
       this.getNotifyList()
     },
+    async getJumpHandler() {
+      let res = await jumpPage();
+      return res
+    },
     getMonth(item) {
       let str = '';
       let startTime = new Date(item.createTime);

src/views/index/uploadInvoice.vue

@@ -76,7 +76,7 @@
   import { Decimal } from 'decimal.js';
   import { Dialog } from "vant";
   import { myMixins } from "@/utils/myMixins"
-  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch, jumpPage} from "@/api/mine"
+  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch} from "@/api/mine"
   export default {
     name: "uploadInvoice",
     mixins:[ myMixins ],
@@ -132,10 +132,10 @@
       }
     },
     methods: {
-      async getJumpHandler() {
+   /*   async getJumpHandler() {
         let res = await jumpPage();
         return res
-      },
+      },*/
       async initData() {
         this.list = JSON.parse(localStorage.getItem('list'));
         this.batchIds = [];
@@ -235,11 +235,11 @@
         });
       },
       async beforeRead (file) {
-        let res = await this.getJumpHandler();
+        /*let res = await this.getJumpHandler();
         if(res?.data?.jump) {
           this.$message.warning("您有没有完成的培训，请在中道调度APP上完成培训，再进行发票上传")
           return false
-        }
+        }*/
         const FileExt = file.name.replace(/.+\./, "");
         if (['jpg', 'png', 'jpeg', 'pdf', 'ofd'].indexOf(FileExt.toLowerCase()) === -1) {
           this.$toast('请上传后缀名为jpg、jpeg、png、pdf、ofd的文件！')