Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/inout/InvoiceCkeck.vue

src/views/inout/InvoiceCkeck.vue

@@ -525,7 +525,6 @@ export default {
     postInvoice() {
       insertInvoice(this.inputQuery)
         .then((response) => {
-          this.closeDialog();
           if (response.code === 20000) {
             this.statusCode = response.code;
             this.getOrderDetails();
@@ -537,10 +536,10 @@ export default {
           this.$message.error(response.message);
         });
 
-      // // 加状态
-      // updateorderBiz(this.inputQuery.list).then((res) => {
-      //   this.closeDialog();
-      // });
+      // 加状态
+      updateorderBiz(this.inputQuery.list).then((res) => {
+        this.closeDialog();
+      });
     },
 
     getInputFocus(event) {

src/views/inout/InvoiceRegistration.vue

@@ -839,13 +839,14 @@ export default {
               if (response.code == 20000) {
                 if (response.data.length == 0) {
                   this.getList();
+                }else{
+                  this.getCodeDetailList();
                 }
                 this.getBizDetailListInv(this.subRow);
                 this.$message({
                   type: "success",
                   message: "删除成功！",
                 });
-                this.getCodeDetailList();
               }
             })
             .catch(() => {