Merge branch 'dev'
Showing
8 changed files
with
42 additions
and
72 deletions
1 | .tableDivCss { | 1 | .tableDivCss { |
2 | width: 100%; | 2 | width: 100%; |
3 | height: 100%; | 3 | height: 95%; |
4 | background-color: #f5f5f5; | 4 | background-color: #f5f5f5; |
5 | padding: 5px; | 5 | padding: 5px; |
6 | overflow-y: scroll; | 6 | overflow-y: scroll; |
7 | box-sizing: border-box; | ||
7 | } | 8 | } |
8 | 9 | ||
9 | .tableCss { | 10 | .tableCss { | ... | ... |
1 | /* | 1 | /* |
2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 | 2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 |
3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
4 | * @LastEditTime: 2023-09-26 14:25:23 | 4 | * @LastEditTime: 2023-12-19 10:02:20 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; | 7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; |
... | @@ -142,27 +142,9 @@ export default { | ... | @@ -142,27 +142,9 @@ export default { |
142 | } | 142 | } |
143 | break; | 143 | break; |
144 | case "B6": | 144 | case "B6": |
145 | //根据编号获取对应信息 | 145 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", |
146 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { | 146 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true |
147 | if (res.code == 200) { | 147 | ) |
148 | getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { | ||
149 | if (infoRes.code == 200) { | ||
150 | //打开模板设计 | ||
151 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ||
152 | LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); //装载模板 | ||
153 | //todo 调取后端接口获取数据 循环set | ||
154 | for (let key in infoRes.result) { | ||
155 | LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]); | ||
156 | } | ||
157 | LODOP.PREVIEW(); | ||
158 | } else { | ||
159 | this.$message.error(infoRes.message) | ||
160 | } | ||
161 | }) | ||
162 | } else { | ||
163 | this.$message.error(res.message) | ||
164 | } | ||
165 | }) | ||
166 | break; | 148 | break; |
167 | case "B7": | 149 | case "B7": |
168 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | 150 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | ... | ... |
... | @@ -219,10 +219,9 @@ | ... | @@ -219,10 +219,9 @@ |
219 | </script> | 219 | </script> |
220 | <style lang="scss" scoped> | 220 | <style lang="scss" scoped> |
221 | @import "~@/styles/tablecss.scss"; | 221 | @import "~@/styles/tablecss.scss"; |
222 | .tableDivCss{ | 222 | .tableDivCss { |
223 | width: 100%; | 223 | width: 100%; |
224 | height: 100%; | 224 | height: 100%; |
225 | background-color: rgb(255, 255, 255); | 225 | background-color: rgb(255, 255, 255); |
226 | |||
227 | } | 226 | } |
228 | </style> | 227 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description :宗地基本信息 | 2 | * @Description :宗地基本信息 |
3 | * @Autor : miaofang | 3 | * @Autor : miaofang |
4 | * @LastEditTime: 2023-08-04 10:06:45 | 4 | * @LastEditTime: 2023-12-19 14:48:11 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="tableDivCss"> | 7 | <div class="tableDivCss"> |
... | @@ -29,7 +29,7 @@ | ... | @@ -29,7 +29,7 @@ |
29 | <td style="width: 15%">宗地面积</td> | 29 | <td style="width: 15%">宗地面积</td> |
30 | <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td> | 30 | <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td> |
31 | <td style="width: 15%">用途</td> | 31 | <td style="width: 15%">用途</td> |
32 | <td style="width: 30%">{{ zdjbxx.yt | dicyt("tdyt") }}</td> | 32 | <td style="width: 30%">{{ zdjbxx.ghytmc }}</td> |
33 | </tr> | 33 | </tr> |
34 | <tr> | 34 | <tr> |
35 | <td>等级</td> | 35 | <td>等级</td> |
... | @@ -112,11 +112,11 @@ | ... | @@ -112,11 +112,11 @@ |
112 | </template> | 112 | </template> |
113 | 113 | ||
114 | <script> | 114 | <script> |
115 | import store from "@/store/index.js"; | 115 | import store from "@/store/index.js"; |
116 | import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; | 116 | import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; |
117 | 117 | ||
118 | export default { | 118 | export default { |
119 | data() { | 119 | data () { |
120 | return { | 120 | return { |
121 | printObj: { | 121 | printObj: { |
122 | id: "box", | 122 | id: "box", |
... | @@ -197,7 +197,7 @@ export default { | ... | @@ -197,7 +197,7 @@ export default { |
197 | } | 197 | } |
198 | }, | 198 | }, |
199 | }, | 199 | }, |
200 | created() { | 200 | created () { |
201 | this.loadData(); | 201 | this.loadData(); |
202 | }, | 202 | }, |
203 | methods: { | 203 | methods: { |
... | @@ -205,7 +205,7 @@ export default { | ... | @@ -205,7 +205,7 @@ export default { |
205 | * @description: loadData | 205 | * @description: loadData |
206 | * @author: renchao | 206 | * @author: renchao |
207 | */ | 207 | */ |
208 | loadData() { | 208 | loadData () { |
209 | getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { | 209 | getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { |
210 | if (res.code === 200) { | 210 | if (res.code === 200) { |
211 | this.zdjbxx = res.result.zdjbxx; | 211 | this.zdjbxx = res.result.zdjbxx; |
... | @@ -218,11 +218,11 @@ export default { | ... | @@ -218,11 +218,11 @@ export default { |
218 | }, | 218 | }, |
219 | 219 | ||
220 | }, | 220 | }, |
221 | }; | 221 | }; |
222 | </script> | 222 | </script> |
223 | <style lang="scss" scoped> | 223 | <style lang="scss" scoped> |
224 | @import "~@/styles/tablecss.scss"; | 224 | @import "~@/styles/tablecss.scss"; |
225 | .tableDivCss { | 225 | .tableDivCss { |
226 | position: relative; | 226 | position: relative; |
227 | .print { | 227 | .print { |
228 | display: inline; | 228 | display: inline; |
... | @@ -232,5 +232,5 @@ export default { | ... | @@ -232,5 +232,5 @@ export default { |
232 | left: 11px; | 232 | left: 11px; |
233 | top: 11px; | 233 | top: 11px; |
234 | } | 234 | } |
235 | } | 235 | } |
236 | </style> | 236 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-12-18 16:08:26 | 4 | * @LastEditTime: 2023-12-19 09:40:39 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> | 7 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> |
... | @@ -169,7 +169,7 @@ | ... | @@ -169,7 +169,7 @@ |
169 | that.loadStatus = '1'; | 169 | that.loadStatus = '1'; |
170 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | 170 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); |
171 | if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) { | 171 | if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) { |
172 | LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 IS) 旋转"); // 设置纸张大小为 B4 | 172 | // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4 |
173 | LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 | 173 | LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 |
174 | } else { | 174 | } else { |
175 | LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 | 175 | LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | 28 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> |
29 | </el-tabs> | 29 | </el-tabs> |
30 | </el-col> | 30 | </el-col> |
31 | <el-col :span="2" v-if="this.formData.ysxlh"> | 31 | <el-col :span="2" v-if="this.formData.ysxlh" style="float:right"> |
32 | <el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button> | 32 | <el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button> |
33 | </el-col> | 33 | </el-col> |
34 | </el-row> | 34 | </el-row> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-12-19 08:54:37 | 4 | * @LastEditTime: 2023-12-19 09:17:03 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> |
8 | <!-- 表单部分 --> | 8 | <!-- 表单部分 --> |
9 | <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1" style="margin-top:-23px"> | 9 | <div style="margin-top:-20px"> |
10 | <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1"> | ||
10 | <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz" | 11 | <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz" |
11 | v-for="(item, index) in headTabBdcqz" :key="index"> | 12 | v-for="(item, index) in headTabBdcqz" :key="index"> |
12 | </el-tab-pane> | 13 | </el-tab-pane> |
13 | </el-tabs> | 14 | </el-tabs> |
14 | <el-tabs v-model="activeTitle" style="margin-top:-20px"> | 15 | </div> |
16 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> | ||
17 | <div style="height:85vh"> | ||
18 | <div v-show="this.bdcqz.bdcqzlx==1"> | ||
19 | <el-tabs v-model="activeTitle"> | ||
15 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> | 20 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> |
16 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | 21 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> |
17 | </el-tabs> | 22 | </el-tabs> |
18 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> | 23 | <div :style="{'width':'1185px','overflow-y': 'auto','height': '670px',}"> |
19 | <div :style="{'width':'1180px','overflow-y': 'auto'}"> | 24 | <canvas ref="zs1" width="1000" v-show="activeTitle=='title1'" height="700"></canvas> |
20 | <canvas ref="zs1" width="1000" v-show="this.bdcqz.bdcqzlx==1 && activeTitle=='title1'" height="700"></canvas> | 25 | <canvas ref="zs" width="1000" v-show="activeTitle=='title2'" height="700"></canvas> |
21 | <canvas ref="zs" width="1000" v-show="this.bdcqz.bdcqzlx==1 && activeTitle=='title2'" height="700"></canvas> | 26 | </div> |
22 | <canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas> | 27 | </div> |
28 | <div style="width:1185px;overflow-x: hidden;height: 700px;overflow-y:auto" v-show="this.bdcqz.bdcqzlx==2"> | ||
29 | <canvas ref="zm" width="1180" height="780"></canvas> | ||
30 | </div> | ||
23 | </div> | 31 | </div> |
24 | </div> | 32 | </div> |
25 | </template> | 33 | </template> |
... | @@ -573,6 +581,9 @@ | ... | @@ -573,6 +581,9 @@ |
573 | /deep/.el-form-item--small.el-form-item { | 581 | /deep/.el-form-item--small.el-form-item { |
574 | margin-bottom: 0; | 582 | margin-bottom: 0; |
575 | } | 583 | } |
584 | /deep/.mask-content { | ||
585 | padding-top: 10px !important; | ||
586 | } | ||
576 | .imgClass { | 587 | .imgClass { |
577 | display: inline-block; | 588 | display: inline-block; |
578 | height: auto; | 589 | height: auto; | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-11-22 17:05:55 | 4 | * @LastEditTime: 2023-12-19 10:02:03 |
5 | */ | 5 | */ |
6 | import Vue from 'vue' | 6 | import Vue from 'vue' |
7 | import { getPrintTemplateByCode } from "@/api/print"; | 7 | import { getPrintTemplateByCode } from "@/api/print"; |
... | @@ -137,29 +137,6 @@ export default { | ... | @@ -137,29 +137,6 @@ export default { |
137 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", | 137 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", |
138 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true | 138 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true |
139 | ) | 139 | ) |
140 | //根据编号获取对应信息 | ||
141 | // getPrintTemplateByCode({ tmpno: Vue.prototype.BASE_API.adapter }).then(res => { | ||
142 | // if (res.code === 200) { | ||
143 | // getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { | ||
144 | // if (infoRes.code === 200) { | ||
145 | // let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ||
146 | |||
147 | // // 装载第一个模板并设置数据 | ||
148 | // LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); | ||
149 | // for (let key in infoRes.result) { | ||
150 | // LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]); | ||
151 | // } | ||
152 | |||
153 | // // 进行预览 | ||
154 | // LODOP.PREVIEW(); | ||
155 | // } else { | ||
156 | // this.$message.error(infoRes.message); | ||
157 | // } | ||
158 | // }); | ||
159 | // } else { | ||
160 | // this.$message.error(res.message); | ||
161 | // } | ||
162 | // }) | ||
163 | break; | 140 | break; |
164 | case "B7": | 141 | case "B7": |
165 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | 142 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | ... | ... |
-
Please register or sign in to post a comment