379930e8 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 42e3dbde 52f6e7a0
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:00:38 4 * @LastEditTime: 2023-09-19 16:13:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 isRefresh: { 75 isRefresh: {
76 handler (newVal, oldVal) { 76 handler (newVal, oldVal) {
77 if (newVal) { 77 if (newVal) {
78 this.loadBdcdylist() 78 this.loadBdcdylist(true)
79 } 79 }
80 }, 80 },
81 immediate: true 81 immediate: true
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 * @description: 读取申请单元信息 86 * @description: 读取申请单元信息
87 * @author: renchao 87 * @author: renchao
88 */ 88 */
89 loadBdcdylist () { 89 loadBdcdylist (status = false) {
90 let that = this 90 let that = this
91 var formdata = new FormData(); 91 var formdata = new FormData();
92 formdata.append("bsmSlsq", this.bsmSlsq); 92 formdata.append("bsmSlsq", this.bsmSlsq);
...@@ -104,13 +104,15 @@ ...@@ -104,13 +104,15 @@
104 that.currentSelectProps = res.result[0]; 104 that.currentSelectProps = res.result[0];
105 that.$emit('getCurrentSelectProps', this.currentSelectProps); 105 that.$emit('getCurrentSelectProps', this.currentSelectProps);
106 that.judgeBatchShow(); 106 that.judgeBatchShow();
107 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) { 107 if (!status) {
108 that.unitClick(sessionStorage.getItem('keyPath') - 0) 108 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
109 } else { 109 that.unitClick(sessionStorage.getItem('keyPath') - 0)
110 that.unitClick(0) 110 } else {
111 if (that.showBatch) { 111 that.unitClick(0)
112 //满足批量查封/批量抵押按钮出现 即先展示批量表单 112 if (that.showBatch) {
113 that.batchUnitClick(); 113 //满足批量查封/批量抵押按钮出现 即先展示批量表单
114 that.batchUnitClick();
115 }
114 } 116 }
115 } 117 }
116 } 118 }
...@@ -123,13 +125,15 @@ ...@@ -123,13 +125,15 @@
123 this.currentSelectProps = res.result[0]; 125 this.currentSelectProps = res.result[0];
124 this.$emit('getCurrentSelectProps', this.currentSelectProps); 126 this.$emit('getCurrentSelectProps', this.currentSelectProps);
125 this.judgeBatchShow(); 127 this.judgeBatchShow();
126 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) { 128 if (!status) {
127 that.unitClick(sessionStorage.getItem('keyPath') - 0) 129 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
128 } else { 130 that.unitClick(sessionStorage.getItem('keyPath') - 0)
129 that.unitClick(0) 131 } else {
130 if (that.showBatch) { 132 that.unitClick(0)
131 //满足批量查封/批量抵押按钮出现 即先展示批量表单 133 if (that.showBatch) {
132 that.batchUnitClick(); 134 //满足批量查封/批量抵押按钮出现 即先展示批量表单
135 that.batchUnitClick();
136 }
133 } 137 }
134 } 138 }
135 } 139 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 15:02:25 4 * @LastEditTime: 2023-09-19 16:15:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 watch: { 88 watch: {
89 isRefresh: { 89 isRefresh: {
90 handler (newVal, oldVal) { 90 handler (newVal, oldVal) {
91 if (newVal) this.loadBdcdylist() 91 if (newVal) this.loadBdcdylist(true)
92 }, 92 },
93 immediate: true 93 immediate: true
94 } 94 }
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
98 * @description: 读取申请单元信息 98 * @description: 读取申请单元信息
99 * @author: renchao 99 * @author: renchao
100 */ 100 */
101 loadBdcdylist () { 101 loadBdcdylist (status = false) {
102 let that = this 102 let that = this
103 var formdata = new FormData(); 103 var formdata = new FormData();
104 // 受理申请标识码 104 // 受理申请标识码
...@@ -114,13 +114,15 @@ ...@@ -114,13 +114,15 @@
114 this.currentSelectProps = res.result[0]; 114 this.currentSelectProps = res.result[0];
115 this.$emit('getCurrentSelectProps', this.currentSelectProps); 115 this.$emit('getCurrentSelectProps', this.currentSelectProps);
116 this.judgeBatchShow(); 116 this.judgeBatchShow();
117 if (sessionStorage.getItem('keyPath')) { 117 if (!status) {
118 that.unitClick(sessionStorage.getItem('keyPath') - 0) 118 if (sessionStorage.getItem('keyPath')) {
119 } else { 119 that.unitClick(sessionStorage.getItem('keyPath') - 0)
120 that.unitClick(0) 120 } else {
121 if (that.showBatch) { 121 that.unitClick(0)
122 //满足批量查封/批量抵押按钮出现 即先展示批量表单 122 if (that.showBatch) {
123 that.batchUnitClick(); 123 //满足批量查封/批量抵押按钮出现 即先展示批量表单
124 that.batchUnitClick();
125 }
124 } 126 }
125 } 127 }
126 } 128 }
...@@ -133,13 +135,15 @@ ...@@ -133,13 +135,15 @@
133 this.currentSelectProps = res.result[0]; 135 this.currentSelectProps = res.result[0];
134 this.$emit('getCurrentSelectProps', this.currentSelectProps); 136 this.$emit('getCurrentSelectProps', this.currentSelectProps);
135 this.judgeBatchShow(); 137 this.judgeBatchShow();
136 if (sessionStorage.getItem('keyPath')) { 138 if (!status) {
137 that.unitClick(sessionStorage.getItem('keyPath') - 0) 139 if (sessionStorage.getItem('keyPath')) {
138 } else { 140 that.unitClick(sessionStorage.getItem('keyPath') - 0)
139 that.unitClick(0) 141 } else {
140 if (that.showBatch) { 142 that.unitClick(0)
141 //满足批量查封/批量抵押按钮出现 即先展示批量表单 143 if (that.showBatch) {
142 that.batchUnitClick(); 144 //满足批量查封/批量抵押按钮出现 即先展示批量表单
145 that.batchUnitClick();
146 }
143 } 147 }
144 } 148 }
145 } 149 }
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 16:09:33 4 * @LastEditTime: 2023-09-19 16:42:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
400 </el-col> 400 </el-col>
401 </el-row> 401 </el-row>
402 </div> 402 </div>
403 <el-row class="btn" v-if="viewEdit"> 403 <el-row class="btn" v-if="isSave">
404 <el-form-item> 404 <el-form-item>
405 <el-button type="primary" @click="onSubmit">保存</el-button> 405 <el-button type="primary" @click="onSubmit">保存</el-button>
406 </el-form-item> 406 </el-form-item>
...@@ -440,8 +440,14 @@ ...@@ -440,8 +440,14 @@
440 } 440 }
441 }); 441 });
442 this.czrOptions = this.ruleForm.qlrList; 442 this.czrOptions = this.ruleForm.qlrList;
443 this.isSave = this.viewEdit
443 } else { 444 } else {
444 this.$message.error(res.message); 445 this.isSave = false
446 this.$confirm(res.message, '提示', {
447 cancelButtonText: '取消',
448 showConfirmButton: false,
449 type: 'warning'
450 })
445 } 451 }
446 }).catch(() => { 452 }).catch(() => {
447 this.loading = false 453 this.loading = false
...@@ -453,6 +459,7 @@ ...@@ -453,6 +459,7 @@
453 }, 459 },
454 data () { 460 data () {
455 return { 461 return {
462 isSave: true,
456 loading: false, 463 loading: false,
457 mjdw: "1", 464 mjdw: "1",
458 // 键名转换,方法默认是label和children进行树状渲染 465 // 键名转换,方法默认是label和children进行树状渲染
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 15:44:16 4 * @LastEditTime: 2023-09-19 17:19:32
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 :label-position="flag ? 'top' : ''" 15 :label-position="flag ? 'top' : ''"
16 :inline="flag" 16 :inline="flag"
17 label-width="120px"> 17 label-width="120px">
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
20 申请业务信息 20 申请业务信息
21 <div class="triangle"></div> 21 <div class="triangle"></div>
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col>
72 <el-col :span="8"> 72 <el-col :span="8">
73 <el-form-item label="权利性质"> 73 <el-form-item label="权利性质">
74 <treeselect 74 <treeselect
75 v-model="ruleForm.zdjbxx.qlxzmc" 75 v-model="ruleForm.zdjbxx.qlxz"
76 noOptionsText="暂无数据" 76 noOptionsText="暂无数据"
77 :default-expand-level="1" 77 :default-expand-level="1"
78 placeholder="" 78 placeholder=""
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
192 v-for="(item, index) in czrOptions" 192 v-for="(item, index) in czrOptions"
193 :key="index" 193 :key="index"
194 :label="item.sqrmc" 194 :label="item.sqrmc"
195 :value="item.zjh"> 195 :value="item.sxh">
196 </el-option> 196 </el-option>
197 </el-select> 197 </el-select>
198 </el-form-item> 198 </el-form-item>
...@@ -264,18 +264,26 @@ ...@@ -264,18 +264,26 @@
264 formdata.append("djlx", this.propsParam.djlx); 264 formdata.append("djlx", this.propsParam.djlx);
265 formdata.append("isEdit", this.viewEdit); 265 formdata.append("isEdit", this.viewEdit);
266 Init(formdata).then((res) => { 266 Init(formdata).then((res) => {
267 this.loading = false 267 setTimeout(() => {
268 this.$nextTick(() => { 268 that.loading = false
269 }, 200)
270 if (res.code === 200) {
269 that.ruleForm = res.result; 271 that.ruleForm = res.result;
270 that.isShow = true; 272 that.czrOptions = that.ruleForm.qlrList;
271 this.czrOptions = this.ruleForm.qlrList; 273 that.ruleForm.qlrList.forEach((item) => {
272 this.ruleForm.qlrList.forEach((item) => {
273 if (item.sfczr == 1) { 274 if (item.sfczr == 1) {
274 this.czr = item.zjh 275 that.czr = item.sxh
275 console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
276 } 276 }
277 }) 277 })
278 }) 278 that.isSave = that.viewEdit
279 } else {
280 that.isSave = false
281 that.$confirm(res.message, '提示', {
282 cancelButtonText: '取消',
283 showConfirmButton: false,
284 type: 'warning'
285 })
286 }
279 }).catch(() => { 287 }).catch(() => {
280 this.loading = false 288 this.loading = false
281 }) 289 })
...@@ -294,6 +302,7 @@ ...@@ -294,6 +302,7 @@
294 }, 302 },
295 data () { 303 data () {
296 return { 304 return {
305 isSave: true,
297 // 键名转换,方法默认是label和children进行树状渲染 306 // 键名转换,方法默认是label和children进行树状渲染
298 normalizer (node) { 307 normalizer (node) {
299 //方法 308 //方法
...@@ -311,7 +320,6 @@ ...@@ -311,7 +320,6 @@
311 viewEdit: true, 320 viewEdit: true,
312 czr: "", 321 czr: "",
313 key: 0, 322 key: 0,
314 isShow: false,
315 disabled: true, 323 disabled: true,
316 czrOptions: [], 324 czrOptions: [],
317 ruleForm: {}, 325 ruleForm: {},
...@@ -342,7 +350,7 @@ ...@@ -342,7 +350,7 @@
342 this.key++; 350 this.key++;
343 this.num = 0 351 this.num = 0
344 this.ruleForm.qlrList.forEach(item => { 352 this.ruleForm.qlrList.forEach(item => {
345 if (item.zjh == this.czr) { 353 if (item.sxh == this.czr) {
346 this.num++ 354 this.num++
347 } 355 }
348 }) 356 })
...@@ -428,7 +436,7 @@ ...@@ -428,7 +436,7 @@
428 return false; 436 return false;
429 } 437 }
430 this.ruleForm.qlrList.forEach((item, index) => { 438 this.ruleForm.qlrList.forEach((item, index) => {
431 if (item.zjh == that.czr) { 439 if (item.sxh == that.czr) {
432 item.sfczr = "1"; 440 item.sfczr = "1";
433 } else { 441 } else {
434 item.sfczr = "0"; 442 item.sfczr = "0";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 15:30:04 4 * @LastEditTime: 2023-09-19 17:02:47
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
9 <el-form 9 <el-form
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 class="loadingtext" 12 v-Loading="loading"
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="120px"> 16 label-width="120px">
17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 17 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block"> 18 <div class="slxx_title title-block">
19 申请业务信息 19 申请业务信息
20 <div class="triangle"></div> 20 <div class="triangle"></div>
...@@ -85,8 +85,6 @@ ...@@ -85,8 +85,6 @@
85 <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> 85 <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
86 </el-form-item> 86 </el-form-item>
87 </el-col> 87 </el-col>
88 </el-row>
89 <el-row :gutter="10">
90 <el-col :span="8"> 88 <el-col :span="8">
91 <el-form-item label="农用地面积:"> 89 <el-form-item label="农用地面积:">
92 <div class="flex"> 90 <div class="flex">
...@@ -109,6 +107,8 @@ ...@@ -109,6 +107,8 @@
109 </div> 107 </div>
110 </el-form-item> 108 </el-form-item>
111 </el-col> 109 </el-col>
110 </el-row>
111 <el-row :gutter="10">
112 <el-col :span="8"> 112 <el-col :span="8">
113 <el-form-item label="耕地面积:"> 113 <el-form-item label="耕地面积:">
114 <div class="flex"> 114 <div class="flex">
...@@ -153,8 +153,6 @@ ...@@ -153,8 +153,6 @@
153 </div> 153 </div>
154 </el-form-item> 154 </el-form-item>
155 </el-col> 155 </el-col>
156 </el-row>
157 <el-row :gutter="10">
158 <el-col :span="8"> 156 <el-col :span="8">
159 <el-form-item label="草地面积:"> 157 <el-form-item label="草地面积:">
160 <div class="flex"> 158 <div class="flex">
...@@ -177,6 +175,8 @@ ...@@ -177,6 +175,8 @@
177 </div> 175 </div>
178 </el-form-item> 176 </el-form-item>
179 </el-col> 177 </el-col>
178 </el-row>
179 <el-row :gutter="10">
180 <el-col :span="8"> 180 <el-col :span="8">
181 <el-form-item label="其他农用地面积:"> 181 <el-form-item label="其他农用地面积:">
182 <div class="flex"> 182 <div class="flex">
...@@ -221,8 +221,6 @@ ...@@ -221,8 +221,6 @@
221 </div> 221 </div>
222 </el-form-item> 222 </el-form-item>
223 </el-col> 223 </el-col>
224 </el-row>
225 <el-row :gutter="10">
226 <el-col :span="8"> 224 <el-col :span="8">
227 <el-form-item label="未利用地面积:"> 225 <el-form-item label="未利用地面积:">
228 <div class="flex"> 226 <div class="flex">
...@@ -292,9 +290,9 @@ ...@@ -292,9 +290,9 @@
292 :disabled="!viewEdit"> 290 :disabled="!viewEdit">
293 <el-option 291 <el-option
294 v-for="item in czrOptions" 292 v-for="item in czrOptions"
295 :key="item.zjh" 293 :key="item.sxh"
296 :label="item.sqrmc" 294 :label="item.sqrmc"
297 :value="item.zjh"> 295 :value="item.sxh">
298 </el-option> 296 </el-option>
299 </el-select> 297 </el-select>
300 </el-form-item> 298 </el-form-item>
...@@ -362,31 +360,42 @@ ...@@ -362,31 +360,42 @@
362 this.propsParam = this.$attrs; 360 this.propsParam = this.$attrs;
363 var formdata = new FormData(); 361 var formdata = new FormData();
364 let that = this; 362 let that = this;
365 this.$startLoading(); 363 this.loading = true
366 formdata.append("bsmSldy", this.propsParam.bsmSldy); 364 formdata.append("bsmSldy", this.propsParam.bsmSldy);
367 formdata.append("djlx", this.propsParam.djlx); 365 formdata.append("djlx", this.propsParam.djlx);
368 formdata.append("isEdit", this.viewEdit); 366 formdata.append("isEdit", this.viewEdit);
369 Init(formdata).then((res) => { 367 Init(formdata).then((res) => {
370 this.$nextTick(() => { 368 setTimeout(() => {
369 this.loading = false
370 }, 200)
371 if (res.code === 200) {
371 that.ruleForm = res.result; 372 that.ruleForm = res.result;
372 this.czrOptions = this.ruleForm.qlrList; 373 that.czrOptions = that.ruleForm.qlrList;
373 that.$endLoading(); 374 that.ruleForm.qlrList.forEach((item) => {
374 that.isShow = true; 375 if (item.sfczr == '1') {
375 this.czrOptions = this.ruleForm.qlrList; 376 that.czr = item.sxh
376 this.ruleForm.qlrList.forEach((item) => {
377 if (item.sfczr == 1) {
378 this.czr = item.zjh
379 } 377 }
380 }); 378 })
381 }); 379 this.isSave = this.viewEdit
382 }); 380 } else {
381 this.isSave = false
382 this.$confirm(res.message, '提示', {
383 cancelButtonText: '取消',
384 showConfirmButton: false,
385 type: 'warning'
386 })
387 }
388 }).catch(() => {
389 this.loading = false
390 })
383 }, 391 },
384
385 computed: { 392 computed: {
386 ...mapGetters(["dictData", "flag"]), 393 ...mapGetters(["dictData", "flag"]),
387 }, 394 },
388 data () { 395 data () {
389 return { 396 return {
397 isSave: true,
398 loading: false,
390 // 键名转换,方法默认是label和children进行树状渲染 399 // 键名转换,方法默认是label和children进行树状渲染
391 normalizer (node) { 400 normalizer (node) {
392 //方法 401 //方法
...@@ -412,7 +421,6 @@ ...@@ -412,7 +421,6 @@
412 //表单是否可操作 421 //表单是否可操作
413 viewEdit: true, 422 viewEdit: true,
414 key: 0, 423 key: 0,
415 isShow: false,
416 disabled: true, 424 disabled: true,
417 czrOptions: [], 425 czrOptions: [],
418 czr: "", 426 czr: "",
...@@ -442,7 +450,7 @@ ...@@ -442,7 +450,7 @@
442 this.czrOptions = this.ruleForm.qlrList; 450 this.czrOptions = this.ruleForm.qlrList;
443 this.num = 0 451 this.num = 0
444 this.ruleForm.qlrList.forEach(item => { 452 this.ruleForm.qlrList.forEach(item => {
445 if (item.zjh == this.czr) { 453 if (item.sxh == this.czr) {
446 this.num++ 454 this.num++
447 } 455 }
448 }) 456 })
...@@ -450,7 +458,6 @@ ...@@ -450,7 +458,6 @@
450 this.czr = '' 458 this.czr = ''
451 } 459 }
452 }, 460 },
453 // 更新义务人信息
454 /** 461 /**
455 * @description: 更新义务人信息 462 * @description: 更新义务人信息
456 * @param {*} val 463 * @param {*} val
...@@ -460,7 +467,6 @@ ...@@ -460,7 +467,6 @@
460 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)); 467 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
461 this.key++; 468 this.key++;
462 }, 469 },
463 // 是否持证人变化
464 /** 470 /**
465 * @description: 是否持证人变化 471 * @description: 是否持证人变化
466 * @param {*} val 472 * @param {*} val
...@@ -518,23 +524,23 @@ ...@@ -518,23 +524,23 @@
518 //是 524 //是
519 this.ruleForm.qlrList.forEach((item, index) => { 525 this.ruleForm.qlrList.forEach((item, index) => {
520 item.sfczr = "1"; 526 item.sfczr = "1";
521 }); 527 })
522 } else { 528 } else {
523 if (!that.czr) { 529 if (!that.czr) {
524 that.$message({ 530 that.$message({
525 showClose: true, 531 showClose: true,
526 message: "请选择持证人", 532 message: "请选择持证人",
527 type: "error", 533 type: "error"
528 }); 534 })
529 return false; 535 return false
530 } 536 }
531 this.ruleForm.qlrList.forEach((item, index) => { 537 this.ruleForm.qlrList.forEach((item, index) => {
532 if (item.zjh == that.czr) { 538 if (item.sxh == that.czr) {
533 item.sfczr = "1"; 539 item.sfczr = "1"
534 } else { 540 } else {
535 item.sfczr = "0"; 541 item.sfczr = "0"
536 } 542 }
537 }); 543 })
538 } 544 }
539 } 545 }
540 /** 546 /**
......