Merge branch 'blueBranch' into testToMerge

src/HDrpManagement/dispatch/modules/printMaterials.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-button :type="disabled?'':'primary'" size="mini" :disabled="disabled" @click="addBtn('质保书')">
-      {{$t(`质保书`)}}
-    </el-button>
     <el-button :type="disabled?'':'primary'" size="mini" :disabled="disabled" @click="addBtn('合格证')">
       {{$t(`合格证`)}}
     </el-button>
+    <el-button :type="disabled?'':'primary'" size="mini" :disabled="disabled" @click="addBtn('质保书')">
+      {{$t(`质保书`)}}
+    </el-button>
     <el-button :type="disabled?'':'primary'" size="mini" :disabled="disabled" @click="addBtn('检验报告')">
       {{$t(`检验报告`)}}
     </el-button>

src/HDrpManagement/serveWorkBill/components/edit.vue

@@ -26,6 +26,7 @@
                 <selectOrder ref="order" @selectRow="orderChange">
                   <el-input
                     readonly
+                    disabled
                     type="text"
                     slot="input"
                     size="mini"
@@ -42,6 +43,7 @@
                 <selectTemplate ref="template" @selectRow="templateChange">
                   <el-input
                     readonly
+                    disabled
                     type="text"
                     slot="input"
                     size="mini"

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -92,10 +92,10 @@ export default {
   },
   mounted () {
     setTimeout(() => {
-      if (!this.tabs) {this.activeName = 'file'} else {
+      if (this.tabs.length == 0) {this.activeName = 'file'} else {
         this.activeName = 'tab0'
       }
-    }, 1000);
+    }, 100);
     this.isSalesman()
   },
   watch: {