214bf8a1 by tianhaohao@pashanhoo.com

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

2 parents ff54b459 87f7f22f
...@@ -90,9 +90,13 @@ ...@@ -90,9 +90,13 @@
90 if (res.code == 200) { 90 if (res.code == 200) {
91 this.noData = true 91 this.noData = true
92 if (res.result && res.result.length > 0) { 92 if (res.result && res.result.length > 0) {
93 this.activeName = res.result[0].bsmBdcqz
94 this.bdcqz = res.result[0] 93 this.bdcqz = res.result[0]
95 this.headTabBdcqz = res.result 94 this.headTabBdcqz = res.result
95 if (this.formData.bsmBdcqz) {
96 this.activeName = this.formData.bsmBdcqz
97 } else {
98 this.activeName = res.result[0].bsmBdcqz
99 }
96 if (this.bdcqz.bdcqzlx == 1) { 100 if (this.bdcqz.bdcqzlx == 1) {
97 this.drawTextOnImage() 101 this.drawTextOnImage()
98 } else { 102 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-10 14:05:49 4 * @LastEditTime: 2023-08-31 09:24:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -108,7 +108,8 @@ ...@@ -108,7 +108,8 @@
108 bdcqzPreview(item).then(res => { 108 bdcqzPreview(item).then(res => {
109 this.$endLoading() 109 this.$endLoading()
110 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { 110 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
111 bsmSlsq: item.bsmSlsq 111 bsmSlsq: item.bsmSlsq,
112 bsmBdcqz: item.bsmBdcqz
112 }, '1210px', true) 113 }, '1210px', true)
113 }) 114 })
114 } 115 }
......