Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
88f5e7c8 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 3dbb80e7 5e524f29
Inline Side-by-side
Showing 7 changed files with 58 additions and 15 deletions
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-07 14:43:46
* @LastEditTime: 2023-08-18 13:53:23
-->
<template>
<div class="rlPopup">
......
......@@ -34,7 +34,7 @@
@click="treeClick(item, index)">
<span v-if="item.isrequired == 1" class="required">必选</span>
{{ item.sjmc }}
<span class="cl_number">({{ item.children ? item.children.length : 0 }})</span>
<span class="cl_number" :key="key">({{ item.children ? item.children.length : 0 }})</span>
</div>
</div>
</div>
......@@ -206,6 +206,7 @@
if (this.previewImg.index == this.previewImg.imgList.length) {
this.previewImg.index = this.previewImg.index - 1;
}
this.key++
} else {
this.previewImg.imgList = [];
this.tableData.forEach((item, index) => {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 17:02:36
* @LastEditTime: 2023-08-18 13:51:27
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -149,7 +149,7 @@
const maxWidth = 330; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
lines.forEach((line, index) => {
const y = 473 + (index * 27); // 每行文本的垂直位置
const y = 473 + (index * 30); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-17 15:56:25
* @LastEditTime: 2023-08-18 15:48:43
-->
<template>
<div class="slxx">
......@@ -87,7 +87,14 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="林地所有权性质：">
<el-input v-model="ruleForm.lq.ldsyqxz"></el-input>
<el-select v-model="ruleForm.lq.ldsyqxz">
<el-option
v-for="item in dictData['A45']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -109,12 +116,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="林种：">
<el-input v-model="ruleForm.lq.lz"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A26']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="起源：">
<el-input v-model="ruleForm.lq.qy"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A52']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
......
......@@ -87,7 +87,14 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="林地所有权性质：">
<el-input v-model="ruleForm.lq.ldsyqxz"></el-input>
<el-select v-model="ruleForm.lq.ldsyqxz">
<el-option
v-for="item in dictData['A45']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -109,12 +116,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="林种：">
<el-input v-model="ruleForm.lq.lz"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A26']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="起源：">
<el-input v-model="ruleForm.lq.qy"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A52']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
......
......@@ -145,7 +145,7 @@
this.$popupCacel()
} else {
if (res.result.length > 0) {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 13:26:06
* @LastEditTime: 2023-08-18 13:56:32
-->
<template>
<div class="from-clues">
......@@ -258,7 +258,7 @@
}
this.$popupCacel()
} else {
if (res.result.length > 0) {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......@@ -283,7 +283,7 @@
store.dispatch('user/refreshPage', true);
this.$popupCacel()
} else {
if (res.result.length > 0) {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......