42e3dbde by renchao@pashanhoo.com

Merge branch 'dev'

2 parents b13ffcef ed0741c8
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-17 15:20:29
* @LastEditTime: 2023-09-19 15:52:44
-->
<template>
<div class='ywdialog'>
......@@ -33,4 +33,7 @@
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
.ywdialog {
min-width: 230px;
}
</style>
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-11 11:29:36
* @LastEditTime: 2023-09-19 14:04:13
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -204,7 +204,6 @@
})
})
}
// context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
// 权利其他状态
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
for (let i = 0; i < lines.length; i++) {
......@@ -225,18 +224,18 @@
arr.push(currentLine);
if (i > 0) {
arr.forEach((line, index) => {
context.fillText(line, 129, 480 + (26 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
context.fillText(line, 129, 490 + (26 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
})
} else {
arr.forEach((line, index) => {
context.fillText(line, 129, 490 + (26 * (i - 1)) + (index * 14)); // 调整行高
context.fillText(line, 129, 500 + (26 * (i - 1)) + (index * 14)); // 调整行高
})
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 129, 490 + 4 * num + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (24 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 505 + (24 * (i - 1)));
}
}
}
......@@ -518,9 +517,9 @@
image.src = this.bdczmSrc;
}
},
computed:{
hdiffHeight(){
return this.headTabBdcqz.length > 1 ? 54 :0
computed: {
hdiffHeight () {
return this.headTabBdcqz.length > 1 ? 54 : 0
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-11 09:56:42
* @LastEditTime: 2023-09-19 15:24:14
-->
<template>
<div class="slxx">
......@@ -72,12 +72,6 @@
<el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<!-- 批量查封状态有多种查封类型,不予展示 -->
<!-- <el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc">
<el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input>
</el-form-item>
</el-col>-->
</el-row>
<el-row :gutter="10">
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:56:19
* @LastEditTime: 2023-09-19 15:47:56
-->
<template>
<div class="slxx">
......@@ -128,15 +128,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质">
<treeselect
disabled
v-model="ruleForm.ztQlxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:56:41
* @LastEditTime: 2023-09-19 15:23:42
-->
<template>
<!-- 受理信息 -->
......@@ -100,15 +100,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<treeselect
disabled
v-model="ruleForm.ztQlxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:56:59
* @LastEditTime: 2023-09-19 15:55:59
-->
<template>
<!-- 受理信息 -->
......@@ -94,15 +94,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:" prop="qlxzmc">
<treeselect
disabled
v-model="ruleForm.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:57:23
* @LastEditTime: 2023-09-19 15:44:16
-->
<template>
<!-- 受理信息 -->
......@@ -72,7 +72,6 @@
<el-col :span="8">
<el-form-item label="权利性质">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:57:35
* @LastEditTime: 2023-09-19 15:45:34
-->
<template>
<!-- 受理信息 -->
......@@ -72,15 +72,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -65,15 +65,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -65,15 +65,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 10:58:26
* @LastEditTime: 2023-09-19 15:30:04
-->
<template>
<!-- 受理信息 -->
......@@ -70,15 +70,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......