Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 35ac0856 7f9095f1
Expand all
Inline Side-by-side
Showing 11 changed files with 57 additions and 54 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 11:00:09 4 * @LastEditTime: 2023-08-04 10:59:11
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
366 <el-form-item label="共有方式："> 366 <el-form-item label="共有方式：">
367 <el-radio-group 367 <el-radio-group
368 :disabled="!ableOperation" 368 :disabled="!ableOperation"
369 v-model="ruleForm.qlxx.gyfs"> 369 v-model="ruleForm.sldy.gyfs">
370 <el-radio label="0">单独所有</el-radio> 370 <el-radio label="0">单独所有</el-radio>
371 <el-radio label="1">共同共有</el-radio> 371 <el-radio label="1">共同共有</el-radio>
372 <el-radio label="2">按份所有</el-radio> 372 <el-radio label="2">按份所有</el-radio>
...@@ -374,10 +374,10 @@ ...@@ -374,10 +374,10 @@
374 </el-radio-group> 374 </el-radio-group>
375 </el-form-item> 375 </el-form-item>
376 </el-col> 376 </el-col>
377 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> 377 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
378 <el-form-item label="是否分别持证："> 378 <el-form-item label="是否分别持证：">
379 <el-radio-group 379 <el-radio-group
380 v-model="ruleForm.qlxx.sqfbcz" 380 v-model="ruleForm.sldy.sqfbcz"
381 :disabled="!ableOperation"> 381 :disabled="!ableOperation">
382 <el-radio :label="1">是</el-radio> 382 <el-radio :label="1">是</el-radio>
383 <el-radio :label="0">否</el-radio> 383 <el-radio :label="0">否</el-radio>
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
386 </el-col> 386 </el-col>
387 <el-col 387 <el-col
388 :span="6" 388 :span="6"
389 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"> 389 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
390 <el-form-item label="持证人："> 390 <el-form-item label="持证人：">
391 <el-select 391 <el-select
392 v-model="ruleForm.czr" 392 v-model="ruleForm.czr"
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
433 <script> 433 <script>
434 import { mapGetters } from "vuex"; 434 import { mapGetters } from "vuex";
435 import ywmix from "@/views/ywbl/mixin/index" 435 import ywmix from "@/views/ywbl/mixin/index"
436 import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js"; 436 import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
437 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 437 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
438 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 438 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
439 import tdytTable from "@/views/workflow/components/tdytTable"; 439 import tdytTable from "@/views/workflow/components/tdytTable";
...@@ -549,11 +549,11 @@ ...@@ -549,11 +549,11 @@
549 ssQlxxchange (val) { 549 ssQlxxchange (val) {
550 this.ruleForm.ssQlxx = val; 550 this.ruleForm.ssQlxx = val;
551 this.ruleForm.qlxx.ssywh = val.ywh; 551 this.ruleForm.qlxx.ssywh = val.ywh;
552 this.ssQlxxchangediolog (val) 552 this.ssQlxxchangediolog(val)
553 }, 553 },
554 // 弹框事件 554 // 弹框事件
555 ssQlxxchangediolog (val) { 555 ssQlxxchangediolog (val) {
556 console.log("确定了",this.ruleForm) 556 console.log("确定了", this.ruleForm)
557 this.$confirm("是否将上手权利信息同步到表单", "提示", { 557 this.$confirm("是否将上手权利信息同步到表单", "提示", {
558 iconClass: "el-icon-question", //自定义图标样式 558 iconClass: "el-icon-question", //自定义图标样式
559 confirmButtonText: "确认", //确认按钮文字更换 559 confirmButtonText: "确认", //确认按钮文字更换
...@@ -714,7 +714,7 @@ ...@@ -714,7 +714,7 @@
714 }); 714 });
715 return false; 715 return false;
716 } 716 }
717 if (this.ruleForm.qlxx.gyfs == "0") { 717 if (this.ruleForm.sldy.gyfs == "0") {
718 if (this.ruleForm.qlrData.length > 1) { 718 if (this.ruleForm.qlrData.length > 1) {
719 this.$message({ 719 this.$message({
720 showClose: true, 720 showClose: true,
...@@ -724,16 +724,23 @@ ...@@ -724,16 +724,23 @@
724 return false; 724 return false;
725 } 725 }
726 this.ruleForm.qlrData[0].sfczr = "1"; 726 this.ruleForm.qlrData[0].sfczr = "1";
727 } 727 } else {
728 if (this.ruleForm.qlxx.gyfs == "1") {
729 //是否分别持证 728 //是否分别持证
730 if (this.ruleForm.qlxx.sqfbcz == "1") { 729 if (this.ruleForm.sldy.sqfbcz == "1") {
731 //是 730 //是
732 this.ruleForm.qlrData.forEach((item, index) => { 731 this.ruleForm.qlrList.forEach((item, index) => {
733 item.sfczr = "1"; 732 item.sfczr = "1";
734 }); 733 });
735 } else { 734 } else {
736 this.ruleForm.qlrData.forEach((item, index) => { 735 if (!that.ruleForm.czr) {
736 that.$message({
737 showClose: true,
738 message: "请选择持证人",
739 type: "error",
740 });
741 return false;
742 }
743 this.ruleForm.qlrList.forEach((item, index) => {
737 if (item.zjh == this.ruleForm.czr) { 744 if (item.zjh == this.ruleForm.czr) {
738 item.sfczr = "1"; 745 item.sfczr = "1";
739 } else { 746 } else {
......
1 <!-- 1 <!--
2 * @Description :宗地基本信息 2 * @Description :宗地基本信息
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-07-31 17:21:56 4 * @LastEditTime: 2023-08-04 10:06:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableDivCss"> 7 <div class="tableDivCss">
...@@ -87,30 +87,11 @@ ...@@ -87,30 +87,11 @@
87 <td colspan="3">{{ zdjbxx.zdszb }}</td> 87 <td colspan="3">{{ zdjbxx.zdszb }}</td>
88 </tr> 88 </tr>
89 <tr> 89 <tr>
90 <td>登记时间</td>
91 <td colspan="2">{{ zdjbxx.bz }}</td>
92 <td>登簿人</td>
93 <td>{{ zdjbxx.bz }}</td>
94 </tr>
95
96 <tr>
97 <td>附记</td> 90 <td>附记</td>
98 <td colspan="4">{{ zdjbxx.fj }}</td> 91 <td colspan="4">{{ zdjbxx.fj }}</td>
99 </tr> 92 </tr>
100 <!-- <tr>
101 <td>状态</td>
102 <td colspan="2">{{ zdjbxx.zt }}</td>
103 <td>区县代码</td>
104 <td>{{ zdjbxx.qxdm }}</td>
105 </tr> -->
106 <tr v-if="showGroup"> 93 <tr v-if="showGroup">
107 <td rowspan="4">变化情况</td> 94 <td rowspan="4">变化情况</td>
108
109 <!-- <table cellspacing="0" cellpadding="0" :width="bhqkTableWidth">
110 <tr v-for="(item, index) in bhqkColumns" :key="index">
111 <td class="bhqkTh">{{ item.label }}</td>
112 </tr>
113 </table> -->
114 </tr> 95 </tr>
115 96
116 <tr v-if="showGroup"> 97 <tr v-if="showGroup">
...@@ -130,11 +111,11 @@ ...@@ -130,11 +111,11 @@
130 </template> 111 </template>
131 112
132 <script> 113 <script>
133 import store from "@/store/index.js"; 114 import store from "@/store/index.js";
134 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; 115 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
135 116
136 export default { 117 export default {
137 data() { 118 data () {
138 return { 119 return {
139 bhqkColumns: [ 120 bhqkColumns: [
140 { 121 {
...@@ -213,7 +194,7 @@ export default { ...@@ -213,7 +194,7 @@ export default {
213 } 194 }
214 }, 195 },
215 }, 196 },
216 created() { 197 created () {
217 this.loadData(); 198 this.loadData();
218 }, 199 },
219 methods: { 200 methods: {
...@@ -221,7 +202,7 @@ export default { ...@@ -221,7 +202,7 @@ export default {
221 * @description: loadData 202 * @description: loadData
222 * @author: renchao 203 * @author: renchao
223 */ 204 */
224 loadData() { 205 loadData () {
225 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 206 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
226 if (res.code === 200) { 207 if (res.code === 200) {
227 this.zdjbxx = res.result.zdjbxx; 208 this.zdjbxx = res.result.zdjbxx;
...@@ -233,8 +214,8 @@ export default { ...@@ -233,8 +214,8 @@ export default {
233 }); 214 });
234 }, 215 },
235 }, 216 },
236 }; 217 };
237 </script> 218 </script>
238 <style lang="scss" scoped> 219 <style lang="scss" scoped>
239 @import "~@/styles/tablecss.scss"; 220 @import "~@/styles/tablecss.scss";
240 </style> 221 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 08:45:57 4 * @LastEditTime: 2023-08-04 10:56:39
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -312,6 +312,7 @@ ...@@ -312,6 +312,7 @@
312 * @author: renchao 312 * @author: renchao
313 */ 313 */
314 onSubmit () { 314 onSubmit () {
315 let that = this
315 if (this.ruleForm.qlrList.length == 0) { 316 if (this.ruleForm.qlrList.length == 0) {
316 this.$message({ 317 this.$message({
317 showClose: true, 318 showClose: true,
...@@ -320,7 +321,6 @@ ...@@ -320,7 +321,6 @@
320 }); 321 });
321 return false; 322 return false;
322 } 323 }
323
324 if (this.ruleForm.sldy.gyfs == "0") { 324 if (this.ruleForm.sldy.gyfs == "0") {
325 if (this.ruleForm.qlrList.length > 1) { 325 if (this.ruleForm.qlrList.length > 1) {
326 this.$message({ 326 this.$message({
...@@ -331,21 +331,29 @@ ...@@ -331,21 +331,29 @@
331 return false; 331 return false;
332 } 332 }
333 this.ruleForm.qlrList[0].sfczr = "1"; 333 this.ruleForm.qlrList[0].sfczr = "1";
334 } 334 } else {
335 if (this.ruleForm.sldy.gyfs == "1") {
336 //是否分别持证 335 //是否分别持证
337 if (this.ruleForm.sldy.sqfbcz == '1') { //是 336 if (this.ruleForm.sldy.sqfbcz == "1") {
337 //是
338 this.ruleForm.qlrList.forEach((item, index) => { 338 this.ruleForm.qlrList.forEach((item, index) => {
339 item.sfczr = "1" 339 item.sfczr = "1";
340 }); 340 });
341 } else { 341 } else {
342 if (!that.ruleForm.czr) {
343 that.$message({
344 showClose: true,
345 message: "请选择持证人",
346 type: "error",
347 });
348 return false;
349 }
342 this.ruleForm.qlrList.forEach((item, index) => { 350 this.ruleForm.qlrList.forEach((item, index) => {
343 if (item.zjh == this.ruleForm.czr) { 351 if (item.zjh == this.ruleForm.czr) {
344 item.sfczr = "1" 352 item.sfczr = "1";
345 } else { 353 } else {
346 item.sfczr = "0" 354 item.sfczr = "0";
347 } 355 }
348 }) 356 });
349 } 357 }
350 } 358 }
351 /** 359 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-01 18:15:20 4 * @LastEditTime: 2023-08-04 10:59:55
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -449,8 +449,7 @@ ...@@ -449,8 +449,7 @@
449 return false; 449 return false;
450 } 450 }
451 this.ruleForm.qlrList[0].sfczr = "1"; 451 this.ruleForm.qlrList[0].sfczr = "1";
452 } 452 } else {
453 if (this.ruleForm.sldy.gyfs == "1") {
454 //是否分别持证 453 //是否分别持证
455 if (this.ruleForm.sldy.sqfbcz == "1") { 454 if (this.ruleForm.sldy.sqfbcz == "1") {
456 //是 455 //是
...@@ -458,6 +457,14 @@ ...@@ -458,6 +457,14 @@
458 item.sfczr = "1"; 457 item.sfczr = "1";
459 }); 458 });
460 } else { 459 } else {
460 if (!that.ruleForm.czr) {
461 that.$message({
462 showClose: true,
463 message: "请选择持证人",
464 type: "error",
465 });
466 return false;
467 }
461 this.ruleForm.qlrList.forEach((item, index) => { 468 this.ruleForm.qlrList.forEach((item, index) => {
462 if (item.zjh == this.ruleForm.czr) { 469 if (item.zjh == this.ruleForm.czr) {
463 item.sfczr = "1"; 470 item.sfczr = "1";
......