Merge branch 'mergeBranch' into allTestUrgent

src/HDrpManagement/dispatch/modules/printMaterials.vue

@@ -1,15 +1,14 @@
 <template>
   <div>
-    <el-dropdown @command="addBtn" :disabled="disabled">
-      <el-button :type="disabled?'':'primary'" size="mini" :disabled="disabled">
-        {{$t(`打印资料`)}}<i class="el-icon-arrow-down el-icon--right"></i>
-      </el-button>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="质保书">{{$t(`质保书`)}}</el-dropdown-item>
-        <el-dropdown-item command="合格证">{{$t(`合格证`)}}</el-dropdown-item>
-        <el-dropdown-item command="检验报告">{{$t(`检验报告`)}}</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
+    <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-drawer
         :visible.sync="drawer"
         :with-header="false"
@@ -184,10 +183,14 @@ export default {
           dataid:this.dataid
         }
       })
-      this.tool.showMessage(res,() => {
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{
+
+        })
+      }else {
         window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`)
         // window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`)
-      })
+      }
     },
   }
 }