Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -90,9 +90,13 @@
           if (res.code == 200) {
             this.noData = true
             if (res.result && res.result.length > 0) {
-              this.activeName = res.result[0].bsmBdcqz
               this.bdcqz = res.result[0]
               this.headTabBdcqz = res.result
+              if (this.formData.bsmBdcqz) {
+                this.activeName = this.formData.bsmBdcqz
+              } else {
+                this.activeName = res.result[0].bsmBdcqz
+              }
               if (this.bdcqz.bdcqzlx == 1) {
                 this.drawTextOnImage()
               } else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-10 14:05:49
+ * @LastEditTime: 2023-08-31 09:24:28
 -->
 <template>
   <div class="from-clues">
@@ -108,7 +108,8 @@
         bdcqzPreview(item).then(res => {
           this.$endLoading()
           this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
-            bsmSlsq: item.bsmSlsq
+            bsmSlsq: item.bsmSlsq,
+            bsmBdcqz: item.bsmBdcqz
           }, '1210px', true)
         })
       }