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
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-07 14:43:46 4 * @LastEditTime: 2023-08-18 13:53:23
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 @click="treeClick(item, index)"> 34 @click="treeClick(item, index)">
35 <span v-if="item.isrequired == 1" class="required">必选</span> 35 <span v-if="item.isrequired == 1" class="required">必选</span>
36 {{ item.sjmc }} 36 {{ item.sjmc }}
37 <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span> 37 <span class="cl_number" :key="key">({{ item.children ? item.children.length : 0 }})</span>
38 </div> 38 </div>
39 </div> 39 </div>
40 </div> 40 </div>
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
206 if (this.previewImg.index == this.previewImg.imgList.length) { 206 if (this.previewImg.index == this.previewImg.imgList.length) {
207 this.previewImg.index = this.previewImg.index - 1; 207 this.previewImg.index = this.previewImg.index - 1;
208 } 208 }
209 this.key++
209 } else { 210 } else {
210 this.previewImg.imgList = []; 211 this.previewImg.imgList = [];
211 this.tableData.forEach((item, index) => { 212 this.tableData.forEach((item, index) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 17:02:36 4 * @LastEditTime: 2023-08-18 13:51:27
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;">
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 const maxWidth = 330; // 最大宽度限制 149 const maxWidth = 330; // 最大宽度限制
150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
151 lines.forEach((line, index) => { 151 lines.forEach((line, index) => {
152 const y = 473 + (index * 27); // 每行文本的垂直位置 152 const y = 473 + (index * 30); // 每行文本的垂直位置
153 let currentLine = ''; 153 let currentLine = '';
154 let arr = []; 154 let arr = [];
155 for (let word of line) { 155 for (let word of line) {
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-17 15:56:25 4 * @LastEditTime: 2023-08-18 15:48:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -87,7 +87,14 @@ ...@@ -87,7 +87,14 @@
87 <el-row :gutter="10"> 87 <el-row :gutter="10">
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="林地所有权性质："> 89 <el-form-item label="林地所有权性质：">
90 <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> 90 <el-select v-model="ruleForm.lq.ldsyqxz">
91 <el-option
92 v-for="item in dictData['A45']"
93 :key="item.dcode"
94 :label="item.dname"
95 :value="item.dcode">
96 </el-option>
97 </el-select>
91 </el-form-item> 98 </el-form-item>
92 </el-col> 99 </el-col>
93 <el-col :span="8"> 100 <el-col :span="8">
...@@ -109,12 +116,26 @@ ...@@ -109,12 +116,26 @@
109 </el-col> 116 </el-col>
110 <el-col :span="8"> 117 <el-col :span="8">
111 <el-form-item label="林种："> 118 <el-form-item label="林种：">
112 <el-input v-model="ruleForm.lq.lz"></el-input> 119 <el-select v-model="ruleForm.lq.lz">
120 <el-option
121 v-for="item in dictData['A26']"
122 :key="item.dcode"
123 :label="item.dname"
124 :value="item.dcode">
125 </el-option>
126 </el-select>
113 </el-form-item> 127 </el-form-item>
114 </el-col> 128 </el-col>
115 <el-col :span="8"> 129 <el-col :span="8">
116 <el-form-item label="起源："> 130 <el-form-item label="起源：">
117 <el-input v-model="ruleForm.lq.qy"></el-input> 131 <el-select v-model="ruleForm.lq.lz">
132 <el-option
133 v-for="item in dictData['A52']"
134 :key="item.dcode"
135 :label="item.dname"
136 :value="item.dcode">
137 </el-option>
138 </el-select>
118 </el-form-item> 139 </el-form-item>
119 </el-col> 140 </el-col>
120 </el-row> 141 </el-row>
......
...@@ -87,7 +87,14 @@ ...@@ -87,7 +87,14 @@
87 <el-row :gutter="10"> 87 <el-row :gutter="10">
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="林地所有权性质："> 89 <el-form-item label="林地所有权性质：">
90 <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> 90 <el-select v-model="ruleForm.lq.ldsyqxz">
91 <el-option
92 v-for="item in dictData['A45']"
93 :key="item.dcode"
94 :label="item.dname"
95 :value="item.dcode">
96 </el-option>
97 </el-select>
91 </el-form-item> 98 </el-form-item>
92 </el-col> 99 </el-col>
93 <el-col :span="8"> 100 <el-col :span="8">
...@@ -109,12 +116,26 @@ ...@@ -109,12 +116,26 @@
109 </el-col> 116 </el-col>
110 <el-col :span="8"> 117 <el-col :span="8">
111 <el-form-item label="林种："> 118 <el-form-item label="林种：">
112 <el-input v-model="ruleForm.lq.lz"></el-input> 119 <el-select v-model="ruleForm.lq.lz">
120 <el-option
121 v-for="item in dictData['A26']"
122 :key="item.dcode"
123 :label="item.dname"
124 :value="item.dcode">
125 </el-option>
126 </el-select>
113 </el-form-item> 127 </el-form-item>
114 </el-col> 128 </el-col>
115 <el-col :span="8"> 129 <el-col :span="8">
116 <el-form-item label="起源："> 130 <el-form-item label="起源：">
117 <el-input v-model="ruleForm.lq.qy"></el-input> 131 <el-select v-model="ruleForm.lq.lz">
132 <el-option
133 v-for="item in dictData['A52']"
134 :key="item.dcode"
135 :label="item.dname"
136 :value="item.dcode">
137 </el-option>
138 </el-select>
118 </el-form-item> 139 </el-form-item>
119 </el-col> 140 </el-col>
120 </el-row> 141 </el-row>
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 this.$popupCacel() 145 this.$popupCacel()
146 146
147 } else { 147 } else {
148 if (res.result.length > 0) { 148 if (res.result && res.result.length > 0) {
149 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 149 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
150 } else { 150 } else {
151 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 151 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 13:26:06 4 * @LastEditTime: 2023-08-18 13:56:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 } 258 }
259 this.$popupCacel() 259 this.$popupCacel()
260 } else { 260 } else {
261 if (res.result.length > 0) { 261 if (res.result && res.result.length > 0) {
262 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 262 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
263 } else { 263 } else {
264 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 264 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
283 store.dispatch('user/refreshPage', true); 283 store.dispatch('user/refreshPage', true);
284 this.$popupCacel() 284 this.$popupCacel()
285 } else { 285 } else {
286 if (res.result.length > 0) { 286 if (res.result && res.result.length > 0) {
287 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 287 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
288 } else { 288 } else {
289 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 289 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......