a7720248 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 05d0e51e b253feff
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-14 11:23:50 4 * @LastEditTime: 2023-08-14 13:12:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -117,14 +117,6 @@ ...@@ -117,14 +117,6 @@
117 </el-radio-group> 117 </el-radio-group>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 <!-- <el-col :span="5">
121 <el-form-item label="发证方式:">
122 <el-radio-group v-model="ruleForm.slsq.fzfs" :disabled="!ableOperation">
123 <el-radio label="1">小证</el-radio>
124 <el-radio label="2">大证</el-radio>
125 </el-radio-group>
126 </el-form-item>
127 </el-col> -->
128 <el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'"> 120 <el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'">
129 <el-form-item label="是否分别持证:"> 121 <el-form-item label="是否分别持证:">
130 <el-radio-group 122 <el-radio-group
...@@ -210,8 +202,12 @@ ...@@ -210,8 +202,12 @@
210 ...res.result, 202 ...res.result,
211 ...res.result.qlxxdatas, 203 ...res.result.qlxxdatas,
212 } 204 }
213 //初始化发证方式,1:小证,2:大正 205 this.ruleForm.qlrList.forEach((item, index) => {
214 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs; 206 if (item.sfczr == 1) {
207 this.$set(this.ruleForm, "czr", item.zjh)
208 }
209 })
210 this.czrOptions = this.ruleForm.qlrList;
215 } 211 }
216 }); 212 });
217 }, 213 },
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 10:56:46 4 * @LastEditTime: 2023-08-14 12:57:21
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -276,12 +276,13 @@ ...@@ -276,12 +276,13 @@
276 }) 276 })
277 //初始化发证方式,1:小证,2:大正 277 //初始化发证方式,1:小证,2:大正
278 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs; 278 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
279 this.czrOptions = this.ruleForm.qlrList;
279 } 280 }
280 }); 281 })
281 }, 282 },
282 components: { qlrCommonTable, tdytTable }, 283 components: { qlrCommonTable, tdytTable },
283 computed: { 284 computed: {
284 ...mapGetters(["dictData", "flag"]), 285 ...mapGetters(["dictData", "flag"])
285 }, 286 },
286 data () { 287 data () {
287 return { 288 return {
...@@ -325,7 +326,6 @@ ...@@ -325,7 +326,6 @@
325 */ 326 */
326 upDateTdytxxList (val) { 327 upDateTdytxxList (val) {
327 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 328 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
328
329 this.key++; 329 this.key++;
330 }, 330 },
331 331
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 12:48:45 4 * @LastEditTime: 2023-08-14 13:12:36
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -282,8 +282,7 @@ ...@@ -282,8 +282,7 @@
282 this.$set(this.ruleForm, "czr", item.zjh) 282 this.$set(this.ruleForm, "czr", item.zjh)
283 } 283 }
284 }) 284 })
285 //初始化发证方式,1:小证,2:大正 285 this.czrOptions = this.ruleForm.qlrList;
286 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
287 } 286 }
288 }); 287 });
289 }, 288 },
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 10:54:26 4 * @LastEditTime: 2023-08-14 12:58:35
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
182 BatchInit(formdata).then((res) => { 182 BatchInit(formdata).then((res) => {
183 if (res.code == 200) { 183 if (res.code == 200) {
184 this.ruleForm = res.result; 184 this.ruleForm = res.result;
185 this.czrOptions = this.ruleForm.qlrList;
185 this.splicingFdcq2Info(); 186 this.splicingFdcq2Info();
186 } 187 }
187 }) 188 })
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-04 15:45:47 4 * @LastEditTime: 2023-08-14 13:03:32
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 </el-form-item> 163 </el-form-item>
164 </el-col> 164 </el-col>
165 </el-row> 165 </el-row>
166 <qlrCommonTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" /> 166 <qlrCommonTable :tableData="ruleForm.qlrList" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" />
167 <div class="slxx_title title-block"> 167 <div class="slxx_title title-block">
168 登记原因 168 登记原因
169 <div class="triangle"></div> 169 <div class="triangle"></div>
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
206 ...res.result.qlxxdatas, 206 ...res.result.qlxxdatas,
207 ...res.result.jsydsyqdatas, 207 ...res.result.jsydsyqdatas,
208 }; 208 };
209 this.czrOptions = this.ruleForm.qlrList;
209 } 210 }
210 }); 211 });
211 }, 212 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 10:27:43 4 * @LastEditTime: 2023-08-14 13:04:38
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -270,7 +270,6 @@ ...@@ -270,7 +270,6 @@
270 */ 270 */
271 upDateTdytxxList (val) { 271 upDateTdytxxList (val) {
272 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 272 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
273 this.czrOptions = this.ruleForm.qlrList;
274 this.key++; 273 this.key++;
275 }, 274 },
276 /** 275 /**
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-08-14 10:28:15 5 * @LastEditTime: 2023-08-14 12:54:53
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
237 this.$set(this.ruleForm, "czr", item.zjh) 237 this.$set(this.ruleForm, "czr", item.zjh)
238 } 238 }
239 }) 239 })
240 this.czrOptions = this.ruleForm.qlrList;
240 } 241 }
241 this.$endLoading(); 242 this.$endLoading();
242 }); 243 });
......
...@@ -263,12 +263,14 @@ ...@@ -263,12 +263,14 @@
263 ...res.result, 263 ...res.result,
264 ...res.result.qlxxdatas, 264 ...res.result.qlxxdatas,
265 }; 265 };
266 //初始化发证方式,1:小证,2:大正 266 this.ruleForm.qlrList.forEach((item, index) => {
267 this.ruleForm.slsq.fzfs == null 267 if (item.sfczr == 1) {
268 ? (this.ruleForm.slsq.fzfs = "1") 268 this.$set(this.ruleForm, "czr", item.zjh)
269 : this.ruleForm.slsq.fzfs;
270 } 269 }
271 }); 270 })
271 this.czrOptions = this.ruleForm.qlrList;
272 }
273 })
272 }, 274 },
273 components: { qlrCommonTable, tdytTable }, 275 components: { qlrCommonTable, tdytTable },
274 computed: { 276 computed: {
...@@ -314,7 +316,6 @@ ...@@ -314,7 +316,6 @@
314 upDateTdytxxList (val) { 316 upDateTdytxxList (val) {
315 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 317 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
316 }, 318 },
317 // 更新权利人信息
318 /** 319 /**
319 * @description: 更新权利人信息 320 * @description: 更新权利人信息
320 * @param {*} val 321 * @param {*} val
...@@ -325,9 +326,8 @@ ...@@ -325,9 +326,8 @@
325 this.czrOptions = this.ruleForm.qlrList; 326 this.czrOptions = this.ruleForm.qlrList;
326 this.key++; 327 this.key++;
327 }, 328 },
328 // 更新权利人信息
329 /** 329 /**
330 * @description: 更新权利人信息 330 * @description: 更新业务人信息
331 * @param {*} val 331 * @param {*} val
332 * @author: renchao 332 * @author: renchao
333 */ 333 */
......
...@@ -263,12 +263,8 @@ ...@@ -263,12 +263,8 @@
263 this.ruleForm.czr = item.zjh 263 this.ruleForm.czr = item.zjh
264 } 264 }
265 }) 265 })
266 this.czrOptions = this.ruleForm.qlrList;
266 this.$endLoading(); 267 this.$endLoading();
267 if (res.code === 200) {
268 }
269 else {
270 this.$alert(res.message, '提示');
271 }
272 }) 268 })
273 }, 269 },
274 components: { qlrCommonTable, JtcyTable }, 270 components: { qlrCommonTable, JtcyTable },
......
...@@ -268,12 +268,9 @@ ...@@ -268,12 +268,9 @@
268 this.ruleForm.czr = item.zjh 268 this.ruleForm.czr = item.zjh
269 } 269 }
270 }) 270 })
271 this.czrOptions = this.ruleForm.qlrList;
271 this.$endLoading(); 272 this.$endLoading();
272 if (res.code === 200) { 273
273 }
274 else {
275 this.$alert(res.message, '提示');
276 }
277 }) 274 })
278 }, 275 },
279 components: { qlrCommonTable, JtcyTable }, 276 components: { qlrCommonTable, JtcyTable },
...@@ -315,7 +312,6 @@ ...@@ -315,7 +312,6 @@
315 } 312 }
316 }); 313 });
317 }, 314 },
318 //权利人更新
319 /** 315 /**
320 * @description: 权利人更新 316 * @description: 权利人更新
321 * @param {*} val 317 * @param {*} val
...@@ -325,7 +321,6 @@ ...@@ -325,7 +321,6 @@
325 this.ruleForm.qlrList = _.cloneDeep(val) 321 this.ruleForm.qlrList = _.cloneDeep(val)
326 this.czrOptions = this.ruleForm.qlrList; 322 this.czrOptions = this.ruleForm.qlrList;
327 }, 323 },
328 // 更新义务人信息
329 /** 324 /**
330 * @description: 更新义务人信息 325 * @description: 更新义务人信息
331 * @param {*} val 326 * @param {*} val
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-04 16:47:29 4 * @LastEditTime: 2023-08-14 13:10:18
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -363,9 +363,9 @@ ...@@ -363,9 +363,9 @@
363 this.$set(this.ruleForm, "czr", item.zjh) 363 this.$set(this.ruleForm, "czr", item.zjh)
364 } 364 }
365 }) 365 })
366 this.czrOptions = this.ruleForm.qlrList;
366 that.$endLoading(); 367 that.$endLoading();
367 that.isShow = true; 368 that.isShow = true;
368 this.czrOptions = this.ruleForm.qlrList;
369 }); 369 });
370 }); 370 });
371 }, 371 },
...@@ -408,7 +408,6 @@ ...@@ -408,7 +408,6 @@
408 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 408 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
409 this.key++; 409 this.key++;
410 }, 410 },
411 // 更新权利人信息
412 /** 411 /**
413 * @description: 更新权利人信息 412 * @description: 更新权利人信息
414 * @param {*} val 413 * @param {*} val
......
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
234 this.$set(this.ruleForm, "czr", item.zjh) 234 this.$set(this.ruleForm, "czr", item.zjh)
235 } 235 }
236 }) 236 })
237 this.czrOptions = this.ruleForm.qlrList;
237 this.$endLoading(); 238 this.$endLoading();
238 } 239 }
239 }) 240 })
...@@ -262,7 +263,6 @@ ...@@ -262,7 +263,6 @@
262 }; 263 };
263 }, 264 },
264 methods: { 265 methods: {
265 // 更新权利人信息
266 /** 266 /**
267 * @description: 更新权利人信息 267 * @description: 更新权利人信息
268 * @param {*} val 268 * @param {*} val
...@@ -272,9 +272,8 @@ ...@@ -272,9 +272,8 @@
272 this.ruleForm.qlrList = _.cloneDeep(val); 272 this.ruleForm.qlrList = _.cloneDeep(val);
273 this.czrOptions = this.ruleForm.qlrList 273 this.czrOptions = this.ruleForm.qlrList
274 }, 274 },
275 // 更新权利人信息
276 /** 275 /**
277 * @description: 更新权利人信息 276 * @description: 更新业务人信息
278 * @param {*} val 277 * @param {*} val
279 * @author: renchao 278 * @author: renchao
280 */ 279 */
......
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
203 this.$set(this.ruleForm, "czr", item.zjh) 203 this.$set(this.ruleForm, "czr", item.zjh)
204 } 204 }
205 }) 205 })
206 this.czrOptions = this.ruleForm.qlrList;
206 } 207 }
207 }); 208 });
208 }, 209 },
...@@ -247,7 +248,7 @@ ...@@ -247,7 +248,7 @@
247 this.czrOptions = this.ruleForm.qlrList; 248 this.czrOptions = this.ruleForm.qlrList;
248 }, 249 },
249 /** 250 /**
250 * @description: 更新权利人信息 251 * @description: 更新业务人信息
251 * @param {*} val 252 * @param {*} val
252 * @author: renchao 253 * @author: renchao
253 */ 254 */
......
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
265 this.$set(this.ruleForm, "czr", item.zjh) 265 this.$set(this.ruleForm, "czr", item.zjh)
266 } 266 }
267 }) 267 })
268 this.czrOptions = this.ruleForm.qlrList;
268 setTimeout(() => { 269 setTimeout(() => {
269 that.loading = false 270 that.loading = false
270 }, 300) 271 }, 300)
......
...@@ -222,9 +222,8 @@ ...@@ -222,9 +222,8 @@
222 bacthInit(formdata).then((res) => { 222 bacthInit(formdata).then((res) => {
223 this.$endLoading(); 223 this.$endLoading();
224 if (res.code === 200 && res.result) { 224 if (res.code === 200 && res.result) {
225 this.$nextTick(() => {
226 this.ruleForm = res.result; 225 this.ruleForm = res.result;
227 }) 226 this.czrOptions = this.ruleForm.qlrList;
228 } else { 227 } else {
229 this.$message.error(res.message); 228 this.$message.error(res.message);
230 } 229 }
......
...@@ -279,8 +279,8 @@ ...@@ -279,8 +279,8 @@
279 this.$set(this.ruleForm, "czr", item.zjh) 279 this.$set(this.ruleForm, "czr", item.zjh)
280 } 280 }
281 }) 281 })
282 this.czrOptions = this.ruleForm.qlrList;
282 this.$endLoading(); 283 this.$endLoading();
283 //this.ruleForm.diyaq.sfczjzhxz = "0";
284 } 284 }
285 }) 285 })
286 }, 286 },
......