Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCreateOrder.vue

@@ -385,6 +385,7 @@ export default {
       let query = {
         code: this.orderFormData.invCode,
         spUse: 2,
+        enable: true
       };
       getLocalJoinByUser(query)
         .then((response) => {

src/views/inout/InvoiceRegistration.vue

@@ -185,7 +185,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
-        <el-table :data="codeDetailList" style="width: 100%" border
+        <el-table v-loading="bizDetailLoading"  :data="codeDetailList" style="width: 100%" border
                   @current-change="BizDetail"
                   row-key="id" highlight-current-row
         >
@@ -277,7 +277,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
-        <el-table :data="bizDetailList" style="width: 100%" border
+        <el-table  v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
@@ -613,13 +613,12 @@ export default {
       this.getList();
     },
     InvoiceRegister(row) {
-
       this.$confirm('是否登记新的发票？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.insertInvoice(row)
+        insertInvoice(row)
           .then(response => {
             if (response.code === 20000) {
               this.closeInvoice(row);
@@ -939,6 +938,8 @@ export default {
         this.bizTotal = 0;
       })
     },
+
+
     BizDetail(row) {
       this.bizQuery.page = 1;
       this.subRow = row;

src/views/inout/IoCheckErrorOrder.vue

@@ -340,7 +340,7 @@
           <el-form-item class="query-form-item" label="物资名称:">
             <el-input
               v-model="resultQuery.code"
-              placeholder="请输入UDI码"
+              placeholder="请输入物资名称"
               clearable
             >
             </el-input>

src/views/inout/IoSupSearchOrder.vue

@@ -300,7 +300,7 @@
           <el-form-item class="query-form-item" label="物资名称:">
             <el-input
               v-model="resultQuery.code"
-              placeholder="请输入UDI码"
+              placeholder="请输入物资名称"
               clearable
             >
             </el-input>