Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4465eff1 by renchao@pashanhoo.com
Options

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

2 parents 19d2e81e 177136d2
Expand all
Inline Side-by-side
Showing 9 changed files with 55 additions and 296 deletions
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 </el-col> 107 </el-col>
108 <el-col :span="8"> 108 <el-col :span="8">
109 <el-form-item label="坐落："> 109 <el-form-item label="坐落：">
110 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 110 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
111 </el-form-item> 111 </el-form-item>
112 </el-col> 112 </el-col>
113 </el-row> 113 </el-row>
...@@ -189,23 +189,11 @@ ...@@ -189,23 +189,11 @@
189 <el-form-item 189 <el-form-item
190 label="是否被续封：" 190 label="是否被续封："
191 prop="cfdj.sfbxf" 191 prop="cfdj.sfbxf"
192 <<<<<<< HEAD
193 :rules="rules.sfbxfrules"> 192 :rules="rules.sfbxfrules">
194 <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange"> 193 <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
195 <el-option
196 v-for="item in sfbxflist"
197 :key="item.dcode"
198 :label="item.dname"
199 :value="item.dcode"></el-option>
200 </el-select>
201 =======
202 :rules="rules.sfbxfrules"
203 >
204 <el-radio-group v-model="ruleForm.cfdj.sfbxf">
205 <el-radio label="1">是</el-radio> 194 <el-radio label="1">是</el-radio>
206 <el-radio label="2">否</el-radio> 195 <el-radio label="2">否</el-radio>
207 </el-radio-group> 196 </el-radio-group>
208 >>>>>>> 1f8b14f926a91690cf660a297aa8a8f4a2658f8b
209 </el-form-item> 197 </el-form-item>
210 </el-col> 198 </el-col>
211 <el-col :span="8"> 199 <el-col :span="8">
...@@ -519,7 +507,6 @@ ...@@ -519,7 +507,6 @@
519 }, 507 },
520 // 弹框事件 508 // 弹框事件
521 ssQlxxchangediolog (val) { 509 ssQlxxchangediolog (val) {
522 console.log("确定了", this.ruleForm);
523 this.$confirm("是否将上手权利信息同步到表单", "提示", { 510 this.$confirm("是否将上手权利信息同步到表单", "提示", {
524 iconClass: "el-icon-question", //自定义图标样式 511 iconClass: "el-icon-question", //自定义图标样式
525 confirmButtonText: "确认", //确认按钮文字更换 512 confirmButtonText: "确认", //确认按钮文字更换
...@@ -530,8 +517,6 @@ ...@@ -530,8 +517,6 @@
530 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => { 517 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
531 if (res.code == 200) { 518 if (res.code == 200) {
532 this.nowlist = res.result; 519 this.nowlist = res.result;
533 console.log("his.nowlist", this.nowlist);
534 console.log("this.ruleForm", this.ruleForm);
535 for (var key in this.ruleForm.cfdj) { 520 for (var key in this.ruleForm.cfdj) {
536 if ( 521 if (
537 this.ruleForm.cfdj[key] == "" || 522 this.ruleForm.cfdj[key] == "" ||
...@@ -545,13 +530,11 @@ ...@@ -545,13 +530,11 @@
545 (this.ruleForm.qlxx[key] == null && key != "ywh") || 530 (this.ruleForm.qlxx[key] == null && key != "ywh") ||
546 this.ruleForm.qlxx[key] == null 531 this.ruleForm.qlxx[key] == null
547 ) { 532 ) {
548 console.log("this.ruleForm.qlxx[key]", key);
549 if (key != "ywh") { 533 if (key != "ywh") {
550 this.ruleForm.qlxx[key] = this.nowlist.qlxx[key]; 534 this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
551 } 535 }
552 } 536 }
553 } 537 }
554 console.log("this.ruleForm", this.ruleForm);
555 this.$message({ 538 this.$message({
556 type: "success", 539 type: "success",
557 message: "同步成功!", 540 message: "同步成功!",
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-col> 103 </el-col>
104 <el-col :span="8"> 104 <el-col :span="8">
105 <el-form-item label="坐落："> 105 <el-form-item label="坐落：">
106 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 106 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
107 </el-form-item> 107 </el-form-item>
108 </el-col> 108 </el-col>
109 </el-row> 109 </el-row>
...@@ -479,7 +479,7 @@ ...@@ -479,7 +479,7 @@
479 <el-form-item label="共有方式："> 479 <el-form-item label="共有方式：">
480 <el-radio-group 480 <el-radio-group
481 :disabled="!ableOperation" 481 :disabled="!ableOperation"
482 v-model="ruleForm.sldy.gyfs"> 482 v-model="ruleForm.qlxx.gyfs">
483 <el-radio label="0">单独所有</el-radio> 483 <el-radio label="0">单独所有</el-radio>
484 <el-radio label="1">共同共有</el-radio> 484 <el-radio label="1">共同共有</el-radio>
485 <el-radio label="2">按份所有</el-radio> 485 <el-radio label="2">按份所有</el-radio>
...@@ -487,10 +487,10 @@ ...@@ -487,10 +487,10 @@
487 </el-radio-group> 487 </el-radio-group>
488 </el-form-item> 488 </el-form-item>
489 </el-col> 489 </el-col>
490 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 490 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
491 <el-form-item label="是否分别持证："> 491 <el-form-item label="是否分别持证：">
492 <el-radio-group 492 <el-radio-group
493 v-model="ruleForm.sldy.sqfbcz" 493 v-model="ruleForm.qlxx.sqfbcz"
494 :disabled="!ableOperation"> 494 :disabled="!ableOperation">
495 <el-radio :label="1">是</el-radio> 495 <el-radio :label="1">是</el-radio>
496 <el-radio :label="0">否</el-radio> 496 <el-radio :label="0">否</el-radio>
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
499 </el-col> 499 </el-col>
500 <el-col 500 <el-col
501 :span="6" 501 :span="6"
502 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"> 502 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
503 <el-form-item label="持证人："> 503 <el-form-item label="持证人：">
504 <el-select 504 <el-select
505 v-model="ruleForm.czr" 505 v-model="ruleForm.czr"
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
513 </el-option> 513 </el-option>
514 </el-select> 514 </el-select>
515 </el-form-item> 515 </el-form-item>
516 </el-col> 516 </el-col> -->
517 </el-row> 517 </el-row>
518 <qlrCommonTable 518 <qlrCommonTable
519 :tableData="ruleForm.qlrData" 519 :tableData="ruleForm.qlrData"
...@@ -835,7 +835,7 @@ ...@@ -835,7 +835,7 @@
835 }); 835 });
836 return false; 836 return false;
837 } 837 }
838 if (this.ruleForm.sldy.gyfs == "0") { 838 if (this.ruleForm.qlxx.gyfs == "0") {
839 if (this.ruleForm.qlrData.length > 1) { 839 if (this.ruleForm.qlrData.length > 1) {
840 this.$message({ 840 this.$message({
841 showClose: true, 841 showClose: true,
...@@ -846,7 +846,7 @@ ...@@ -846,7 +846,7 @@
846 } 846 }
847 this.ruleForm.qlrData[0].sfczr = "1"; 847 this.ruleForm.qlrData[0].sfczr = "1";
848 } else { 848 } else {
849 if (this.ruleForm.qlrList.length <= 1) { 849 if (this.ruleForm.qlrData.length <= 1) {
850 this.$message({ 850 this.$message({
851 showClose: true, 851 showClose: true,
852 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 852 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -854,29 +854,29 @@ ...@@ -854,29 +854,29 @@
854 }); 854 });
855 return false; 855 return false;
856 } 856 }
857 //是否分别持证 857 // //是否分别持证
858 if (this.ruleForm.sldy.sqfbcz == "1") { 858 // if (this.ruleForm.qlxx.sqfbcz == "1") {
859 //是 859 // //是
860 this.ruleForm.qlrList.forEach((item, index) => { 860 // this.ruleForm.qlrData.forEach((item, index) => {
861 item.sfczr = "1"; 861 // item.sfczr = "1";
862 }); 862 // });
863 } else { 863 // } else {
864 if (!that.ruleForm.czr) { 864 // if (!that.ruleForm.czr) {
865 that.$message({ 865 // that.$message({
866 showClose: true, 866 // showClose: true,
867 message: "请选择持证人", 867 // message: "请选择持证人",
868 type: "error", 868 // type: "error",
869 }); 869 // });
870 return false; 870 // return false;
871 } 871 // }
872 this.ruleForm.qlrList.forEach((item, index) => { 872 // this.ruleForm.qlrData.forEach((item, index) => {
873 if (item.zjh == this.ruleForm.czr) { 873 // if (item.zjh == this.ruleForm.czr) {
874 item.sfczr = "1"; 874 // item.sfczr = "1";
875 } else { 875 // } else {
876 item.sfczr = "0"; 876 // item.sfczr = "0";
877 } 877 // }
878 }) 878 // })
879 } 879 // }
880 } 880 }
881 save(this.ruleForm).then((res) => { 881 save(this.ruleForm).then((res) => {
882 if (res.code === 200) { 882 if (res.code === 200) {
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 </el-col> 105 </el-col>
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="坐落："> 107 <el-form-item label="坐落：">
108 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 108 <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 </el-row> 111 </el-row>
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
722 }); 722 });
723 return false; 723 return false;
724 } 724 }
725 if (this.ruleForm.sldy.gyfs == "0") { 725 if (this.ruleForm.qlxx.gyfs == "0") {
726 if (this.ruleForm.qlrData.length > 1) { 726 if (this.ruleForm.qlrData.length > 1) {
727 this.$message({ 727 this.$message({
728 showClose: true, 728 showClose: true,
...@@ -731,7 +731,6 @@ ...@@ -731,7 +731,6 @@
731 }); 731 });
732 return false; 732 return false;
733 } 733 }
734 this.ruleForm.qlrData[0].sfczr = "1";
735 } else { 734 } else {
736 if (this.ruleForm.qlrList.length <= 1) { 735 if (this.ruleForm.qlrList.length <= 1) {
737 this.$message({ 736 this.$message({
...@@ -741,29 +740,7 @@ ...@@ -741,29 +740,7 @@
741 }); 740 });
742 return false; 741 return false;
743 } 742 }
744 //是否分别持证 743
745 if (this.ruleForm.sldy.sqfbcz == "1") {
746 //是
747 this.ruleForm.qlrList.forEach((item, index) => {
748 item.sfczr = "1";
749 });
750 } else {
751 if (!that.ruleForm.czr) {
752 that.$message({
753 showClose: true,
754 message: "请选择持证人",
755 type: "error",
756 });
757 return false;
758 }
759 this.ruleForm.qlrList.forEach((item, index) => {
760 if (item.zjh == this.ruleForm.czr) {
761 item.sfczr = "1";
762 } else {
763 item.sfczr = "0";
764 }
765 });
766 }
767 } 744 }
768 save(this.ruleForm).then((res) => { 745 save(this.ruleForm).then((res) => {
769 if (res.code === 200) { 746 if (res.code === 200) {
......
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
399 <el-form-item label="共有方式："> 399 <el-form-item label="共有方式：">
400 <el-radio-group 400 <el-radio-group
401 :disabled="!ableOperation" 401 :disabled="!ableOperation"
402 v-model="ruleForm.sldy.gyfs"> 402 v-model="ruleForm.qlxx.gyfs">
403 <el-radio label="0">单独所有</el-radio> 403 <el-radio label="0">单独所有</el-radio>
404 <el-radio label="1">共同共有</el-radio> 404 <el-radio label="1">共同共有</el-radio>
405 <el-radio label="2">按份所有</el-radio> 405 <el-radio label="2">按份所有</el-radio>
...@@ -407,33 +407,6 @@ ...@@ -407,33 +407,6 @@
407 </el-radio-group> 407 </el-radio-group>
408 </el-form-item> 408 </el-form-item>
409 </el-col> 409 </el-col>
410 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
411 <el-form-item label="是否分别持证：">
412 <el-radio-group
413 v-model="ruleForm.sldy.sqfbcz"
414 :disabled="!ableOperation">
415 <el-radio :label="1">是</el-radio>
416 <el-radio :label="0">否</el-radio>
417 </el-radio-group>
418 </el-form-item>
419 </el-col>
420 <el-col
421 :span="6"
422 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
423 <el-form-item label="持证人：">
424 <el-select
425 v-model="ruleForm.czr"
426 placeholder="持证人"
427 :disabled="!ableOperation">
428 <el-option
429 v-for="item in czrOptions"
430 :key="item.zjh"
431 :label="item.sqrmc"
432 :value="item.zjh">
433 </el-option>
434 </el-select>
435 </el-form-item>
436 </el-col>
437 </el-row> 410 </el-row>
438 <qlrCommonTable 411 <qlrCommonTable
439 :tableData="ruleForm.qlrData" 412 :tableData="ruleForm.qlrData"
...@@ -762,7 +735,7 @@ djlxchange(val) { ...@@ -762,7 +735,7 @@ djlxchange(val) {
762 return false; 735 return false;
763 } 736 }
764 } 737 }
765 if (this.ruleForm.sldy.gyfs == "0") { 738 if (this.ruleForm.qlxx.gyfs == "0") {
766 if (this.ruleForm.qlrData.length > 1) { 739 if (this.ruleForm.qlrData.length > 1) {
767 this.$message({ 740 this.$message({
768 showClose: true, 741 showClose: true,
...@@ -771,9 +744,8 @@ djlxchange(val) { ...@@ -771,9 +744,8 @@ djlxchange(val) {
771 }); 744 });
772 return false; 745 return false;
773 } 746 }
774 this.ruleForm.qlrData[0].sfczr = "1";
775 } else { 747 } else {
776 if (this.ruleForm.qlrList.length <= 1) { 748 if (this.ruleForm.qlrData.length <= 1) {
777 this.$message({ 749 this.$message({
778 showClose: true, 750 showClose: true,
779 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 751 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -781,29 +753,6 @@ djlxchange(val) { ...@@ -781,29 +753,6 @@ djlxchange(val) {
781 }); 753 });
782 return false; 754 return false;
783 } 755 }
784 //是否分别持证
785 if (this.ruleForm.sldy.sqfbcz == "1") {
786 //是
787 this.ruleForm.qlrList.forEach((item, index) => {
788 item.sfczr = "1";
789 });
790 } else {
791 if (!that.ruleForm.czr) {
792 that.$message({
793 showClose: true,
794 message: "请选择持证人",
795 type: "error",
796 });
797 return false;
798 }
799 this.ruleForm.qlrList.forEach((item, index) => {
800 if (item.zjh == this.ruleForm.czr) {
801 item.sfczr = "1";
802 } else {
803 item.sfczr = "0";
804 }
805 });
806 }
807 } 756 }
808 save(this.ruleForm).then((res) => { 757 save(this.ruleForm).then((res) => {
809 if (res.code === 200) { 758 if (res.code === 200) {
......
...@@ -271,33 +271,6 @@ ...@@ -271,33 +271,6 @@
271 </el-radio-group> 271 </el-radio-group>
272 </el-form-item> 272 </el-form-item>
273 </el-col> 273 </el-col>
274 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
275 <el-form-item label="是否分别持证：">
276 <el-radio-group
277 v-model="ruleForm.qlxx.sqfbcz"
278 :disabled="!ableOperation">
279 <el-radio :label="1">是</el-radio>
280 <el-radio :label="0">否</el-radio>
281 </el-radio-group>
282 </el-form-item>
283 </el-col>
284 <el-col
285 :span="6"
286 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
287 <el-form-item label="持证人：">
288 <el-select
289 v-model="ruleForm.czr"
290 placeholder="持证人"
291 :disabled="!ableOperation">
292 <el-option
293 v-for="item in czrOptions"
294 :key="item.zjh"
295 :label="item.sqrmc"
296 :value="item.zjh">
297 </el-option>
298 </el-select>
299 </el-form-item>
300 </el-col>
301 </el-row> 274 </el-row>
302 <qlrCommonTable 275 <qlrCommonTable
303 :tableData="ruleForm.qlrData" 276 :tableData="ruleForm.qlrData"
...@@ -612,9 +585,8 @@ export default { ...@@ -612,9 +585,8 @@ export default {
612 }); 585 });
613 return false; 586 return false;
614 } 587 }
615 this.ruleForm.qlrData[0].sfczr = "1";
616 } else { 588 } else {
617 if (this.ruleForm.qlrList.length <= 1) { 589 if (this.ruleForm.qlrData.length <= 1) {
618 this.$message({ 590 this.$message({
619 showClose: true, 591 showClose: true,
620 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 592 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -622,29 +594,6 @@ export default { ...@@ -622,29 +594,6 @@ export default {
622 }); 594 });
623 return false; 595 return false;
624 } 596 }
625 //是否分别持证
626 if (this.ruleForm.qlxx.sqfbcz == "1") {
627 //是
628 this.ruleForm.qlrList.forEach((item, index) => {
629 item.sfczr = "1";
630 });
631 } else {
632 if (!that.ruleForm.czr) {
633 that.$message({
634 showClose: true,
635 message: "请选择持证人",
636 type: "error",
637 });
638 return false;
639 }
640 this.ruleForm.qlrList.forEach((item, index) => {
641 if (item.zjh == this.ruleForm.czr) {
642 item.sfczr = "1";
643 } else {
644 item.sfczr = "0";
645 }
646 });
647 }
648 } 597 }
649 save(this.ruleForm).then((res) => { 598 save(this.ruleForm).then((res) => {
650 if (res.code === 200) { 599 if (res.code === 200) {
......
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
364 </el-radio-group> 364 </el-radio-group>
365 </el-form-item> 365 </el-form-item>
366 </el-col> 366 </el-col>
367 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> 367 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
368 <el-form-item label="是否分别持证："> 368 <el-form-item label="是否分别持证：">
369 <el-radio-group 369 <el-radio-group
370 v-model="ruleForm.qlxx.sqfbcz" 370 v-model="ruleForm.qlxx.sqfbcz"
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
373 <el-radio :label="0">否</el-radio> 373 <el-radio :label="0">否</el-radio>
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 377 <!-- <el-col
378 :span="6" 378 :span="6"
379 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'"> 379 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
380 <el-form-item label="持证人："> 380 <el-form-item label="持证人：">
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
390 </el-option> 390 </el-option>
391 </el-select> 391 </el-select>
392 </el-form-item> 392 </el-form-item>
393 </el-col> 393 </el-col> -->
394 </el-row> 394 </el-row>
395 <qlrCommonTable 395 <qlrCommonTable
396 :tableData="ruleForm.qlrData" 396 :tableData="ruleForm.qlrData"
...@@ -691,38 +691,14 @@ export default { ...@@ -691,38 +691,14 @@ export default {
691 }); 691 });
692 return false; 692 return false;
693 } 693 }
694 this.ruleForm.qlrData[0].sfczr = "1";
695 } else { 694 } else {
696 if (this.ruleForm.qlrList.length <= 1) { 695 if (this.ruleForm.qlrData.length <= 1) {
697 this.$message({ 696 this.$message({
698 showClose: true, 697 showClose: true,
699 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 698 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
700 type: "error", 699 type: "error",
701 }); 700 });
702 return false; 701 return false;
703 }
704 //是否分别持证
705 if (this.ruleForm.qlxx.sqfbcz == "1") {
706 //是
707 this.ruleForm.qlrList.forEach((item, index) => {
708 item.sfczr = "1";
709 });
710 } else {
711 if (!that.ruleForm.czr) {
712 that.$message({
713 showClose: true,
714 message: "请选择持证人",
715 type: "error",
716 });
717 return false;
718 }
719 this.ruleForm.qlrList.forEach((item, index) => {
720 if (item.zjh == this.ruleForm.czr) {
721 item.sfczr = "1";
722 } else {
723 item.sfczr = "0";
724 }
725 });
726 } 702 }
727 } 703 }
728 save(this.ruleForm).then((res) => { 704 save(this.ruleForm).then((res) => {
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 </el-col> 105 </el-col>
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="坐落："> 107 <el-form-item label="坐落：">
108 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 108 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 </el-row> 111 </el-row>
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
452 <el-form-item label="共有方式："> 452 <el-form-item label="共有方式：">
453 <el-radio-group 453 <el-radio-group
454 :disabled="!ableOperation" 454 :disabled="!ableOperation"
455 v-model="ruleForm.sldy.gyfs"> 455 v-model="ruleForm.qlxx.gyfs">
456 <el-radio label="0">单独所有</el-radio> 456 <el-radio label="0">单独所有</el-radio>
457 <el-radio label="1">共同共有</el-radio> 457 <el-radio label="1">共同共有</el-radio>
458 <el-radio label="2">按份所有</el-radio> 458 <el-radio label="2">按份所有</el-radio>
...@@ -460,33 +460,6 @@ ...@@ -460,33 +460,6 @@
460 </el-radio-group> 460 </el-radio-group>
461 </el-form-item> 461 </el-form-item>
462 </el-col> 462 </el-col>
463 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
464 <el-form-item label="是否分别持证：">
465 <el-radio-group
466 v-model="ruleForm.sldy.sqfbcz"
467 :disabled="!ableOperation">
468 <el-radio :label="1">是</el-radio>
469 <el-radio :label="0">否</el-radio>
470 </el-radio-group>
471 </el-form-item>
472 </el-col>
473 <el-col
474 :span="6"
475 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
476 <el-form-item label="持证人：">
477 <el-select
478 v-model="ruleForm.czr"
479 placeholder="持证人"
480 :disabled="!ableOperation">
481 <el-option
482 v-for="item in czrOptions"
483 :key="item.zjh"
484 :label="item.sqrmc"
485 :value="item.zjh">
486 </el-option>
487 </el-select>
488 </el-form-item>
489 </el-col>
490 </el-row> 463 </el-row>
491 <qlrCommonTable 464 <qlrCommonTable
492 :tableData="ruleForm.qlrData" 465 :tableData="ruleForm.qlrData"
...@@ -816,9 +789,8 @@ created() { ...@@ -816,9 +789,8 @@ created() {
816 }); 789 });
817 return false; 790 return false;
818 } 791 }
819 this.ruleForm.qlrData[0].sfczr = "1";
820 } else { 792 } else {
821 if (this.ruleForm.qlrList.length <= 1) { 793 if (this.ruleForm.qlrData.length <= 1) {
822 this.$message({ 794 this.$message({
823 showClose: true, 795 showClose: true,
824 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 796 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -826,29 +798,6 @@ created() { ...@@ -826,29 +798,6 @@ created() {
826 }); 798 });
827 return false; 799 return false;
828 } 800 }
829 //是否分别持证
830 if (this.ruleForm.sldy.sqfbcz == "1") {
831 //是
832 this.ruleForm.qlrList.forEach((item, index) => {
833 item.sfczr = "1";
834 });
835 } else {
836 if (!that.ruleForm.czr) {
837 that.$message({
838 showClose: true,
839 message: "请选择持证人",
840 type: "error",
841 });
842 return false;
843 }
844 this.ruleForm.qlrList.forEach((item, index) => {
845 if (item.zjh == this.ruleForm.czr) {
846 item.sfczr = "1";
847 } else {
848 item.sfczr = "0";
849 }
850 });
851 }
852 } 801 }
853 save(this.ruleForm).then((res) => { 802 save(this.ruleForm).then((res) => {
854 if (res.code === 200) { 803 if (res.code === 200) {
......
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
368 <el-form-item label="共有方式："> 368 <el-form-item label="共有方式：">
369 <el-radio-group 369 <el-radio-group
370 :disabled="!ableOperation" 370 :disabled="!ableOperation"
371 v-model="ruleForm.sldy.gyfs"> 371 v-model="ruleForm.qlxx.gyfs">
372 <el-radio label="0">单独所有</el-radio> 372 <el-radio label="0">单独所有</el-radio>
373 <el-radio label="1">共同共有</el-radio> 373 <el-radio label="1">共同共有</el-radio>
374 <el-radio label="2">按份所有</el-radio> 374 <el-radio label="2">按份所有</el-radio>
...@@ -376,10 +376,10 @@ ...@@ -376,10 +376,10 @@
376 </el-radio-group> 376 </el-radio-group>
377 </el-form-item> 377 </el-form-item>
378 </el-col> 378 </el-col>
379 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 379 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
380 <el-form-item label="是否分别持证："> 380 <el-form-item label="是否分别持证：">
381 <el-radio-group 381 <el-radio-group
382 v-model="ruleForm.sldy.sqfbcz" 382 v-model="ruleForm.qlxx.sqfbcz"
383 :disabled="!ableOperation"> 383 :disabled="!ableOperation">
384 <el-radio :label="1">是</el-radio> 384 <el-radio :label="1">是</el-radio>
385 <el-radio :label="0">否</el-radio> 385 <el-radio :label="0">否</el-radio>
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
388 </el-col> 388 </el-col>
389 <el-col 389 <el-col
390 :span="6" 390 :span="6"
391 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"> 391 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
392 <el-form-item label="持证人："> 392 <el-form-item label="持证人：">
393 <el-select 393 <el-select
394 v-model="ruleForm.czr" 394 v-model="ruleForm.czr"
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
402 </el-option> 402 </el-option>
403 </el-select> 403 </el-select>
404 </el-form-item> 404 </el-form-item>
405 </el-col> 405 </el-col> -->
406 </el-row> 406 </el-row>
407 <qlrCommonTable 407 <qlrCommonTable
408 :tableData="ruleForm.qlrData" 408 :tableData="ruleForm.qlrData"
...@@ -712,7 +712,7 @@ created() { ...@@ -712,7 +712,7 @@ created() {
712 }); 712 });
713 return false; 713 return false;
714 } 714 }
715 if (this.ruleForm.sldy.gyfs == "0") { 715 if (this.ruleForm.qlxx.gyfs == "0") {
716 if (this.ruleForm.qlrData.length > 1) { 716 if (this.ruleForm.qlrData.length > 1) {
717 this.$message({ 717 this.$message({
718 showClose: true, 718 showClose: true,
...@@ -721,7 +721,6 @@ created() { ...@@ -721,7 +721,6 @@ created() {
721 }); 721 });
722 return false; 722 return false;
723 } 723 }
724 this.ruleForm.qlrData[0].sfczr = "1";
725 } else { 724 } else {
726 if (this.ruleForm.qlrList.length <= 1) { 725 if (this.ruleForm.qlrList.length <= 1) {
727 this.$message({ 726 this.$message({
...@@ -731,29 +730,6 @@ created() { ...@@ -731,29 +730,6 @@ created() {
731 }); 730 });
732 return false; 731 return false;
733 } 732 }
734 //是否分别持证
735 if (this.ruleForm.sldy.sqfbcz == "1") {
736 //是
737 this.ruleForm.qlrList.forEach((item, index) => {
738 item.sfczr = "1";
739 });
740 } else {
741 if (!that.ruleForm.czr) {
742 that.$message({
743 showClose: true,
744 message: "请选择持证人",
745 type: "error",
746 });
747 return false;
748 }
749 this.ruleForm.qlrList.forEach((item, index) => {
750 if (item.zjh == this.ruleForm.czr) {
751 item.sfczr = "1";
752 } else {
753 item.sfczr = "0";
754 }
755 });
756 }
757 } 733 }
758 save(this.ruleForm).then((res) => { 734 save(this.ruleForm).then((res) => {
759 if (res.code === 200) { 735 if (res.code === 200) {
......