94d06166 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 4c66e08c 1ed17785
...@@ -17,23 +17,8 @@ export function BatchInit (data) { ...@@ -17,23 +17,8 @@ export function BatchInit (data) {
17 case "100": 17 case "100":
18 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/fristBatchInit"; 18 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/fristBatchInit";
19 break; 19 break;
20 case "200":
21 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/transferInit";
22 break;
23 case "300":
24 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/changeInit";
25 break;
26 case "400": 20 case "400":
27 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchSave"; 21 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchInit";
28 break;
29 case "500":
30 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/riviseInit";
31 break;
32 case "901":
33 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/renewalInit";
34 break;
35 case "902":
36 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/replaceInit";
37 break; 22 break;
38 } 23 }
39 return request({ 24 return request({
...@@ -47,7 +32,7 @@ export function BatchInit (data) { ...@@ -47,7 +32,7 @@ export function BatchInit (data) {
47 * @param {*} data 32 * @param {*} data
48 * @author: renchao 33 * @author: renchao
49 */ 34 */
50 export function Init (data) { 35 export function Init(data) {
51 let apiUrl = ""; 36 let apiUrl = "";
52 switch (data.get("djlx")) { 37 switch (data.get("djlx")) {
53 case "100": 38 case "100":
...@@ -83,9 +68,13 @@ export function Init (data) { ...@@ -83,9 +68,13 @@ export function Init (data) {
83 * @param {*} data 68 * @param {*} data
84 * @author: renchao 69 * @author: renchao
85 */ 70 */
86 export function saveBatchData (data) { 71 export function saveBatchData(data) {
72 let path = "/rest/ywbl/fdcq2lr/fristBatchSave";
73 if (data.slsq.djywbm.includes("400")) {
74 path = "/rest/ywbl/fdcq2lr/logoutBatchSave";
75 }
87 return request({ 76 return request({
88 url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveBatchData", 77 url: SERVER.SERVERAPI + path,
89 method: 'post', 78 method: 'post',
90 data 79 data
91 }) 80 })
...@@ -96,7 +85,7 @@ export function saveBatchData (data) { ...@@ -96,7 +85,7 @@ export function saveBatchData (data) {
96 * @param {*} data 85 * @param {*} data
97 * @author: renchao 86 * @author: renchao
98 */ 87 */
99 export function saveData (data) { 88 export function saveData(data) {
100 return request({ 89 return request({
101 url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveData", 90 url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveData",
102 method: 'post', 91 method: 'post',
......
...@@ -54,12 +54,16 @@ ...@@ -54,12 +54,16 @@
54 label: "权利类型" 54 label: "权利类型"
55 }, 55 },
56 { 56 {
57 prop: "bdcqzh",
58 label: "不动产权证号"
59 },
60 {
57 prop: "qlrmc", 61 prop: "qlrmc",
58 label: "被执行人" 62 label: "权利人"
59 }, 63 },
60 { 64 {
61 prop: "bdcqzh", 65 prop: "qlrzjhm",
62 label: "不动产权证号" 66 label: "证件号码"
63 }, 67 },
64 { 68 {
65 prop: "bdcdyh", 69 prop: "bdcdyh",
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-22 17:08:30 4 * @LastEditTime: 2024-01-24 09:30:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -56,78 +56,10 @@ ...@@ -56,78 +56,10 @@
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 </el-row> 58 </el-row>
59 <div class="slxx_title title-block"> 59 <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
60 房屋批量情况 60 <el-row>
61 <div class="triangle"></div> 61 <el-col :span="19">
62 </div> 62 <p>房屋信息列表</p>
63 <el-row :gutter="10" v-if="ruleForm.zdjbxx">
64 <el-col :span="8">
65 <el-form-item label="宗地面积:">
66 <div class="flex">
67 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
68 <el-select
69 disabled
70 v-model="ruleForm.zdjbxx.mjdw"
71 style="width: 68px">
72 <el-option
73 v-for="item in dictData['A7']"
74 :key="item.dcode"
75 :label="item.dname"
76 :value="item.dcode"></el-option>
77 </el-select>
78 </div>
79 </el-form-item>
80 </el-col>
81 <el-col :span="8">
82 <el-form-item label="土地性质:">
83 <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
84 </el-form-item>
85 </el-col>
86 <el-col :span="8">
87 <el-form-item label="土地用途:">
88 <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
89 </el-form-item>
90 </el-col>
91 </el-row>
92 <el-row :gutter="10" v-if="ruleForm.zdjbxx">
93 <el-col :span="8">
94 <el-form-item label="房屋性质:">
95 <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
96 </el-form-item>
97 </el-col>
98 <el-col :span="8">
99 <el-form-item label="房屋用途:">
100 <el-input disabled v-model="splicingFdcq2.fwxz"></el-input>
101 </el-form-item>
102 </el-col>
103 <el-col :span="8">
104 <el-form-item label="房屋结构:">
105 <el-input disabled v-model="splicingFdcq2.fwjg"></el-input>
106 </el-form-item>
107 </el-col>
108 </el-row>
109 <el-row :gutter="10" v-if="ruleForm.zdjbxx">
110 <el-col :span="8">
111 <el-form-item label="房屋总层数:">
112 <el-input disabled v-model="ruleForm.fdcq2List[0].zcs"></el-input>
113 </el-form-item>
114 </el-col>
115 <el-col :span="8">
116 <el-form-item label="房屋总建筑面积:">
117 <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
118 </el-form-item>
119 </el-col>
120 <el-col :span="8">
121 <el-form-item label="房屋总套数:">
122 <el-input disabled v-model="splicingFdcq2.zts"></el-input>
123 </el-form-item>
124 </el-col>
125 </el-row>
126 <el-row :gutter="10" v-if="ruleForm.slsq">
127 <el-col :span="8">
128 <el-form-item label="竣工时间:">
129 <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
130 </el-form-item>
131 </el-col> 63 </el-col>
132 <el-col :span="5"> 64 <el-col :span="5">
133 <el-form-item label="发证方式:" :disabled="!viewEdit"> 65 <el-form-item label="发证方式:" :disabled="!viewEdit">
...@@ -137,12 +69,15 @@ ...@@ -137,12 +69,15 @@
137 </el-radio-group> 69 </el-radio-group>
138 </el-form-item> 70 </el-form-item>
139 </el-col> 71 </el-col>
72 <!-- <div class="triangle"></div> -->
140 </el-row> 73 </el-row>
141 <div class="slxx_title title-block"> 74 </div>
75 <cfBdcdyTable :tableData="ruleForm.qlxxList" />
76 <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
142 权利人信息 77 权利人信息
143 <div class="triangle"></div> 78 <div class="triangle"></div>
144 </div> 79 </div>
145 <el-row :gutter="10"> 80 <el-row :gutter="10" v-if="ruleForm.slsq.djywbm.includes('100')">
146 <el-col :span="12" v-if="ruleForm.sldyList.length > 0"> 81 <el-col :span="12" v-if="ruleForm.sldyList.length > 0">
147 <el-form-item label="共有方式:"> 82 <el-form-item label="共有方式:">
148 <el-radio-group 83 <el-radio-group
...@@ -191,7 +126,7 @@ ...@@ -191,7 +126,7 @@
191 :disabled="viewEdit" 126 :disabled="viewEdit"
192 @upDateQlrxxList="upDateQlrxxList" 127 @upDateQlrxxList="upDateQlrxxList"
193 :tableData="ruleForm.qlrList" 128 :tableData="ruleForm.qlrList"
194 :gyfs="ruleForm.sldyList[0].gyfs" /> 129 :gyfs="ruleForm.sldyList[0].gyfs" v-if="ruleForm.slsq.djywbm.includes('100')" />
195 <div class="slxx_title title-block"> 130 <div class="slxx_title title-block">
196 登记原因 131 登记原因
197 <div class="triangle"></div> 132 <div class="triangle"></div>
...@@ -221,6 +156,7 @@ ...@@ -221,6 +156,7 @@
221 </template> 156 </template>
222 <script> 157 <script>
223 import ywmix from "@/views/ywbl/mixin/index"; 158 import ywmix from "@/views/ywbl/mixin/index";
159 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
224 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 160 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
225 import { 161 import {
226 BatchInit, 162 BatchInit,
...@@ -234,7 +170,7 @@ ...@@ -234,7 +170,7 @@
234 computed: { 170 computed: {
235 ...mapGetters(["dictData", "flag"]) 171 ...mapGetters(["dictData", "flag"])
236 }, 172 },
237 components: { qlrCommonTable }, 173 components: { qlrCommonTable, cfBdcdyTable },
238 data () { 174 data () {
239 return { 175 return {
240 isSave: true, 176 isSave: true,
...@@ -265,14 +201,6 @@ ...@@ -265,14 +201,6 @@
265 rules: {}, 201 rules: {},
266 gyfs: "", 202 gyfs: "",
267 bsmSlsq: this.$route.query.bsmSlsq, //受理申请标识码 203 bsmSlsq: this.$route.query.bsmSlsq, //受理申请标识码
268 splicingFdcq2: {
269 //前端根据后台数组组装展示内容
270 tdxz: "", //土地性质
271 fwxz: "", //房屋性质
272 fwjg: "", //房屋结构
273 jzmj: "", //建筑面积
274 zts: "", //房屋总套数
275 },
276 }; 204 };
277 }, 205 },
278 mounted (callbackfn, thisArg) { 206 mounted (callbackfn, thisArg) {
...@@ -300,7 +228,7 @@ ...@@ -300,7 +228,7 @@
300 } 228 }
301 }) 229 })
302 that.isSave = this.viewEdit 230 that.isSave = this.viewEdit
303 this.splicingFdcq2Info(); 231
304 } else { 232 } else {
305 that.isSave = false 233 that.isSave = false
306 that.$confirm(res.message, '提示', { 234 that.$confirm(res.message, '提示', {
...@@ -315,29 +243,6 @@ ...@@ -315,29 +243,6 @@
315 }, 243 },
316 methods: { 244 methods: {
317 /** 245 /**
318 * @description: 组装房地产权通用信息
319 * @author: renchao
320 */
321 splicingFdcq2Info () {
322 let fdcq2List = this.ruleForm.fdcq2List;
323 let fwxzArr = [];
324 let fwjgArr = [];
325 let jzmj = 0;
326 fdcq2List.forEach((fdcq2) => {
327 fwxzArr.push(fdcq2.fwxzmc);
328 fwjgArr.push(fdcq2.fwjgmc);
329 jzmj += parseFloat(fdcq2.jzmj);
330 });
331 //房屋性质
332 let fwxz = Array.from(new Set(fwxzArr)).join(",");
333 //房屋结构
334 let fwjg = Array.from(new Set(fwjgArr)).join(",");
335 this.splicingFdcq2.fwxz = fwxz;
336 this.splicingFdcq2.fwjg = fwjg;
337 this.splicingFdcq2.jzmj = jzmj == null ? 0 : jzmj;
338 this.splicingFdcq2.zts = fdcq2List.length;
339 },
340 /**
341 * @description: 更新权利人信息 246 * @description: 更新权利人信息
342 * @param {*} val 247 * @param {*} val
343 * @author: renchao 248 * @author: renchao
......