0e2efcd6 by tianhaohao@pashanhoo.com

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

2 parents db1f1728 a0b422f4
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 15:43:30 4 * @LastEditTime: 2023-08-07 14:43:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">(放大) 显示(缩小)</el-button> 25 <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">(放大) 显示(缩小)</el-button>
26 <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false" 26 <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
27 :on-change="handleChange" 27 :on-change="handleChange"
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload"> 28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button> 29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
30 </el-upload> 30 </el-upload>
31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
...@@ -225,28 +225,12 @@ ...@@ -225,28 +225,12 @@
225 this.showViewer = true 225 this.showViewer = true
226 }, 226 },
227 /** 227 /**
228 * @description: 上传
229 * @param {*} file
230 * @author: renchao
231 */
232 beforeUpload (file) {
233 const isLt5M = file.size / 1024 / 1024 < 5;
234 if (!isLt5M) {
235 this.$message.error('上传图片大小不能超过 5MB!');
236 return false;
237 }
238
239 // 所有条件满足时返回 true
240 return true;
241 },
242 /**
243 * @description: handleChange 228 * @description: handleChange
244 * @param {*} file 229 * @param {*} file
245 * @param {*} files 230 * @param {*} files
246 * @author: renchao 231 * @author: renchao
247 */ 232 */
248 async handleChange (file, fileList) { 233 async handleChange (file, fileList) {
249 if (!this.beforeUpload(file)) return
250 let length = fileList.length; 234 let length = fileList.length;
251 this.maxFileLength = Math.max(length, this.maxFileLength) 235 this.maxFileLength = Math.max(length, this.maxFileLength)
252 var formData = new FormData(); 236 var formData = new FormData();
...@@ -254,8 +238,12 @@ ...@@ -254,8 +238,12 @@
254 if (this.maxFileLength !== length) { 238 if (this.maxFileLength !== length) {
255 return 239 return
256 } 240 }
257 let num = 0 241 let num = 0, max = 0;
242 const isLt5M = file.size / 1024 / 1024 < 5;
258 fileList.forEach(item => { 243 fileList.forEach(item => {
244 if (!isLt5M) {
245 max++
246 }
259 if (!['image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(item.raw.type)) { 247 if (!['image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(item.raw.type)) {
260 num++ 248 num++
261 } else { 249 } else {
...@@ -268,6 +256,11 @@ ...@@ -268,6 +256,11 @@
268 this.key++ 256 this.key++
269 return; 257 return;
270 } 258 }
259 if (max >= 1) {
260 this.$message.error('上传图片大小不能超过 5MB!');
261 this.key++
262 return;
263 }
271 formData.append("bsmSj", this.previewImg.bsmSj); 264 formData.append("bsmSj", this.previewImg.bsmSj);
272 formData.append("bsmSlsq", this.previewImg.bsmSlsq); 265 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
273 uploadBatch(formData).then((res) => { 266 uploadBatch(formData).then((res) => {
......
...@@ -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) {
......
...@@ -113,14 +113,6 @@ export default { ...@@ -113,14 +113,6 @@ export default {
113 }, 113 },
114 }, 114 },
115 mounted() { 115 mounted() {
116 console.log(
117 "bestepid: this.$route.query.bestepid,",
118 this.$route.query.bestepid
119 );
120 console.log(
121 "bestepid: this.$route.query.sqywbm,",
122 this.$route.query.sqywbm
123 );
124 this.ableOperation = this.$parent.ableOperation; 116 this.ableOperation = this.$parent.ableOperation;
125 }, 117 },
126 methods: { 118 methods: {
...@@ -162,7 +154,6 @@ export default { ...@@ -162,7 +154,6 @@ export default {
162 return new Promise((resolve) => { 154 return new Promise((resolve) => {
163 this.unitData = this.$parent.unitData; 155 this.unitData = this.$parent.unitData;
164 var formdata = new FormData(); 156 var formdata = new FormData();
165
166 formdata.append("bsmSlsq", this.$parent.bsmSlsq); 157 formdata.append("bsmSlsq", this.$parent.bsmSlsq);
167 if (this.$route.query.sqywbm == "DJBBL") { 158 if (this.$route.query.sqywbm == "DJBBL") {
168 formdata.append("bsmSldy", this.$parent.bsmRepair); 159 formdata.append("bsmSldy", this.$parent.bsmRepair);
...@@ -259,6 +250,9 @@ export default { ...@@ -259,6 +250,9 @@ export default {
259 sjlx: data.cllx, 250 sjlx: data.cllx,
260 sfxjcl: "1", // 是否必选 251 sfxjcl: "1", // 是否必选
261 }; 252 };
253 if (this.$route.query.sqywbm == "DJBBL") {
254 obj.bsmSldy=this.$parent.bsmRepair
255 }
262 saveClml(obj).then(async (res) => { 256 saveClml(obj).then(async (res) => {
263 if (res.code == 200) { 257 if (res.code == 200) {
264 let res = await this.clmlInitList(2); 258 let res = await this.clmlInitList(2);
...@@ -324,6 +318,7 @@ export default { ...@@ -324,6 +318,7 @@ export default {
324 data: this.tableData, 318 data: this.tableData,
325 unitData: this.$parent.unitData, 319 unitData: this.$parent.unitData,
326 ableOperation: this.$parent.ableOperation, 320 ableOperation: this.$parent.ableOperation,
321 bsmRepair:this.$parent.bsmRepair
327 }, 322 },
328 "60%", 323 "60%",
329 true 324 true
......
...@@ -209,9 +209,14 @@ ...@@ -209,9 +209,14 @@
209 return new Promise(resolve => { 209 return new Promise(resolve => {
210 this.unitData = this.$parent.unitData; 210 this.unitData = this.$parent.unitData;
211 var formdata = new FormData(); 211 var formdata = new FormData();
212 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy); 212 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
213 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq); 213 if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
214 formdata.append("bsmSldy", this.formData.bsmRepair);
215 formdata.append("clfl", 3);
216 } else {
217 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
214 formdata.append("clfl", 2); 218 formdata.append("clfl", 2);
219 }
215 InitClml(formdata).then((res) => { 220 InitClml(formdata).then((res) => {
216 if (res.code == 200) { 221 if (res.code == 200) {
217 resolve(res.code) 222 resolve(res.code)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <i class="el-icon-question invalid-icon"></i> 9 <i class="el-icon-question invalid-icon"></i>
10 <div class="invalid-body">您是否确定终止该业务办理?</div> 10 <div class="invalid-body">您是否确定终止该业务办理?</div>
11 </div> 11 </div>
12 <div class="invalid-reson">终止原因:</div> 12 <div class="invalid-reson">退件原因:</div>
13 <el-input 13 <el-input
14 v-model="stopMessage" 14 v-model="stopMessage"
15 placeholder="请输入终止原因" 15 placeholder="请输入终止原因"
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
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 class="slxx_title title-block" v-if="ruleForm.hlist && ruleForm.hlist.length>0">
46 抵押户信息列表信息({{ruleForm.hlist.length}} 户) 46 抵押户信息列表信息({{ruleForm.hlist.length}} 户)
47 <div class="triangle"></div> 47 <div class="triangle"></div>
48 </div> 48 </div>
...@@ -51,10 +51,9 @@ ...@@ -51,10 +51,9 @@
51 抵押信息 51 抵押信息
52 <div class="triangle"></div> 52 <div class="triangle"></div>
53 </div> 53 </div>
54 <el-row :gutter="10"> 54 <el-row :gutter="10" v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
55 <el-col :span="8"> 55 <el-col :span="8">
56 <el-form-item label="抵押方式:"> 56 <el-form-item label="抵押方式:">
57 <!-- <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> -->
58 <el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs"> 57 <el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs">
59 <el-radio label="1">一般抵押</el-radio> 58 <el-radio label="1">一般抵押</el-radio>
60 <el-radio label="2">最高额抵押</el-radio> 59 <el-radio label="2">最高额抵押</el-radio>
...@@ -79,7 +78,7 @@ ...@@ -79,7 +78,7 @@
79 </el-col> 78 </el-col>
80 </el-row> 79 </el-row>
81 80
82 <el-row :gutter="10"> 81 <el-row :gutter="10" v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
83 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1"> 82 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1">
84 <el-form-item label="被担保主债权数额:"> 83 <el-form-item label="被担保主债权数额:">
85 <el-input v-model="ruleForm.diyaqList[0].bdbzzqse" :disabled="!ableOperation"></el-input> 84 <el-input v-model="ruleForm.diyaqList[0].bdbzzqse" :disabled="!ableOperation"></el-input>
...@@ -114,7 +113,7 @@ ...@@ -114,7 +113,7 @@
114 </el-col> 113 </el-col>
115 </el-row> 114 </el-row>
116 115
117 <el-row> 116 <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
118 <el-col :span="24"> 117 <el-col :span="24">
119 <el-form-item label="担保范围:"> 118 <el-form-item label="担保范围:">
120 <el-input v-model="ruleForm.diyaqList[0].dbfw" 119 <el-input v-model="ruleForm.diyaqList[0].dbfw"
...@@ -122,14 +121,14 @@ ...@@ -122,14 +121,14 @@
122 </el-form-item> 121 </el-form-item>
123 </el-col> 122 </el-col>
124 </el-row> 123 </el-row>
125 <el-row> 124 <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
126 <el-col :span="24"> 125 <el-col :span="24">
127 <el-form-item label="最高债权确定事实和数额:"> 126 <el-form-item label="最高债权确定事实和数额:">
128 <el-input v-model="ruleForm.diyaqList[0].zgzqqdss" :disabled="!ableOperation"></el-input> 127 <el-input v-model="ruleForm.diyaqList[0].zgzqqdss" :disabled="!ableOperation"></el-input>
129 </el-form-item> 128 </el-form-item>
130 </el-col> 129 </el-col>
131 </el-row> 130 </el-row>
132 <el-row> 131 <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
133 <el-col> 132 <el-col>
134 <el-form-item label="附记:" prop="fj"> 133 <el-form-item label="附记:" prop="fj">
135 <el-input type="textarea" v-model="ruleForm.diyaqList[0].fj" :disabled="!ableOperation"></el-input> 134 <el-input type="textarea" v-model="ruleForm.diyaqList[0].fj" :disabled="!ableOperation"></el-input>
...@@ -141,7 +140,7 @@ ...@@ -141,7 +140,7 @@
141 抵押权人信息 140 抵押权人信息
142 <div class="triangle"></div> 141 <div class="triangle"></div>
143 </div> 142 </div>
144 <el-row :gutter="10"> 143 <el-row :gutter="10" v-if="ruleForm.sldyList && ruleForm.sldyList.length>0">
145 <el-col :span="14"> 144 <el-col :span="14">
146 <el-form-item label="共有方式:"> 145 <el-form-item label="共有方式:">
147 <el-radio-group :disabled="!ableOperation" v-model="ruleForm.sldyList[0].gyfs"> 146 <el-radio-group :disabled="!ableOperation" v-model="ruleForm.sldyList[0].gyfs">
...@@ -170,7 +169,8 @@ ...@@ -170,7 +169,8 @@
170 </el-form-item> 169 </el-form-item>
171 </el-col> 170 </el-col>
172 </el-row> 171 </el-row>
173 <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" :disabled="!ableOperation" :gyfs="ruleForm.sldyList[0].gyfs" /> 172 <qlrCommonTable v-if="ruleForm.sldyList && ruleForm.sldyList.length>0" :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
173 :disabled="!ableOperation" :gyfs="ruleForm.sldyList[0].gyfs" />
174 <div class="slxx_title title-block"> 174 <div class="slxx_title title-block">
175 抵押人信息 175 抵押人信息
176 <div class="triangle"></div> 176 <div class="triangle"></div>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
181 登记原因 181 登记原因
182 <div class="triangle"></div> 182 <div class="triangle"></div>
183 </div> 183 </div>
184 <el-row :gutter="10"> 184 <el-row :gutter="10" v-if="ruleForm.diyaqList && ruleForm.diyaqList.length>0">
185 <el-col> 185 <el-col>
186 <el-form-item v-if="ruleForm.sldyList[0].djlx == '400'" label="注销抵押原因:" prop="djyy"> 186 <el-form-item v-if="ruleForm.sldyList[0].djlx == '400'" label="注销抵押原因:" prop="djyy">
187 <el-input class="textArea" type="textarea" :disabled="!ableOperation" 187 <el-input class="textArea" type="textarea" :disabled="!ableOperation"
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
210 import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js"; 210 import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
211 import { mapGetters } from "vuex"; 211 import { mapGetters } from "vuex";
212 export default { 212 export default {
213 created () { 213 mounted () {
214 this.ableOperation = this.$parent.currentSelectTab.ableOperation 214 this.ableOperation = this.$parent.currentSelectTab.ableOperation
215 this.propsParam = this.$attrs; 215 this.propsParam = this.$attrs;
216 var formdata = new FormData(); 216 var formdata = new FormData();
...@@ -220,9 +220,13 @@ ...@@ -220,9 +220,13 @@
220 formdata.append("djlx", this.propsParam.djlx); 220 formdata.append("djlx", this.propsParam.djlx);
221 formdata.append("isEdit", this.ableOperation); 221 formdata.append("isEdit", this.ableOperation);
222 bacthInit(formdata).then((res) => { 222 bacthInit(formdata).then((res) => {
223 this.$endLoading();
223 if (res.code === 200 && res.result) { 224 if (res.code === 200 && res.result) {
224 this.ruleForm = res.result; 225 this.$nextTick(() => {
225 this.$endLoading(); 226 this.ruleForm = res.result;
227 })
228 } else {
229 this.$message.error(res.message);
226 } 230 }
227 }) 231 })
228 }, 232 },
......