88a59df1 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 916e1951 05b96cee
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-10 14:11:25
* @LastEditTime: 2023-08-16 11:14:21
-->
<template>
<!-- 受理信息 -->
......@@ -266,7 +266,7 @@
maxlength="13"
v-model="ruleForm.diyaq.dymj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.diyaq.mjdw" style="width: 20%">
<el-select v-model="ruleForm.diyaq.mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 10:01:28
* @LastEditTime: 2023-08-16 11:06:34
-->
<template>
<!-- 受理信息 -->
......@@ -126,7 +126,7 @@
<el-input
v-model="ruleForm.fdcq2.dytdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -143,7 +143,7 @@
<el-input
v-model="ruleForm.fdcq2.fttdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -160,6 +160,7 @@
<treeselect
v-model="ruleForm.fdcq2.tdxz"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
......@@ -261,7 +262,7 @@
<el-input
v-model="ruleForm.fdcq2.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -278,7 +279,7 @@
<el-input
v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -295,7 +296,7 @@
<el-input
v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -138,7 +138,7 @@
maxlength="12"
v-model="ruleForm.jsydsyq.syqmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:47:46
* @LastEditTime: 2023-08-16 11:15:56
-->
<template>
<!-- 受理信息 -->
......@@ -173,7 +173,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -194,7 +194,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -215,7 +215,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -238,7 +238,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -259,7 +259,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -280,7 +280,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -303,7 +303,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -338,7 +338,7 @@
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -388,7 +388,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
......@@ -249,7 +249,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="总层数:">
<el-input oninput = "value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
<el-input oninput="value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -261,7 +261,7 @@
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -315,7 +315,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 10:56:33
* @LastEditTime: 2023-08-16 11:10:16
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -145,10 +145,10 @@
context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
// context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
// qlqtzk
const maxWidth = 280; // 最大宽度限制
const maxWidth = 330; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
lines.forEach((line, index) => {
const y = 469 + (index * 37); // 每行文本的垂直位置
const y = 473 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......@@ -188,7 +188,7 @@
})
let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
lines3.forEach((line, index) => {
const y = 423 + (index * 20); // 每行文本的垂直位置
const y = 423 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......@@ -212,7 +212,7 @@
let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
if (lines2.length > 22) {
lines2.forEach((line, index) => {
const y = 170 + (index * 27); // 每行文本的垂直位置
const y = 170 + (index * 20); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......@@ -232,7 +232,7 @@
})
} else {
lines2.forEach((line, index) => {
const y = 180 + (index * 27); // 每行文本的垂直位置
const y = 180 + (index * 20); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-16 10:14:00
* @LastEditTime: 2023-08-16 11:06:29
-->
<template>
<div class="slxx">
......@@ -75,7 +75,7 @@
<el-select
disabled
v-model="ruleForm.zdjbxx.mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -98,6 +98,7 @@
noOptionsText="暂无数据"
placeholder=""
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
:options="dictData['A9']" />
......@@ -113,7 +114,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -132,7 +133,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -233,7 +234,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -252,7 +253,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -271,7 +272,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -124,7 +124,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -143,7 +143,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -162,7 +162,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -78,7 +78,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -97,7 +97,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -118,7 +118,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -139,7 +139,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -162,7 +162,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -183,7 +183,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -204,7 +204,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -227,7 +227,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -114,7 +114,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
......@@ -121,7 +121,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......