Merge branch 'dev'
Showing
3 changed files
with
11 additions
and
12 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-29 14:13:09 | 4 | * @LastEditTime: 2023-08-30 08:40:36 |
| 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"> |
| ... | @@ -160,7 +160,6 @@ | ... | @@ -160,7 +160,6 @@ |
| 160 | this.ruleForm = item; | 160 | this.ruleForm = item; |
| 161 | this.editFlag = true; | 161 | this.editFlag = true; |
| 162 | }, | 162 | }, |
| 163 | //设计打印模板 | ||
| 164 | /** | 163 | /** |
| 165 | * @description: 设计打印模板 | 164 | * @description: 设计打印模板 |
| 166 | * @author: renchao | 165 | * @author: renchao |
| ... | @@ -169,6 +168,10 @@ | ... | @@ -169,6 +168,10 @@ |
| 169 | let that = this; | 168 | let that = this; |
| 170 | that.loadStatus = '1'; | 169 | that.loadStatus = '1'; |
| 171 | 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'].includes(that.ruleForm.tmpno)) { | ||
| 172 | LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4"); // 设置纸张大小为 B4 | ||
| 173 | LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 | ||
| 174 | } | ||
| 172 | LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 | 175 | LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 |
| 173 | //窗口关闭后,回调函数中保存的设计代码 | 176 | //窗口关闭后,回调函数中保存的设计代码 |
| 174 | if (LODOP.CVERSION) | 177 | if (LODOP.CVERSION) |
| ... | @@ -192,10 +195,6 @@ | ... | @@ -192,10 +195,6 @@ |
| 192 | that.loadStatus = '2'; | 195 | that.loadStatus = '2'; |
| 193 | }, 1000); | 196 | }, 1000); |
| 194 | }; | 197 | }; |
| 195 | if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) { | ||
| 196 | LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4"); | ||
| 197 | // LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 | ||
| 198 | } | ||
| 199 | LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后 | 198 | LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后 |
| 200 | } | 199 | } |
| 201 | } | 200 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-29 13:11:05 | 4 | * @LastEditTime: 2023-08-30 10:11:42 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div> | 7 | <div> |
| ... | @@ -252,11 +252,11 @@ | ... | @@ -252,11 +252,11 @@ |
| 252 | arr.push(currentLine); | 252 | arr.push(currentLine); |
| 253 | if (i > 0) { | 253 | if (i > 0) { |
| 254 | arr.forEach((line, index) => { | 254 | arr.forEach((line, index) => { |
| 255 | context.fillText(line, 129, 490 + (28 * (i - 1)) + 5 * num + (index * 14)); // 调整行高 | 255 | context.fillText(line, 129, 485 + (26 * (i - 1)) + 5 * num + (index * 14)); // 调整行高 |
| 256 | }) | 256 | }) |
| 257 | } else { | 257 | } else { |
| 258 | arr.forEach((line, index) => { | 258 | arr.forEach((line, index) => { |
| 259 | context.fillText(line, 129, 490 + (28 * (i - 1)) + (index * 14)); // 调整行高 | 259 | context.fillText(line, 129, 485 + (26 * (i - 1)) + (index * 14)); // 调整行高 |
| 260 | }) | 260 | }) |
| 261 | } | 261 | } |
| 262 | } else { | 262 | } else { | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-29 13:12:03 | 4 | * @LastEditTime: 2023-08-30 10:13:25 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> |
| ... | @@ -223,11 +223,11 @@ | ... | @@ -223,11 +223,11 @@ |
| 223 | arr.push(currentLine); | 223 | arr.push(currentLine); |
| 224 | if (i > 0) { | 224 | if (i > 0) { |
| 225 | arr.forEach((line, index) => { | 225 | arr.forEach((line, index) => { |
| 226 | context.fillText(line, 129, 485 + (28 * (i - 1)) + 5 * num + (index * 14)); // 调整行高 | 226 | context.fillText(line, 129, 485 + (26 * (i - 1)) + 5 * num + (index * 14)); // 调整行高 |
| 227 | }) | 227 | }) |
| 228 | } else { | 228 | } else { |
| 229 | arr.forEach((line, index) => { | 229 | arr.forEach((line, index) => { |
| 230 | context.fillText(line, 129, 485 + (28 * (i - 1)) + (index * 14)); // 调整行高 | 230 | context.fillText(line, 129, 485 + (26 * (i - 1)) + (index * 14)); // 调整行高 |
| 231 | }) | 231 | }) |
| 232 | } | 232 | } |
| 233 | } else { | 233 | } else { | ... | ... |
-
Please register or sign in to post a comment