Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/InvoiceRegCkeck.vue

@@ -314,7 +314,6 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode
       },
 
       corpLoading: false,
@@ -601,6 +600,7 @@ export default {
     },
 
     getCodeDetailLists() {
+      debugger
       this.filterQuery.invoiceEncode = this.inputQuery.invoiceEncode
       this.filterQuery.vueType = 'supInvoice'
       this.codeDetailLoading = true
@@ -713,22 +713,26 @@ export default {
         this.$message.error('发票编码不能为空！')
         return
       }
-      //查询发票编码有没有重复
+      if(this.list.length==0){
-      checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
+        //查询发票编码有没有重复
-        .then((response) => {
+        checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
-          if (response.code === 20000) {
+          .then((response) => {
-            this.invoiceSelectRegByOrderVisible = true
+            if (response.code === 20000) {
-          } else {
+              this.invoiceSelectRegByOrderVisible = true
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch((response) => {
             this.$message.error(response.message)
-          }
+          })
-        })
+      }else{
-        .catch((response) => {
+        this.invoiceSelectRegByOrderVisible = true
-          this.$message.error(response.message)
+      }
-        })
     },
     closeAcceptDialog(){
       this.invoiceSelectRegByOrderVisible = false
-       this.getCodeDetailLists()
+      this.getCodeDetailLists()
     },
     delectSub(row){
       deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode})
@@ -787,7 +791,7 @@ export default {
     }
     if(this.curInvoice.id!=null){
       this.inputQuery=this.curInvoice
-       this.getOrderDetail();
+      this.getOrderDetail();
     }
   }
 }