Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2cc94fa0 by renchao@pashanhoo.com
Options

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

2 parents 77a91b9e f98a06e1
Expand all
Inline Side-by-side
Showing 22 changed files with 392 additions and 344 deletions
...@@ -205,3 +205,16 @@ export function getNydsyqList (data) { ...@@ -205,3 +205,16 @@ export function getNydsyqList (data) {
205 data 205 data
206 }) 206 })
207 } 207 }
208
209 /**
210 * @description: 获取当前权力信息和上手权力信息
211 * @param {*} data
212 * @author: renchao
213 */
214
215 export function getDjbQlxxDiff (data) {
216 return request({
217 url: SERVER.SERVERAPI + '/rest/djbDetail/getDjbQlxxDiff?bsmQlxx=' + data,
218 method: 'post',
219 })
220 }
......
...@@ -417,7 +417,7 @@ aside { ...@@ -417,7 +417,7 @@ aside {
417 height: 0; 417 height: 0;
418 border-width: 0px 0px 55px 55px; 418 border-width: 0px 0px 55px 55px;
419 border-style: none solid solid; 419 border-style: none solid solid;
420 border-color: transparent transparent #fe9400; 420 border-color: transparent transparent #ff5100;
421 position: absolute; 421 position: absolute;
422 top: 0; 422 top: 0;
423 right: 0; 423 right: 0;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 此环节为流程最后环节，转出后流程将结束 20 此环节为流程最后环节，转出后流程将结束
21 </el-form-item> 21 </el-form-item>
22 </el-form> 22 </el-form>
23 <div v-if="this.formData.showidea">
23 <div class="invalid-reson">审批意见：</div> 24 <div class="invalid-reson">审批意见：</div>
24 <el-input 25 <el-input
25 class="opinion" 26 class="opinion"
...@@ -28,6 +29,8 @@ ...@@ -28,6 +29,8 @@
28 type="textarea" 29 type="textarea"
29 :rows="4" 30 :rows="4"
30 ></el-input> 31 ></el-input>
32 </div>
33
31 <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> --> 34 <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
32 <el-button style="float: right" @click="cancelBack">取消转出</el-button> 35 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
33 <el-button type="primary" @click="submitForm" style="float: right" 36 <el-button type="primary" @click="submitForm" style="float: right"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 label-width="145px" 16 label-width="145px"
17 inline-message 17 inline-message
18 :show-message="false" 18 :show-message="false"
19 :class="{readonly: editDisabled }" 19 :class="{ readonly: editDisabled }"
20 class="loadingtext" 20 class="loadingtext"
21 > 21 >
22 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 22 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </div> 47 </div>
48 <el-row :gutter="10"> 48 <el-row :gutter="10">
49 <el-col :span="8"> 49 <el-col :span="8">
50 <el-form-item label="查封不动产权信息："> 50 <el-form-item label="查封不动产权信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules">
51 <select-table 51 <select-table
52 v-model="ruleForm.ztQlxx" 52 v-model="ruleForm.ztQlxx"
53 :table-width="550" 53 :table-width="550"
...@@ -243,12 +243,26 @@ ...@@ -243,12 +243,26 @@
243 </el-col> 243 </el-col>
244 <el-col :span="8"> 244 <el-col :span="8">
245 <el-form-item label="查封起始时间："> 245 <el-form-item label="查封起始时间：">
246 <el-input v-model="ruleForm.cfdj.cfqssj"></el-input> 246 <el-date-picker
247 v-model="ruleForm.cfdj.cfqssj"
248 class="width100"
249 type="date"
250 placeholder="选择日期"
251 value-format="yyyy-MM-dd HH:mm:ss"
252 format="yyyy-MM-dd"
253 ></el-date-picker>
247 </el-form-item> 254 </el-form-item>
248 </el-col> 255 </el-col>
249 <el-col :span="8"> 256 <el-col :span="8">
250 <el-form-item label="查封结束时间："> 257 <el-form-item label="查封结束时间：">
251 <el-input v-model="ruleForm.cfdj.cfjssj"></el-input> 258 <el-date-picker
259 v-model="ruleForm.cfdj.cfjssj"
260 class="width100"
261 type="date"
262 placeholder="选择日期"
263 value-format="yyyy-MM-dd HH:mm:ss"
264 format="yyyy-MM-dd"
265 ></el-date-picker>
252 </el-form-item> 266 </el-form-item>
253 </el-col> 267 </el-col>
254 <el-col :span="8"> 268 <el-col :span="8">
...@@ -299,6 +313,7 @@ ...@@ -299,6 +313,7 @@
299 v-model="ruleForm.qlxx.djsj" 313 v-model="ruleForm.qlxx.djsj"
300 type="date" 314 type="date"
301 placeholder="选择日期" 315 placeholder="选择日期"
316 class="width100"
302 value-format="yyyy-MM-dd HH:mm:ss" 317 value-format="yyyy-MM-dd HH:mm:ss"
303 format="yyyy-MM-dd" 318 format="yyyy-MM-dd"
304 > 319 >
...@@ -339,7 +354,15 @@ ...@@ -339,7 +354,15 @@
339 </el-col> 354 </el-col>
340 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 355 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
341 <el-form-item label="解封登记时间："> 356 <el-form-item label="解封登记时间：">
342 <el-input v-model="ruleForm.cfdj.jfdjsj"></el-input> 357 <el-date-picker
358 v-model="ruleForm.cfdj.jfdjsj"
359 class="width100"
360 type="date"
361 placeholder="选择日期"
362 value-format="yyyy-MM-dd HH:mm:ss"
363 format="yyyy-MM-dd"
364 >
365 </el-date-picker>
343 </el-form-item> 366 </el-form-item>
344 </el-col> 367 </el-col>
345 </el-row> 368 </el-row>
...@@ -438,14 +461,17 @@ export default { ...@@ -438,14 +461,17 @@ export default {
438 dname: "是", 461 dname: "是",
439 }, 462 },
440 ], 463 ],
441 ableOperation:false, 464 ableOperation: false,
442 //传递参数\ 465 //传递参数\
443 466
444 ssQlxxList: [], 467 ssQlxxList: [],
445 ztQlxxList: [], 468 ztQlxxList: [],
446 rules: { 469 rules: {
470 ztQlxxrules: [
471 { required: true, message: "抵押不动产信息", trigger: "change" },
472 ],
447 bdcqzhrules: [ 473 bdcqzhrules: [
448 { required: true, message: "不动产权证号：", trigger: "blur" }, 474 { required: true, message: "不动产登记证明号", trigger: "blur" },
449 ], 475 ],
450 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }], 476 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
451 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }], 477 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
...@@ -458,7 +484,7 @@ export default { ...@@ -458,7 +484,7 @@ export default {
458 this.loadData(); 484 this.loadData();
459 }, 485 },
460 mounted() { 486 mounted() {
461 this.ableOperation=this.$parent.ableOperation 487 this.ableOperation = this.$parent.ableOperation;
462 }, 488 },
463 methods: { 489 methods: {
464 /** 490 /**
...@@ -610,13 +636,6 @@ export default { ...@@ -610,13 +636,6 @@ export default {
610 }; 636 };
611 </script> 637 </script>
612 <style scoped lang="scss"> 638 <style scoped lang="scss">
613
614 @import "~@/styles/public.scss"; 639 @import "~@/styles/public.scss";
615 @import "~@/styles/slxx/slxx.scss"; 640 @import "~@/styles/slxx/slxx.scss";
616
617
618
619
620
621 </style> 641 </style>
622
......
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
358 </el-form-item> 358 </el-form-item>
359 </el-col> 359 </el-col>
360 <el-col :span="8"> 360 <el-col :span="8">
361 <el-form-item label="是否限制转移约定"> 361 <el-form-item label="是否限制转移约定：">
362 <el-select v-model="ruleForm.diyaq.sfczjzhxz"> 362 <el-select v-model="ruleForm.diyaq.sfczjzhxz">
363 <el-option 363 <el-option
364 v-for="item in dictData['A6']" 364 v-for="item in dictData['A6']"
......
...@@ -240,7 +240,15 @@ ...@@ -240,7 +240,15 @@
240 </el-col> 240 </el-col>
241 <el-col :span="8"> 241 <el-col :span="8">
242 <el-form-item label="竣工时间："> 242 <el-form-item label="竣工时间：">
243 <el-input v-model="ruleForm.fdcq2.jgsj"></el-input> 243 <el-date-picker
244 v-model="ruleForm.fdcq2.jgsj"
245 class="width100"
246 type="date"
247 placeholder="选择日期"
248 value-format="yyyy-MM-dd HH:mm:ss"
249 format="yyyy-MM-dd"
250 >
251 </el-date-picker>
244 </el-form-item> 252 </el-form-item>
245 </el-col> 253 </el-col>
246 254
...@@ -285,6 +293,7 @@ ...@@ -285,6 +293,7 @@
285 <el-date-picker 293 <el-date-picker
286 v-model="ruleForm.qlxx.djsj" 294 v-model="ruleForm.qlxx.djsj"
287 type="date" 295 type="date"
296 class="width100"
288 placeholder="选择日期" 297 placeholder="选择日期"
289 value-format="yyyy-MM-dd HH:mm:ss" 298 value-format="yyyy-MM-dd HH:mm:ss"
290 format="yyyy-MM-dd"> 299 format="yyyy-MM-dd">
......
...@@ -194,6 +194,7 @@ ...@@ -194,6 +194,7 @@
194 <el-date-picker 194 <el-date-picker
195 v-model="ruleForm.qlxx.djsj" 195 v-model="ruleForm.qlxx.djsj"
196 type="date" 196 type="date"
197 class="width100"
197 placeholder="选择日期" 198 placeholder="选择日期"
198 value-format="yyyy-MM-dd HH:mm:ss" 199 value-format="yyyy-MM-dd HH:mm:ss"
199 format="yyyy-MM-dd" 200 format="yyyy-MM-dd"
......
...@@ -387,7 +387,6 @@ export default { ...@@ -387,7 +387,6 @@ export default {
387 dname: "历史", 387 dname: "历史",
388 }, 388 },
389 ], 389 ],
390 tdxz: null,
391 isShow: false, 390 isShow: false,
392 disabled: true, 391 disabled: true,
393 czrOptions: [], 392 czrOptions: [],
...@@ -462,11 +461,11 @@ export default { ...@@ -462,11 +461,11 @@ export default {
462 this.ssqlxxshow = false; 461 this.ssqlxxshow = false;
463 } 462 }
464 this.$endLoading(); 463 this.$endLoading();
465 if (this.ruleForm.tdytqxList.length > 0) { 464 // if (this.ruleForm.tdytqxList.length > 0) {
466 this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm; 465 // this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
467 } else { 466 // } else {
468 this.tdxz = null; 467 // this.tdxz = null;
469 } 468 // }
470 this.isShow = true; 469 this.isShow = true;
471 } 470 }
472 }); 471 });
......
...@@ -227,6 +227,7 @@ ...@@ -227,6 +227,7 @@
227 <el-date-picker 227 <el-date-picker
228 v-model="ruleForm.qlxx.djsj" 228 v-model="ruleForm.qlxx.djsj"
229 type="date" 229 type="date"
230 class="width100"
230 placeholder="选择日期" 231 placeholder="选择日期"
231 value-format="yyyy-MM-dd HH:mm:ss" 232 value-format="yyyy-MM-dd HH:mm:ss"
232 format="yyyy-MM-dd" 233 format="yyyy-MM-dd"
...@@ -249,7 +250,7 @@ ...@@ -249,7 +250,7 @@
249 </el-col> 250 </el-col>
250 251
251 <el-col :span="8"> 252 <el-col :span="8">
252 <el-form-item label="预告登记种类" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules"> 253 <el-form-item label="预告登记种类：" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
253 <el-select v-model="ruleForm.ygdj.ygdjlx"> 254 <el-select v-model="ruleForm.ygdj.ygdjlx">
254 <el-option 255 <el-option
255 v-for="item in dictData['A29']" 256 v-for="item in dictData['A29']"
...@@ -262,12 +263,12 @@ ...@@ -262,12 +263,12 @@
262 </el-form-item> 263 </el-form-item>
263 </el-col> 264 </el-col>
264 <el-col :span="8"> 265 <el-col :span="8">
265 <el-form-item label="土地使用权人"> 266 <el-form-item label="土地使用权人：">
266 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input> 267 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
267 </el-form-item> 268 </el-form-item>
268 </el-col> 269 </el-col>
269 <el-col :span="8"> 270 <el-col :span="8">
270 <el-form-item label="规划用途"> 271 <el-form-item label="规划用途：">
271 <el-select v-model="ruleForm.ygdj.ghyt"> 272 <el-select v-model="ruleForm.ygdj.ghyt">
272 <el-option 273 <el-option
273 v-for="item in dictData['A17']" 274 v-for="item in dictData['A17']"
...@@ -280,12 +281,12 @@ ...@@ -280,12 +281,12 @@
280 </el-form-item> 281 </el-form-item>
281 </el-col> 282 </el-col>
282 <el-col :span="8"> 283 <el-col :span="8">
283 <el-form-item label="用途名称"> 284 <el-form-item label="用途名称：">
284 <el-input v-model="ruleForm.ygdj.ytmc"></el-input> 285 <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
285 </el-form-item> 286 </el-form-item>
286 </el-col> 287 </el-col>
287 <el-col :span="8"> 288 <el-col :span="8">
288 <el-form-item label="房屋性质"> 289 <el-form-item label="房屋性质：">
289 <el-select v-model="ruleForm.ygdj.fwxz"> 290 <el-select v-model="ruleForm.ygdj.fwxz">
290 <el-option 291 <el-option
291 v-for="item in dictData['A19']" 292 v-for="item in dictData['A19']"
...@@ -298,12 +299,12 @@ ...@@ -298,12 +299,12 @@
298 </el-form-item> 299 </el-form-item>
299 </el-col> 300 </el-col>
300 <el-col :span="8"> 301 <el-col :span="8">
301 <el-form-item label="房屋性质名称"> 302 <el-form-item label="房屋性质名称：">
302 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input> 303 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
303 </el-form-item> 304 </el-form-item>
304 </el-col> 305 </el-col>
305 <el-col :span="8"> 306 <el-col :span="8">
306 <el-form-item label="房屋结构"> 307 <el-form-item label="房屋结构：">
307 <el-select v-model="ruleForm.ygdj.fwjg"> 308 <el-select v-model="ruleForm.ygdj.fwjg">
308 <el-option 309 <el-option
309 v-for="item in dictData['A46']" 310 v-for="item in dictData['A46']"
...@@ -316,57 +317,65 @@ ...@@ -316,57 +317,65 @@
316 </el-form-item> 317 </el-form-item>
317 </el-col> 318 </el-col>
318 <el-col :span="8"> 319 <el-col :span="8">
319 <el-form-item label="所在层"> 320 <el-form-item label="所在层：">
320 <el-input v-model="ruleForm.ygdj.szc"></el-input> 321 <el-input v-model="ruleForm.ygdj.szc"></el-input>
321 </el-form-item> 322 </el-form-item>
322 </el-col> 323 </el-col>
323 <el-col :span="8"> 324 <el-col :span="8">
324 <el-form-item label="总层数"> 325 <el-form-item label="总层数：">
325 <el-input v-model="ruleForm.ygdj.zcs"></el-input> 326 <el-input v-model="ruleForm.ygdj.zcs"></el-input>
326 </el-form-item> 327 </el-form-item>
327 </el-col> 328 </el-col>
328 <el-col :span="8"> 329 <el-col :span="8">
329 <el-form-item label="建筑面积"> 330 <el-form-item label="建筑面积：">
330 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 331 <el-input v-model="ruleForm.ygdj.jzmj"></el-input>
331 </el-form-item> 332 </el-form-item>
332 </el-col> 333 </el-col>
333 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 334 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
334 <el-form-item label="注销预告业务号"> 335 <el-form-item label="注销预告业务号：">
335 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input> 336 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
336 </el-form-item> 337 </el-form-item>
337 </el-col> 338 </el-col>
338 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 339 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
339 <el-form-item label="注销预告原因"> 340 <el-form-item label="注销预告原因：">
340 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input> 341 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
341 </el-form-item> 342 </el-form-item>
342 </el-col> 343 </el-col>
343 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 344 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
344 <el-form-item label="注销时间"> 345 <el-form-item label="注销时间：">
345 <el-input v-model="ruleForm.ygdj.zxsj"></el-input> 346 <el-date-picker
347 v-model="ruleForm.ygdj.zxsj"
348 type="date"
349 class="width100"
350 placeholder="选择日期"
351 value-format="yyyy-MM-dd HH:mm:ss"
352 format="yyyy-MM-dd"
353 >
354 </el-date-picker>
346 </el-form-item> 355 </el-form-item>
347 </el-col> 356 </el-col>
348 <el-col :span="8"> 357 <el-col :span="8">
349 <el-form-item label="取得价格/被担保主债权数额"> 358 <el-form-item label="取得价格/被担保主债权数额：">
350 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 359 <el-input v-model="ruleForm.ygdj.qdjg"></el-input>
351 </el-form-item> 360 </el-form-item>
352 </el-col> 361 </el-col>
353 <el-col :span="8"> 362 <el-col :span="8">
354 <el-form-item label="金额单位"> 363 <el-form-item label="金额单位：">
355 <el-input v-model="ruleForm.ygdj.jedw"></el-input> 364 <el-input v-model="ruleForm.ygdj.jedw"></el-input>
356 </el-form-item> 365 </el-form-item>
357 </el-col> 366 </el-col>
358 <el-col :span="8"> 367 <el-col :span="8">
359 <el-form-item label="担保范围"> 368 <el-form-item label="担保范围：">
360 <el-input v-model="ruleForm.ygdj.dbfw"></el-input> 369 <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
361 </el-form-item> 370 </el-form-item>
362 </el-col> 371 </el-col>
363 <el-col :span="8"> 372 <el-col :span="8">
364 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定"> 373 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
365 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input> 374 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
366 </el-form-item> 375 </el-form-item>
367 </el-col> 376 </el-col>
368 <el-col :span="8"> 377 <el-col :span="8">
369 <el-form-item label="不动产登记证明号"> 378 <el-form-item label="不动产登记证明号：">
370 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input> 379 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
371 </el-form-item> 380 </el-form-item>
372 </el-col> 381 </el-col>
...@@ -502,8 +511,11 @@ export default { ...@@ -502,8 +511,11 @@ export default {
502 ], 511 ],
503 //传递参数\ 512 //传递参数\
504 rules: { 513 rules: {
505 bdcqzhrules:[ 514 ztQlxxrules: [
506 { required: true, message: "不动产权证号：", trigger: "blur" }, 515 { required: true, message: "抵押不动产信息", trigger: "change" },
516 ],
517 bdcqzhrules: [
518 { required: true, message: "不动产登记证明号", trigger: "blur" },
507 ], 519 ],
508 // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }], 520 // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
509 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }], 521 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
45 预告登记信息 45 预告登记信息
46 <div class="triangle"></div> 46 <div class="triangle"></div>
47 </div> 47 </div>
48 <el-row :gutter="10" class="ssqlxx"> 48 <el-row :gutter="10">
49 <el-col :span="24" v-if="ssqlxxshow"> 49 <el-col :span="8" v-if="ssqlxxshow">
50 <el-form-item label="上手权利信息："> 50 <el-form-item label="上手权利信息：">
51 <select-table 51 <select-table
52 v-model="ruleForm.ssQlxx" 52 v-model="ruleForm.ssQlxx"
...@@ -72,8 +72,6 @@ ...@@ -72,8 +72,6 @@
72 </select-table> 72 </select-table>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 </el-row>
76 <el-row :gutter="10">
77 <el-col :span="8"> 75 <el-col :span="8">
78 <el-form-item label="不动产单元号："> 76 <el-form-item label="不动产单元号：">
79 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 77 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
...@@ -89,8 +87,6 @@ ...@@ -89,8 +87,6 @@
89 <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input> 87 <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
90 </el-form-item> 88 </el-form-item>
91 </el-col> 89 </el-col>
92 </el-row>
93 <el-row :gutter="10">
94 <el-col :span="8"> 90 <el-col :span="8">
95 <el-form-item label="权利类型："> 91 <el-form-item label="权利类型：">
96 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 92 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
...@@ -143,6 +139,7 @@ ...@@ -143,6 +139,7 @@
143 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 139 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
144 <el-date-picker 140 <el-date-picker
145 v-model="ruleForm.qlxx.djsj" 141 v-model="ruleForm.qlxx.djsj"
142 class="width100"
146 type="date" 143 type="date"
147 placeholder="选择日期" 144 placeholder="选择日期"
148 value-format="yyyy-MM-dd HH:mm:ss" 145 value-format="yyyy-MM-dd HH:mm:ss"
...@@ -166,7 +163,7 @@ ...@@ -166,7 +163,7 @@
166 </el-col> 163 </el-col>
167 164
168 <el-col :span="8"> 165 <el-col :span="8">
169 <el-form-item label="预告登记种类" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules"> 166 <el-form-item label="预告登记种类：" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
170 <el-select v-model="ruleForm.ygdj.ygdjlx"> 167 <el-select v-model="ruleForm.ygdj.ygdjlx">
171 <el-option 168 <el-option
172 v-for="item in dictData['A29']" 169 v-for="item in dictData['A29']"
...@@ -179,12 +176,12 @@ ...@@ -179,12 +176,12 @@
179 </el-form-item> 176 </el-form-item>
180 </el-col> 177 </el-col>
181 <el-col :span="8"> 178 <el-col :span="8">
182 <el-form-item label="土地使用权人"> 179 <el-form-item label="土地使用权人：">
183 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input> 180 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
184 </el-form-item> 181 </el-form-item>
185 </el-col> 182 </el-col>
186 <el-col :span="8"> 183 <el-col :span="8">
187 <el-form-item label="规划用途"> 184 <el-form-item label="规划用途：">
188 <el-select v-model="ruleForm.ygdj.ghyt"> 185 <el-select v-model="ruleForm.ygdj.ghyt">
189 <el-option 186 <el-option
190 v-for="item in dictData['A17']" 187 v-for="item in dictData['A17']"
...@@ -197,12 +194,12 @@ ...@@ -197,12 +194,12 @@
197 </el-form-item> 194 </el-form-item>
198 </el-col> 195 </el-col>
199 <el-col :span="8"> 196 <el-col :span="8">
200 <el-form-item label="用途名称"> 197 <el-form-item label="用途名称：">
201 <el-input v-model="ruleForm.ygdj.ytmc"></el-input> 198 <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
202 </el-form-item> 199 </el-form-item>
203 </el-col> 200 </el-col>
204 <el-col :span="8"> 201 <el-col :span="8">
205 <el-form-item label="房屋性质"> 202 <el-form-item label="房屋性质：">
206 <el-select v-model="ruleForm.ygdj.fwxz"> 203 <el-select v-model="ruleForm.ygdj.fwxz">
207 <el-option 204 <el-option
208 v-for="item in dictData['A19']" 205 v-for="item in dictData['A19']"
...@@ -215,12 +212,12 @@ ...@@ -215,12 +212,12 @@
215 </el-form-item> 212 </el-form-item>
216 </el-col> 213 </el-col>
217 <el-col :span="8"> 214 <el-col :span="8">
218 <el-form-item label="房屋性质名称"> 215 <el-form-item label="房屋性质名称：">
219 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input> 216 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
220 </el-form-item> 217 </el-form-item>
221 </el-col> 218 </el-col>
222 <el-col :span="8"> 219 <el-col :span="8">
223 <el-form-item label="房屋结构"> 220 <el-form-item label="房屋结构：">
224 <el-select v-model="ruleForm.ygdj.fwjg"> 221 <el-select v-model="ruleForm.ygdj.fwjg">
225 <el-option 222 <el-option
226 v-for="item in dictData['A46']" 223 v-for="item in dictData['A46']"
...@@ -233,57 +230,65 @@ ...@@ -233,57 +230,65 @@
233 </el-form-item> 230 </el-form-item>
234 </el-col> 231 </el-col>
235 <el-col :span="8"> 232 <el-col :span="8">
236 <el-form-item label="所在层"> 233 <el-form-item label="所在层：">
237 <el-input v-model="ruleForm.ygdj.szc"></el-input> 234 <el-input v-model="ruleForm.ygdj.szc"></el-input>
238 </el-form-item> 235 </el-form-item>
239 </el-col> 236 </el-col>
240 <el-col :span="8"> 237 <el-col :span="8">
241 <el-form-item label="总层数"> 238 <el-form-item label="总层数：">
242 <el-input v-model="ruleForm.ygdj.zcs"></el-input> 239 <el-input v-model="ruleForm.ygdj.zcs"></el-input>
243 </el-form-item> 240 </el-form-item>
244 </el-col> 241 </el-col>
245 <el-col :span="8"> 242 <el-col :span="8">
246 <el-form-item label="建筑面积"> 243 <el-form-item label="建筑面积：">
247 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 244 <el-input v-model="ruleForm.ygdj.jzmj"></el-input>
248 </el-form-item> 245 </el-form-item>
249 </el-col> 246 </el-col>
250 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 247 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
251 <el-form-item label="注销预告业务号"> 248 <el-form-item label="注销预告业务号：">
252 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input> 249 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
253 </el-form-item> 250 </el-form-item>
254 </el-col> 251 </el-col>
255 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 252 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
256 <el-form-item label="注销预告原因"> 253 <el-form-item label="注销预告原因：">
257 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input> 254 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
258 </el-form-item> 255 </el-form-item>
259 </el-col> 256 </el-col>
260 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 257 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
261 <el-form-item label="注销时间"> 258 <el-form-item label="注销时间：">
262 <el-input v-model="ruleForm.ygdj.zxsj"></el-input> 259 <el-date-picker
260 v-model="ruleForm.ygdj.zxsj"
261 class="width100"
262 type="date"
263 placeholder="选择日期"
264 value-format="yyyy-MM-dd HH:mm:ss"
265 format="yyyy-MM-dd"
266 >
267 </el-date-picker>
263 </el-form-item> 268 </el-form-item>
264 </el-col> 269 </el-col>
265 <el-col :span="8"> 270 <el-col :span="8">
266 <el-form-item label="取得价格/被担保主债权数额"> 271 <el-form-item label="取得价格/被担保主债权数额：">
267 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 272 <el-input v-model="ruleForm.ygdj.qdjg"></el-input>
268 </el-form-item> 273 </el-form-item>
269 </el-col> 274 </el-col>
270 <el-col :span="8"> 275 <el-col :span="8">
271 <el-form-item label="金额单位"> 276 <el-form-item label="金额单位：">
272 <el-input v-model="ruleForm.ygdj.jedw"></el-input> 277 <el-input v-model="ruleForm.ygdj.jedw"></el-input>
273 </el-form-item> 278 </el-form-item>
274 </el-col> 279 </el-col>
275 <el-col :span="8"> 280 <el-col :span="8">
276 <el-form-item label="担保范围"> 281 <el-form-item label="担保范围：">
277 <el-input v-model="ruleForm.ygdj.dbfw"></el-input> 282 <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
278 </el-form-item> 283 </el-form-item>
279 </el-col> 284 </el-col>
280 <el-col :span="8"> 285 <el-col :span="8">
281 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定"> 286 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
282 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input> 287 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
283 </el-form-item> 288 </el-form-item>
284 </el-col> 289 </el-col>
285 <el-col :span="8"> 290 <el-col :span="8">
286 <el-form-item label="不动产登记证明号"> 291 <el-form-item label="不动产登记证明号：">
287 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input> 292 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
288 </el-form-item> 293 </el-form-item>
289 </el-col> 294 </el-col>
......
1 .djxxTable {
2 width: 100%;
3 height: 100%;
4 background: #fff;
5 color: #333;
6
7 .tableBox {
8 margin: 0 auto;
9 display: flex;
10 flex-wrap: wrap;
11
12 .title {
13 width: 100%;
14 font-weight: 700;
15 font-size: 16px;
16 text-align: center;
17 background: #e9e9e9;
18 height: 62px;
19 line-height: 62px;
20 position: relative;
21 margin: 0 3px;
22
23 .checkbox {
24 position: absolute;
25 right: 20px;
26 bottom: -16px;
27 height: 62px;
28 }
29 }
30
31 .xxTableBox {
32 overflow: scroll;
33 width: 100%;
34 }
35
36 .xxTable>tr:first-child th {
37 width: 140px;
38 }
39
40 .xxTable {
41 //border-spacing: 1px;
42 width: 100%;
43 // table-layout: fixed;
44
45 tr {
46 box-sizing: border-box;
47 }
48
49 tr>th {
50 border: 1px solid #ccc;
51 background: #F2F2F2;
52 color: #333333;
53 font-size: 16px;
54 height: 40px;
55 }
56
57 tr:nth-child(1) {
58 position: sticky;
59 top: 0px;
60 z-index: 3;
61 margin-top: -2px;
62 }
63
64 tr:nth-child(2) {
65 position: sticky;
66 top: 40px;
67 z-index: 3;
68 }
69
70 tr:nth-child(3) {
71 position: sticky;
72 top: 80px;
73 z-index: 3;
74 box-shadow: 0px 15px 10px -15px #409EFF;
75 }
76
77 tr td:first-child {
78 position: sticky;
79 left: 0;
80 z-index: 2;
81 margin-left: -2px;
82 }
83
84 th.linshi,
85 th.xianshi {
86 background: #464c5b;
87 }
88
89 th.lishi {
90 background: rgba(70, 76, 91, 0.8);
91 }
92
93 .one th {
94 height: 25px;
95 font-size: 14px;
96 }
97
98 th.linshi {
99 color: #fe9400;
100 }
101
102 .two th {
103 height: 45px;
104
105 p:nth-child(2) {
106 font-size: 14px;
107 }
108 }
109
110 tr {
111 display: flex;
112 }
113
114 tr td {
115 border: 1px solid rgb(227, 226, 226);
116 text-align: center;
117 height: 40px;
118 font-size: 13px;
119 width: 140px;
120 flex: 1;
121 width: 100%;
122 display: flex;
123 align-items: center;
124 justify-content: center;
125 min-width: 280px;
126 z-index: 1;
127 }
128
129 >tr:nth-child(odd) td {
130 background: #f2f2f2;
131 }
132
133 >tr:nth-child(even) td {
134 background: #f9f9f9;
135 }
136
137 td.linshi {
138 color: #fe9400;
139 }
140
141 tr>td.lishi {
142 color: #7f7f7f;
143 }
144 }
145
146 .rollTable {
147 margin-top: -2px;
148 display: block;
149 height: calc(100vh - 185px);
150 overflow-y: scroll;
151 margin-left: 2px;
152 }
153 }
154 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -19,7 +19,7 @@ import { ...@@ -19,7 +19,7 @@ import {
19 } from "@/api/workFlow.js"; 19 } from "@/api/workFlow.js";
20 import { mapGetters } from 'vuex' 20 import { mapGetters } from 'vuex'
21 export default { 21 export default {
22 data () { 22 data() {
23 return { 23 return {
24 //是否开启材料分屏 24 //是否开启材料分屏
25 splitScreen: false, 25 splitScreen: false,
...@@ -35,10 +35,12 @@ export default { ...@@ -35,10 +35,12 @@ export default {
35 batchButtonName: '', 35 batchButtonName: '',
36 // 受理申请信息 36 // 受理申请信息
37 slsq: {}, 37 slsq: {},
38 ableOperation: true 38 ableOperation: true,
39 showidea: false
40
39 } 41 }
40 }, 42 },
41 mounted () { 43 mounted() {
42 this.flowInitParam(); 44 this.flowInitParam();
43 }, 45 },
44 methods: { 46 methods: {
...@@ -47,7 +49,7 @@ export default { ...@@ -47,7 +49,7 @@ export default {
47 * @description: 加载流程初始参数 49 * @description: 加载流程初始参数
48 * @author: renchao 50 * @author: renchao
49 */ 51 */
50 flowInitParam () { 52 flowInitParam() {
51 var formdata = new FormData(); 53 var formdata = new FormData();
52 54
53 formdata.append("bsmSlsq", this.bsmSlsq); 55 formdata.append("bsmSlsq", this.bsmSlsq);
...@@ -58,6 +60,10 @@ export default { ...@@ -58,6 +60,10 @@ export default {
58 stepExpandInfo(formdata).then((res) => { 60 stepExpandInfo(formdata).then((res) => {
59 if (res.code === 200) { 61 if (res.code === 200) {
60 this.leftButtonList = res.result.button; 62 this.leftButtonList = res.result.button;
63 if (res.result.properties.length) {
64 this.showidea = res.result.properties[0].value
65 }
66
61 this.rightButtonList = res.result.operation; 67 this.rightButtonList = res.result.operation;
62 let arr = this.rightButtonList.filter((item) => { 68 let arr = this.rightButtonList.filter((item) => {
63 return item.name == "删除" 69 return item.name == "删除"
...@@ -79,7 +85,7 @@ export default { ...@@ -79,7 +85,7 @@ export default {
79 * @param {*} item 85 * @param {*} item
80 * @author: renchao 86 * @author: renchao
81 */ 87 */
82 operation (item) { 88 operation(item) {
83 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 B7:证书领取 B8:楼盘表 B9:登簿 89 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
84 //操作按钮 登簿：record 转件：transfer 退回：back 退出：signout 90 //操作按钮 登簿：record 转件：transfer 退回：back 退出：signout
85 let that = this; 91 let that = this;
...@@ -289,7 +295,7 @@ export default { ...@@ -289,7 +295,7 @@ export default {
289 * @description: del 295 * @description: del
290 * @author: renchao 296 * @author: renchao
291 */ 297 */
292 del () { 298 del() {
293 let formdata = new FormData(); 299 let formdata = new FormData();
294 formdata.append("bsmSlsq", this.bsmSlsq); 300 formdata.append("bsmSlsq", this.bsmSlsq);
295 this.$confirm("确定要删除吗, 是否继续?", "提示", { 301 this.$confirm("确定要删除吗, 是否继续?", "提示", {
...@@ -324,24 +330,27 @@ export default { ...@@ -324,24 +330,27 @@ export default {
324 * @param {*} obj 330 * @param {*} obj
325 * @author: renchao 331 * @author: renchao
326 */ 332 */
327 sendToNext (obj) { 333 sendToNext(obj) {
328 this.$popupDialog("转出", "djbworkflow/components/zc", { 334 this.$popupDialog("转出", "djbworkflow/components/zc", {
329 obj:obj, 335 obj: obj,
330 bsmSlsq: this.bsmSlsq, 336 bsmSlsq: this.bsmSlsq,
331 tabList: this.tabList 337 tabList: this.tabList,
332 }, '800px', true) 338 tshowidea: this.showidea
339 }, '600px', true)
333 }, 340 },
334 //转出最后一个流程 341 //转出最后一个流程
335 /** 342 /**
336 * @description: 转出最后一个流程 343 * @description: 转出最后一个流程
337 * @author: renchao 344 * @author: renchao
338 */ 345 */
339 sendToEnd () { 346 sendToEnd() {
340 this.$popupDialog("转出", "djbworkflow/components/zc", { 347 this.$popupDialog("转出", "djbworkflow/components/zc", {
341 obj:"", 348 obj: "",
342 bsmSlsq: this.bsmSlsq, 349 bsmSlsq: this.bsmSlsq,
343 tabList: this.tabList 350 tabList: this.tabList,
344 }, '800px', true) 351 showidea: this.showidea
352
353 }, '600px', true)
345 }, 354 },
346 355
347 //批量操作 356 //批量操作
...@@ -349,7 +358,7 @@ export default { ...@@ -349,7 +358,7 @@ export default {
349 * @description: 批量操作 358 * @description: 批量操作
350 * @author: renchao 359 * @author: renchao
351 */ 360 */
352 handleBatchDel () { 361 handleBatchDel() {
353 this.$popupDialog("批量删除", "workflow/components/batchDel", { 362 this.$popupDialog("批量删除", "workflow/components/batchDel", {
354 width: "50%", 363 width: "50%",
355 btnShow: false, 364 btnShow: false,
...@@ -363,7 +372,7 @@ export default { ...@@ -363,7 +372,7 @@ export default {
363 * @param {*} file 372 * @param {*} file
364 * @author: renchao 373 * @author: renchao
365 */ 374 */
366 handleChange (file) { 375 handleChange(file) {
367 var formdata = new FormData(); 376 var formdata = new FormData();
368 formdata.append("file", file.raw); 377 formdata.append("file", file.raw);
369 formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); 378 formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
...@@ -382,7 +391,7 @@ export default { ...@@ -382,7 +391,7 @@ export default {
382 * @param {*} file 391 * @param {*} file
383 * @author: renchao 392 * @author: renchao
384 */ 393 */
385 beforeUpload (file) { 394 beforeUpload(file) {
386 return true; 395 return true;
387 } 396 }
388 } 397 }
......
...@@ -16,13 +16,24 @@ ...@@ -16,13 +16,24 @@
16 </div> 16 </div>
17 </div> 17 </div>
18 <div class="xxTableBox rollTable"> 18 <div class="xxTableBox rollTable">
19 <!-- 固定前三个 -->
19 <table class="xxTable"> 20 <table class="xxTable">
20 <tr v-for="(item, colindex) in columns" :key="colindex"> 21 <tr v-for="(item, colindex) in columnsall" :key="colindex">
21 <td> 22 <td>
22 {{ item.label }} 23 {{ item.label }}
23 </td> 24 </td>
24 <td></td> 25 <td v-for="(row, index) in tableData" :key="index" >
25 <td v-for="count in emptycolNum" :key="~count"></td> 26 <div class="setbut" v-if="item.prop == 'bhqk'">
27 {{ index?"变化前": "变化后"}}
28 </div>
29 <div
30 v-if="item.prop == 'cz' && row.sjlx != '系统数据'"
31 ></div>
32 <span v-if="item.prop == 'qszt'" :class="item.bt">
33 {{ getQsztName(row[item.prop]) }}
34 </span>
35 <span v-else :class="item.bt"> {{ row[item.prop] }}</span>
36 </td>
26 </tr> 37 </tr>
27 </table> 38 </table>
28 </div> 39 </div>
...@@ -32,8 +43,8 @@ ...@@ -32,8 +43,8 @@
32 43
33 <script> 44 <script>
34 import { datas } from "./qlxxFormData.js"; 45 import { datas } from "./qlxxFormData.js";
35 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js"; 46 import { getSjlx } from "@/utils/dictionary.js";
36 import { getDiyiqList } from "@/api/djbDetail.js"; 47 import { getDjbQlxxDiff } from "@/api/djbDetail.js";
37 export default { 48 export default {
38 props: { 49 props: {
39 formData: { 50 formData: {
...@@ -45,24 +56,111 @@ export default { ...@@ -45,24 +56,111 @@ export default {
45 return { 56 return {
46 radio: 1, 57 radio: 1,
47 title: "变化情况对比", 58 title: "变化情况对比",
59 qsztList: datas.columns().qsztList,
48 //列表数据 60 //列表数据
49 tableData: [], 61 tableData: [],
50 //空列值个数 62 //空列值个数
51 emptycolNum: 1, 63 emptycolNum: 1,
52 //列名称对象 64 //列名称对象
53 columns: datas.columns().DYIQ, 65 columns: [],
66 columnsall:[],
67 columnsum:[]
54 }; 68 };
55 }, 69 },
56 created() { 70 created() {
57 console.log("this.formData", this.formData); 71 switch (this.formData.dqqllx) {
72 case "JSYDSYQ":
73 this.columns = datas.columns().JSYDSYQ;
74 break;
75 case "FDCQ2":
76 this.columns = datas.columns().FDCQ2;
77 break;
78 case "NYDSYQ":
79 this.columns = datas.columns().NYDSYQ;
80 break;
81 case "DYAQ":
82 this.columns = datas.columns().DYAQ;
83 break;
84 case "DYIQ":
85 this.columns = datas.columns().DYIQ;
86 break;
87 case "YGDJ":
88 this.columns = datas.columns().YGDJ;
89 break;
90 case "CFDJ":
91 this.columns = datas.columns().CFDJ;
92 break;
93 case "YYDJ":
94 this.columns = datas.columns().YYDJ;
95 break;
96 }
97 this.getdata();
58 }, 98 },
59 methods: { 99 methods: {
100 getArrDifference: function(arr1, arr2){
101 return arr1.concat(arr2).filter(function(value, i, arr){
102 return arr.indexOf(value) === arr.lastIndexOf(value);
103 })
104 },
60 /** 105 /**
61 * @description: checkChange 106 * @description: checkChange
62 * @author: renchao 107 * @author: renchao
63 */ 108 */
109 getdata() {
110 getDjbQlxxDiff(this.formData.bsmQlxx).then((res) => {
111 if (res.code === 200) {
112 this.tableData.push(res.result.currentQlxx)
113 this.tableData.push(res.result.ssQlxx)
114 this.tableData.map((item) => {
115 item.sjlx = getSjlx(item.sjlx);
116 });
117 for (let key in this.tableData[0]) {
118 this.columnsum=this.columns.filter((item,index) => {
119 if(this.tableData[1][key]!==this.tableData[0][key]&&this.columns[index].prop==key){
120 this.columns[index].bt="red"
121 }
122 return this.columns[index].bt=="red"
123 })
124 }
125 this.columns.unshift({
126 prop: "bhqk",
127 label: "变化情况"
128 })
129 this.columnsum.unshift({
130 prop: "bhqk",
131 label: "变化情况"
132 })
133 this.columnsall= this.columns
134
135
136
137 }
138 });
139 }
140 /**
141 * @description: getQsztName
142 * @param {*} code
143 * @author: renchao
144 */,
145 getQsztName(code) {
146 let name = "";
147 for (let item of this.qsztList) {
148 if (item.value == code) {
149 name = item.label;
150 break;
151 }
152 }
153 return name;
154 },
155
64 checkChange() { 156 checkChange() {
65 console.log("ssss",this.radio); 157 if(this.radio==2){
158 this.columnsall=this.columnsum
159
160 }else{
161 this.columnsall=this.columns
162
163 }
66 }, 164 },
67 }, 165 },
68 }; 166 };
...@@ -70,4 +168,14 @@ export default { ...@@ -70,4 +168,14 @@ export default {
70 168
71 <style lang="scss" scoped> 169 <style lang="scss" scoped>
72 @import "./qlxxCommon.scss"; 170 @import "./qlxxCommon.scss";
171 .red{
172 color: #ff0202;
173 }
174 .black{
175 color: #000000;
176 }
177 .setbut{
178 font-weight: 600;
179 color: #ff0202;
180 }
73 </style> 181 </style>
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 } 96 }
97 97
98 th.linshi { 98 th.linshi {
99 color: #fe9400; 99 color: #ff5100;
100 } 100 }
101 101
102 .two th { 102 .two th {
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 height: 0; 128 height: 0;
129 border-width: 0px 0px 55px 55px; 129 border-width: 0px 0px 55px 55px;
130 border-style: none solid solid; 130 border-style: none solid solid;
131 border-color: transparent transparent #fe9400; 131 border-color: transparent transparent #ff5100;
132 position: absolute; 132 position: absolute;
133 top: 0; 133 top: 0;
134 right: 0; 134 right: 0;
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
193 } 193 }
194 194
195 td.linshi { 195 td.linshi {
196 color: #fe9400; 196 color: #ff5100;
197 } 197 }
198 198
199 tr>td.lishi { 199 tr>td.lishi {
......
...@@ -14,31 +14,34 @@ ...@@ -14,31 +14,34 @@
14 :heightNumSetting="true" 14 :heightNumSetting="true"
15 :minHeight="150" 15 :minHeight="150"
16 height="150" 16 height="150"
17 style="width: 100%"> 17 style="width: 100%"
18 >
18 <el-table-column prop="index" width="50" :render-header="renderHeader"> 19 <el-table-column prop="index" width="50" :render-header="renderHeader">
19 <template slot-scope="scope"> 20 <template slot-scope="scope">
20 <i 21 <i
21 class="el-icon-minus pointer" 22 class="el-icon-minus pointer"
22 @click="deleClick(scope.$index, scope.row)" 23 @click="deleClick(scope.$index, scope.row)"
23 v-if="ableOperation"></i> 24 v-if="ableOperation"
25 ></i>
24 <div style="text-align: center" v-else> 26 <div style="text-align: center" v-else>
25 {{ scope.$index + 1 }} 27 {{ scope.$index + 1 }}
26 </div> 28 </div>
27 </template> 29 </template>
28 </el-table-column> 30 </el-table-column>
29 <el-table-column prop="tdyt" label="土地用途" min-width="100"> 31 <el-table-column prop="yt" label="土地用途" min-width="100">
30 <template slot-scope="scope"> 32 <template slot-scope="scope">
31 <treeselect 33 <treeselect
32 v-model="tdyt" 34 v-model="scope.row.yt"
33 :disabled="!ableOperation" 35 :disabled="!ableOperation"
34 noOptionsText="暂无数据" 36 noOptionsText="暂无数据"
35 placeholder='' 37 placeholder=""
36 :show-count="true" 38 :show-count="true"
37 :options="dictData['tdyt']" 39 :options="dictData['tdyt']"
38 :normalizer="normalizer" 40 :normalizer="normalizer"
39 :appendToBody="true" 41 :appendToBody="true"
40 z-index="9999" 42 z-index="9999"
41 @input="addrow(scope.row)" /> 43 @input="addrow(scope.$index)"
44 />
42 </template> 45 </template>
43 </el-table-column> 46 </el-table-column>
44 <el-table-column prop="qssj" label="土地使用起始时间" min-width="100"> 47 <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
...@@ -51,7 +54,8 @@ ...@@ -51,7 +54,8 @@
51 placeholder="选择日期" 54 placeholder="选择日期"
52 value-format="yyyy-MM-dd HH:mm:ss" 55 value-format="yyyy-MM-dd HH:mm:ss"
53 format="yyyy-MM-dd" 56 format="yyyy-MM-dd"
54 @input="startTime(scope.$index)"> 57 @input="startTime(scope.$index)"
58 >
55 </el-date-picker> 59 </el-date-picker>
56 </template> 60 </template>
57 </el-table-column> 61 </el-table-column>
...@@ -65,7 +69,8 @@ ...@@ -65,7 +69,8 @@
65 placeholder="选择日期" 69 placeholder="选择日期"
66 value-format="yyyy-MM-dd HH:mm:ss" 70 value-format="yyyy-MM-dd HH:mm:ss"
67 format="yyyy-MM-dd" 71 format="yyyy-MM-dd"
68 @input="endTime(scope.$index)"> 72 @input="endTime(scope.$index)"
73 >
69 </el-date-picker> 74 </el-date-picker>
70 </template> 75 </template>
71 </el-table-column> 76 </el-table-column>
...@@ -74,18 +79,21 @@ ...@@ -74,18 +79,21 @@
74 <el-input 79 <el-input
75 class="item" 80 class="item"
76 :disabled="!ableOperation" 81 :disabled="!ableOperation"
77 v-model="scope.row.syqx" 82 v-model="scope.row.tdsyqx"
83 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
78 placeholder="请输入内容" 84 placeholder="请输入内容"
79 @input="sumTime(scope.$index,scope.row.syqx)"> 85 @input="sumTime(scope.$index, scope.row.tdsyqx)"
80 ></el-input> 86 >
87 ></el-input
88 >
81 </template> 89 </template>
82 </el-table-column> 90 </el-table-column>
83 </el-table> 91 </el-table>
84 </div> 92 </div>
85 </template> 93 </template>
86 <script> 94 <script>
87 import { mapGetters } from "vuex"; 95 import { mapGetters } from "vuex";
88 export default { 96 export default {
89 computed: { 97 computed: {
90 ...mapGetters(["dictData"]), 98 ...mapGetters(["dictData"]),
91 }, 99 },
...@@ -101,64 +109,50 @@ ...@@ -101,64 +109,50 @@
101 default: true, 109 default: true,
102 }, 110 },
103 }, 111 },
104 data () { 112 data() {
105 return { 113 return {
106 // 键名转换，方法默认是label和children进行树状渲染 114 // 键名转换，方法默认是label和children进行树状渲染
107 tdyt: null,
108 key: 0, 115 key: 0,
109 newdata: { 116 newdata: {
110 yt: "", 117 yt: null,
111 qssj: "", 118 qssj: "",
112 jssj: "", 119 jssj: "",
113 syqx: "", 120 tdsyqx: "",
114 }, 121 },
115 tableDataList: [], 122 tableDataList: [],
116 // 起始时间选择范围 123 // 起始时间选择范围
117 pickerStart: {}, 124 pickerStart: {},
118 pickerEnd: {}, 125 pickerEnd: {},
119 normalizer (node) { 126 normalizer(node) {
120 if (node.children == null || node.children == "null") { 127 if (node.children == null || node.children == "null") {
121 delete node.children; 128 delete node.children;
122 } 129 }
123 return { 130 return {
124 id: node.dcode, 131 id: node.dcode,
125 label: node.dname, 132 label: node.dname,
133 children: node.children,
126 }; 134 };
127 }, 135 },
128 }; 136 };
129 }, 137 },
130 mounted () { 138 mounted() {},
131 },
132 watch: { 139 watch: {
133 tableData: { 140 tableData: {
134 handler: function (val, oldVal) { 141 handler: function (val, oldVal) {
135 let that = this; 142 let that = this;
136 this.$nextTick(() => { 143 this.$nextTick(() => {
137 if (val.length == 0 || !val) { 144 if (val.length == 0 || !val) {
145 console.log("进了");
138 that.tableDataList = _.cloneDeep([ 146 that.tableDataList = _.cloneDeep([
139 { 147 {
140 yt: "", 148 yt: null,
141 qssj: "", 149 qssj: "",
142 jssj: "", 150 jssj: "",
143 syqx: "", 151 tdsyqx: "",
144 }, 152 },
145 ]); 153 ]);
146 if (that.tableDataList.length > 0) {
147 this.tdyt = that.tableDataList[0].yt
148 ? that.tableDataList[0].yt
149 : null;
150 } else {
151 this.tdyt = null;
152 }
153 } else { 154 } else {
154 that.tableDataList = _.cloneDeep(val); 155 that.tableDataList = _.cloneDeep(val);
155 if (that.tableDataList.length > 0) {
156 this.tdyt = that.tableDataList[0].yt
157 ? that.tableDataList[0].yt
158 : null;
159 } else {
160 this.tdyt = null;
161 }
162 } 156 }
163 }); 157 });
164 }, 158 },
...@@ -171,7 +165,7 @@ ...@@ -171,7 +165,7 @@
171 * @description: renderHeader 165 * @description: renderHeader
172 * @author: renchao 166 * @author: renchao
173 */ 167 */
174 renderHeader () { 168 renderHeader() {
175 return ( 169 return (
176 <div> 170 <div>
177 {" "} 171 {" "}
...@@ -193,21 +187,23 @@ ...@@ -193,21 +187,23 @@
193 * @description: 修改事件 187 * @description: 修改事件
194 * @author: renchao 188 * @author: renchao
195 */ 189 */
196 addrow () { 190 addrow(a) {
197 this.tableDataList = this.tableDataList.map((item) => { 191 console.log(a);
198 return { 192 // this.tableDataList = this.tableDataList.map((item) => {
199 ...item, 193 // return {
200 yt: this.tdyt, 194 // ...item,
201 }; 195 // yt: this.tdyt,
202 }); 196 // };
203 this.$emit("upDateTdytxxList", this.tableDataList); 197 // });
198 // this.$emit("upDateTdytxxList", this.tableDataList);
204 }, 199 },
205 /** 200 /**
206 * @description: startTime 201 * @description: startTime
207 * @param {*} index 202 * @param {*} index
208 * @author: renchao 203 * @author: renchao
209 */ 204 */
210 startTime (index) { 205 startTime(index) {
206 console.log("index", index);
211 // let startTime = this.tableDataList[index].tdsyqssj; 207 // let startTime = this.tableDataList[index].tdsyqssj;
212 let endTime = this.tableDataList[index].jssj; 208 let endTime = this.tableDataList[index].jssj;
213 let startTime = this.tableDataList[index].qssj; 209 let startTime = this.tableDataList[index].qssj;
...@@ -220,21 +216,19 @@ ...@@ -220,21 +216,19 @@
220 } 216 }
221 }, 217 },
222 }; 218 };
223 if ( 219 if (startTime && endTime) {
224 Object.keys(startTime).length > 0 &&
225 Object.keys(endTime).length > 0
226 ) {
227 let startYear = new Date(startTime).getFullYear(); 220 let startYear = new Date(startTime).getFullYear();
228 let endYear = new Date(endTime).getFullYear(); 221 let endYear = new Date(endTime).getFullYear();
229 this.tableDataList[index].syqx = endYear - startYear; 222 this.tableDataList[index].tdsyqx = endYear - startYear;
230 } 223 }
224 this.$emit("upDateTdytxxList", this.tableDataList);
231 }, 225 },
232 /** 226 /**
233 * @description: endTime 227 * @description: endTime
234 * @param {*} index 228 * @param {*} index
235 * @author: renchao 229 * @author: renchao
236 */ 230 */
237 endTime (index) { 231 endTime(index) {
238 // let startTime = this.tableDataList[index].tdsyqssj; 232 // let startTime = this.tableDataList[index].tdsyqssj;
239 let startTime = this.tableDataList[index].qssj; 233 let startTime = this.tableDataList[index].qssj;
240 let endTime = this.tableDataList[index].jssj; 234 let endTime = this.tableDataList[index].jssj;
...@@ -247,36 +241,33 @@ ...@@ -247,36 +241,33 @@
247 } 241 }
248 }, 242 },
249 }; 243 };
250 if ( 244 if (startTime && endTime) {
251 Object.keys(startTime).length > 0 &&
252 Object.keys(endTime).length > 0
253 ) {
254 let startYear = new Date(startTime).getFullYear(); 245 let startYear = new Date(startTime).getFullYear();
255 let endYear = new Date(endTime).getFullYear(); 246 let endYear = new Date(endTime).getFullYear();
256 this.tableDataList[index].syqx = endYear - startYear; 247 this.tableDataList[index].tdsyqx = endYear - startYear;
257 } 248 }
249 this.$emit("upDateTdytxxList", this.tableDataList);
258 }, 250 },
259 /** 251 /**
260 * @description: sumTime 252 * @description: sumTime
261 * @param {*} index 253 * @param {*} index
262 * @param {*} syqx 254 * @param {*} tdsyqx
263 * @author: renchao 255 * @author: renchao
264 */ 256 */
265 sumTime (index, syqx) { 257 sumTime(index, tdsyqx) {
266
267 let startTime = this.tableDataList[index].qssj; 258 let startTime = this.tableDataList[index].qssj;
268 this.tableDataList[index].jssj = 259 this.tableDataList[index].jssj =
269 Number(startTime.substring(0, 4)) + 260 Number(startTime.substring(0, 4)) +
270 Number(syqx) + 261 Number(tdsyqx) +
271 startTime.slice(4, 19); 262 startTime.slice(4, 19);
272 263 this.$emit("upDateTdytxxList", this.tableDataList);
273 }, 264 },
274 // 新增 265 // 新增
275 /** 266 /**
276 * @description: 新增 267 * @description: 新增
277 * @author: renchao 268 * @author: renchao
278 */ 269 */
279 addClick () { 270 addClick() {
280 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata); 271 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
281 272
282 this.$emit("upDateTdytxxList", this.tableDataList); 273 this.$emit("upDateTdytxxList", this.tableDataList);
...@@ -289,7 +280,7 @@ ...@@ -289,7 +280,7 @@
289 * @param {*} row 280 * @param {*} row
290 * @author: renchao 281 * @author: renchao
291 */ 282 */
292 deleClick (index, row) { 283 deleClick(index, row) {
293 this.$confirm("确定要删除吗, 是否继续?", "提示", { 284 this.$confirm("确定要删除吗, 是否继续?", "提示", {
294 confirmButtonText: "确定", 285 confirmButtonText: "确定",
295 cancelButtonText: "取消", 286 cancelButtonText: "取消",
...@@ -298,22 +289,23 @@ ...@@ -298,22 +289,23 @@
298 .then(() => { 289 .then(() => {
299 this.tableData.splice(index, 1); 290 this.tableData.splice(index, 1);
300 }) 291 })
301 .catch(() => { }); 292 .catch(() => {});
293 this.$emit("upDateTdytxxList", this.tableDataList);
302 }, 294 },
303 }, 295 },
304 }; 296 };
305 </script> 297 </script>
306 <style scoped lang="scss"> 298 <style scoped lang="scss">
307 .el-input { 299 .el-input {
308 border: none !important; 300 border: none !important;
309 } 301 }
310 /deep/.el-table__row { 302 /deep/.el-table__row {
311 border: none !important; 303 border: none !important;
312 } 304 }
313 .el-date-editor.el-input { 305 .el-date-editor.el-input {
314 width: 100%; 306 width: 100%;
315 } 307 }
316 /deep/.el-table th { 308 /deep/.el-table th {
317 height: 30px !important; 309 height: 30px !important;
318 } 310 }
319 </style> 311 </style>
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
46 </el-form-item> 46 </el-form-item>
47 </el-col> 47 </el-col>
48 </el-row> 48 </el-row>
49 <div class="slxx_title title-block"> 49 <div
50 class="slxx_title title-block flex"
51 style="justify-content: space-between"
52 >
50 不动产单元情况 53 不动产单元情况
51 <div class="triangle"></div> 54 <el-button @click="compare">变化情况对比+</el-button>
52 </div> 55 </div>
53
54 <el-button type="primary" style="float: right;margin-right: 20px; " @click="dataSelectClick">数据查看</el-button>
55
56 <el-row :gutter="10" v-if="ruleForm.qlxx"> 56 <el-row :gutter="10" v-if="ruleForm.qlxx">
57 <el-col :span="8"> 57 <el-col :span="8">
58 <el-form-item label="不动产单元号："> 58 <el-form-item label="不动产单元号：">
...@@ -354,12 +354,27 @@ ...@@ -354,12 +354,27 @@
354 } 354 }
355 }); 355 });
356 }, 356 },
357 /**
358 * @description: compare
359 * @author: renchao
360 */
361 compare() {
362 this.$popupDialog(
363 "国有建设用地使用权",
364 "registerBook/comparison",
365 { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
366 dqqllx: 'FDCQ2',
367 },
368 "80%",
369 true
370 );
371 },
357 }, 372 },
358 }; 373 };
359 </script> 374 </script>
360 <style scoped lang='scss'> 375 <style scoped lang='scss'>
361 @import "~@/styles/public.scss"; 376 @import "~@/styles/public.scss";
362 377 @import "~@/styles/slxx/slxx.scss";
363 /deep/.el-form { 378 /deep/.el-form {
364 display: flex; 379 display: flex;
365 flex-direction: column; 380 flex-direction: column;
......
...@@ -331,7 +331,9 @@ export default { ...@@ -331,7 +331,9 @@ export default {
331 this.$popupDialog( 331 this.$popupDialog(
332 "国有建设用地使用权", 332 "国有建设用地使用权",
333 "registerBook/comparison", 333 "registerBook/comparison",
334 { propsParam: this.propsParam }, 334 { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
335 dqqllx: 'JSYDSYQ',
336 },
335 "80%", 337 "80%",
336 true 338 true
337 ) 339 )
......
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 </el-row> 44 </el-row>
45 <div class="slxx_title title-block"> 45 <div
46 不动产情况 46 class="slxx_title title-block flex"
47 <div class="triangle"></div> 47 style="justify-content: space-between"
48 >
49 不动产单元情况
50 <el-button @click="compare">变化情况对比+</el-button>
48 </div> 51 </div>
49
50 <!-- <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>-->
51
52 <el-row :gutter="10" v-if="ruleForm.qlxx"> 52 <el-row :gutter="10" v-if="ruleForm.qlxx">
53 <el-col :span="8"> 53 <el-col :span="8">
54 <el-form-item label="不动产单元号："> 54 <el-form-item label="不动产单元号：">
...@@ -244,9 +244,24 @@ ...@@ -244,9 +244,24 @@
244 }); 244 });
245 } 245 }
246 }); 246 });
247 } 247 },
248 } 248 /**
249 } 249 * @description: compare
250 * @author: renchao
251 */
252 compare() {
253 this.$popupDialog(
254 "国有建设用地使用权",
255 "registerBook/comparison",
256 { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
257 dqqllx: 'YGDJ',
258 },
259 "80%",
260 true
261 );
262 },
263 },
264 };
250 </script> 265 </script>
251 <style scoped lang='scss'> 266 <style scoped lang='scss'>
252 @import "~@/styles/public.scss"; 267 @import "~@/styles/public.scss";
......
...@@ -54,7 +54,7 @@ class data extends filter { ...@@ -54,7 +54,7 @@ class data extends filter {
54 }, 54 },
55 "0": { 55 "0": {
56 text: '临时', 56 text: '临时',
57 color: '#FE9400' 57 color: '#ff5100'
58 } 58 }
59 } 59 }
60 let textName = obj[scope.row.qszt]?.text || '' 60 let textName = obj[scope.row.qszt]?.text || ''
......
...@@ -50,7 +50,7 @@ class data extends filter { ...@@ -50,7 +50,7 @@ class data extends filter {
50 }, 50 },
51 "0": { 51 "0": {
52 text: '临时', 52 text: '临时',
53 color: '#FE9400' 53 color: '#ff5100'
54 } 54 }
55 } 55 }
56 let textName = obj[scope.row.qszt]?.text || '' 56 let textName = obj[scope.row.qszt]?.text || ''
......