Merge branch 'dev'
Showing
5 changed files
with
65 additions
and
26 deletions
| ... | @@ -531,7 +531,7 @@ | ... | @@ -531,7 +531,7 @@ |
| 531 | // 恢复原始字体设置 | 531 | // 恢复原始字体设置 |
| 532 | context.font = originalFont; | 532 | context.font = originalFont; |
| 533 | } else { | 533 | } else { |
| 534 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56); | 534 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 755, 125); |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | 537 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2024-01-24 17:29:20 | 4 | * @LastEditTime: 2024-01-30 16:29:37 |
| 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;"> |
| ... | @@ -444,6 +444,7 @@ | ... | @@ -444,6 +444,7 @@ |
| 444 | } | 444 | } |
| 445 | context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125); | 445 | context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125); |
| 446 | context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125); | 446 | context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125); |
| 447 | console.log(getByteLen(this.bdcqz.sxqc)); | ||
| 447 | if (getByteLen(this.bdcqz.sxqc) > 14) { | 448 | if (getByteLen(this.bdcqz.sxqc) > 14) { |
| 448 | const originalFont = context.font; | 449 | const originalFont = context.font; |
| 449 | // 设置新的字体大小 | 450 | // 设置新的字体大小 |
| ... | @@ -453,7 +454,7 @@ | ... | @@ -453,7 +454,7 @@ |
| 453 | // 恢复原始字体设置 | 454 | // 恢复原始字体设置 |
| 454 | context.font = originalFont; | 455 | context.font = originalFont; |
| 455 | } else { | 456 | } else { |
| 456 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56); | 457 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 755, 125); |
| 457 | } | 458 | } |
| 458 | 459 | ||
| 459 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | 460 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: 受理信息 | 2 | * @Description: 受理信息 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2024-01-30 15:17:03 | 4 | * @LastEditTime: 2024-01-30 16:31:12 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="slxx"> | 7 | <div class="slxx"> |
| ... | @@ -502,8 +502,12 @@ | ... | @@ -502,8 +502,12 @@ |
| 502 | propsParam: this.$attrs, | 502 | propsParam: this.$attrs, |
| 503 | //表单是否可操作 | 503 | //表单是否可操作 |
| 504 | viewEdit: true, | 504 | viewEdit: true, |
| 505 | rules: {}, | 505 | rules: { |
| 506 | }; | 506 | 'fdcq2.djyy': [ |
| 507 | { required: true, message: '请输入登记原因', trigger: 'blur' } | ||
| 508 | ] | ||
| 509 | } | ||
| 510 | } | ||
| 507 | }, | 511 | }, |
| 508 | methods: { | 512 | methods: { |
| 509 | /** | 513 | /** |
| ... | @@ -619,26 +623,37 @@ | ... | @@ -619,26 +623,37 @@ |
| 619 | }); | 623 | }); |
| 620 | } | 624 | } |
| 621 | } | 625 | } |
| 622 | this.$store.dispatch("user/refreshPage", false); | 626 | this.$refs['ruleForm'].validate((valid) => { |
| 623 | saveData(this.ruleForm).then((res) => { | 627 | if (valid) { |
| 628 | that.$store.dispatch("user/refreshPage", false); | ||
| 629 | saveData(that.ruleForm).then((res) => { | ||
| 624 | if (res.code === 200) { | 630 | if (res.code === 200) { |
| 625 | this.$message({ | 631 | that.$message({ |
| 626 | showClose: true, | 632 | showClose: true, |
| 627 | message: "保存成功！", | 633 | message: "保存成功！", |
| 628 | type: "success", | 634 | type: "success", |
| 629 | }); | 635 | }); |
| 630 | this.$store.dispatch("user/refreshPage", true); | 636 | that.$store.dispatch("user/refreshPage", true); |
| 631 | } else { | 637 | } else { |
| 632 | this.$message({ | 638 | that.$message({ |
| 633 | showClose: true, | 639 | showClose: true, |
| 634 | message: res.message, | 640 | message: res.message, |
| 635 | type: "error", | 641 | type: "error" |
| 642 | }) | ||
| 643 | } | ||
| 644 | }) | ||
| 645 | } else { | ||
| 646 | that.$message({ | ||
| 647 | showClose: true, | ||
| 648 | message: "请输入登记原因", | ||
| 649 | type: "error" | ||
| 636 | }) | 650 | }) |
| 651 | return false | ||
| 637 | } | 652 | } |
| 638 | }) | 653 | }) |
| 639 | } | 654 | } |
| 640 | }, | 655 | } |
| 641 | }; | 656 | } |
| 642 | </script> | 657 | </script> |
| 643 | <style scoped lang="scss"> | 658 | <style scoped lang="scss"> |
| 644 | @import "~@/styles/public.scss"; | 659 | @import "~@/styles/public.scss"; | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: 受理信息 | 2 | * @Description: 受理信息 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-11-15 15:47:37 | 4 | * @LastEditTime: 2024-01-30 16:07:53 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="slxx"> | 7 | <div class="slxx"> |
| ... | @@ -245,7 +245,7 @@ | ... | @@ -245,7 +245,7 @@ |
| 245 | </div> | 245 | </div> |
| 246 | <el-row :gutter="10"> | 246 | <el-row :gutter="10"> |
| 247 | <el-col> | 247 | <el-col> |
| 248 | <el-form-item v-if="ruleForm.fdcq2" label="登记原因：" prop="djyy"> | 248 | <el-form-item v-if="ruleForm.fdcq2" label="登记原因：" prop="fdcq2.djyy"> |
| 249 | <el-input | 249 | <el-input |
| 250 | class="textArea" | 250 | class="textArea" |
| 251 | type="textarea" | 251 | type="textarea" |
| ... | @@ -378,8 +378,12 @@ | ... | @@ -378,8 +378,12 @@ |
| 378 | }, | 378 | }, |
| 379 | //传递参数 | 379 | //传递参数 |
| 380 | propsParam: {}, | 380 | propsParam: {}, |
| 381 | rules: {}, | 381 | rules: { |
| 382 | }; | 382 | 'fdcq2.djyy': [ |
| 383 | { required: true, message: '请输入登记原因', trigger: 'blur' } | ||
| 384 | ] | ||
| 385 | } | ||
| 386 | } | ||
| 383 | }, | 387 | }, |
| 384 | methods: { | 388 | methods: { |
| 385 | /** | 389 | /** |
| ... | @@ -511,22 +515,35 @@ | ... | @@ -511,22 +515,35 @@ |
| 511 | }) | 515 | }) |
| 512 | } | 516 | } |
| 513 | } | 517 | } |
| 514 | saveData(this.ruleForm).then((res) => { | 518 | this.$refs['ruleForm'].validate((valid) => { |
| 519 | if (valid) { | ||
| 520 | that.$store.dispatch("user/refreshPage", false); | ||
| 521 | saveData(that.ruleForm).then((res) => { | ||
| 515 | if (res.code === 200) { | 522 | if (res.code === 200) { |
| 516 | this.$message({ | 523 | that.$message({ |
| 517 | showClose: true, | 524 | showClose: true, |
| 518 | message: "保存成功！", | 525 | message: "保存成功！", |
| 519 | type: "success", | 526 | type: "success", |
| 520 | }); | 527 | }); |
| 521 | this.$store.dispatch("user/refreshPage", true); | 528 | that.$store.dispatch("user/refreshPage", true); |
| 522 | } else { | 529 | } else { |
| 523 | this.$message({ | 530 | that.$message({ |
| 524 | showClose: true, | 531 | showClose: true, |
| 525 | message: res.message, | 532 | message: res.message, |
| 526 | type: "error", | 533 | type: "error", |
| 527 | }); | 534 | }); |
| 528 | } | 535 | } |
| 529 | }); | 536 | }) |
| 537 | |||
| 538 | } else { | ||
| 539 | that.$message({ | ||
| 540 | showClose: true, | ||
| 541 | message: "请输入登记原因", | ||
| 542 | type: "error" | ||
| 543 | }) | ||
| 544 | return false | ||
| 545 | } | ||
| 546 | }) | ||
| 530 | }, | 547 | }, |
| 531 | /** | 548 | /** |
| 532 | * @description: compare | 549 | * @description: compare | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-07-14 16:59:26 | 4 | * @LastEditTime: 2024-01-30 15:51:33 |
| 5 | */ | 5 | */ |
| 6 | import filter from '@/utils/filter.js' | 6 | import filter from '@/utils/filter.js' |
| 7 | let vm = null | 7 | let vm = null |
| ... | @@ -75,9 +75,15 @@ class data extends filter { | ... | @@ -75,9 +75,15 @@ class data extends filter { |
| 75 | width: '140' | 75 | width: '140' |
| 76 | }, | 76 | }, |
| 77 | { | 77 | { |
| 78 | prop: "zl", | ||
| 79 | label: "坐落", | 78 | label: "坐落", |
| 80 | minWidth: '130' | 79 | minWidth: '100', |
| 80 | render: (h, scope) => { | ||
| 81 | return ( | ||
| 82 | <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width "> | ||
| 83 | <span class="ellipsis-table"> {scope.row.zl}</span> | ||
| 84 | </el-tooltip> | ||
| 85 | ) | ||
| 86 | } | ||
| 81 | }, | 87 | }, |
| 82 | { | 88 | { |
| 83 | label: '操作', | 89 | label: '操作', | ... | ... |
-
Please register or sign in to post a comment