Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
dd806cc2 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 8ebc3b33 9dc1be45
Inline Side-by-side
Showing 3 changed files with 12 additions and 12 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-07 08:47:38 4 * @LastEditTime: 2023-11-08 13:27:03
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -572,18 +572,18 @@ ...@@ -572,18 +572,18 @@
572 arr.push(currentLine); 572 arr.push(currentLine);
573 if (i > 0) { 573 if (i > 0) {
574 arr.forEach((line, index) => { 574 arr.forEach((line, index) => {
575 context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高 575 context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
576 }) 576 })
577 } else { 577 } else {
578 arr.forEach((line, index) => { 578 arr.forEach((line, index) => {
579 context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高 579 context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
580 }) 580 })
581 } 581 }
582 } else { 582 } else {
583 if (i > 0) { 583 if (i > 0) {
584 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1))); 584 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
585 } else { 585 } else {
586 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1))); 586 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
587 } 587 }
588 } 588 }
589 } 589 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-07 08:46:45 4 * @LastEditTime: 2023-11-08 13:25:20
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;">
...@@ -497,18 +497,18 @@ ...@@ -497,18 +497,18 @@
497 arr.push(currentLine); 497 arr.push(currentLine);
498 if (i > 0) { 498 if (i > 0) {
499 arr.forEach((line, index) => { 499 arr.forEach((line, index) => {
500 context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高 500 context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
501 }) 501 })
502 } else { 502 } else {
503 arr.forEach((line, index) => { 503 arr.forEach((line, index) => {
504 context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高 504 context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
505 }) 505 })
506 } 506 }
507 } else { 507 } else {
508 if (i > 0) { 508 if (i > 0) {
509 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1))); 509 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
510 } else { 510 } else {
511 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1))); 511 context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
512 } 512 }
513 } 513 }
514 } 514 }
......
...@@ -166,14 +166,14 @@ ...@@ -166,14 +166,14 @@
166 that.$message.error('本书必须大于0，请检查印刷序列号'); 166 that.$message.error('本书必须大于0，请检查印刷序列号');
167 return 167 return
168 } 168 }
169 store.dispatch("user/refreshPage", true); 169 store.dispatch("user/refreshPage", false);
170 zsrk(this.ruleForm).then(res => { 170 zsrk(this.ruleForm).then(res => {
171 if (res.code == 200) { 171 if (res.code == 200) {
172 that.$message.success('保存成功') 172 that.$message.success('保存成功')
173 that.$popupCacel() 173 that.$popupCacel()
174 that.$refs['ruleForm'].resetFields() 174 that.$refs['ruleForm'].resetFields()
175 that.resetTableFields() 175 that.resetTableFields()
176 store.dispatch("user/refreshPage", false); 176 store.dispatch("user/refreshPage", true);
177 } else { 177 } else {
178 that.$message.error(res.message); 178 that.$message.error(res.message);
179 } 179 }
......