Merge branch 'web-v2' into web-v2-pro

src/components/qrCodeDialog/index.vue

@@ -76,7 +76,7 @@
     methods:{
       //初始化
       initialize(){
-        this.$set(this,'vueQrCodeData', this.identification+'?code='+this.qrCodeDialogData.parameter+'&type='+this.qrCodeDialogData.type);
+        this.$set(this,'vueQrCodeData', this.identification+'?code='+this.qrCodeDialogData.parameter+'&type='+this.qrCodeDialogData.type+'&subId='+this.qrCodeDialogData.subId);
         this.$set(this,'vueQrImgType',true);
       },
       buttonClick(type){

src/views/comprehensive/laboratoryManagement/subject/associationConfiguration.vue

@@ -142,7 +142,7 @@
           <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
         </el-form-item>
         <el-form-item label="" class="form-item" v-if="item.xyId">
-          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
+          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode,item.subId)">查看二维码</p>
         </el-form-item>
       </div>
       <div class="bottom-button-box">
@@ -199,7 +199,7 @@
           <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
         </el-form-item>
         <el-form-item label="" class="form-item" v-if="item.xyId">
-          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
+          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode,item.subId)">查看二维码</p>
         </el-form-item>
       </div>
       <div class="bottom-button-box">
@@ -315,6 +315,7 @@
         let list = [];
         for(let i=0;i<self.subjectData.labHazardList.length;i++){
           list.push({
+            subId:this.subjectData.id,
             hazardId:self.subjectData.labHazardList[i].id,
             xyId:self.subjectData.labHazardList[i].xyId,
             anotherName:self.subjectData.labHazardList[i].anotherName,
@@ -322,16 +323,18 @@
           })
         }
         this.$set(this.form,'hazardRelations',list)
+        console.log(this.form.hazardRelations)
       }
       this.radioChange();
     },
     methods:{
       //二维码组件开关
-      qrCodeDialogButton(type,id,name){
+      qrCodeDialogButton(type,id,name,subId){
         if(type == 1){
           this.$set(this,'qrCodeDialogData',{
             type:'10',          //二维码类型 用于区分二维码功能类型
             parameter:id,                     //二维码参数
+            subId:subId,                     //实验室id
             name:name,                        //二维码名称用于下载时命名
           });
           this.$set(this,'qrCodeDialogType',true);