Merge remote-tracking branch 'origin/master'

@@ -329,12 +329,14 @@
 			type: String,
 			default: "15vh",
 		},
-		'bsm':String
+		bsm: {
+			type: String,
+			default: "",
+		},
 	},
 	data() {
 		return {
 			update:false,
-			// bsm:'',
 			gyfs: '',
 			tableData: [],
 			gyfsList:[],
@@ -499,7 +501,7 @@
 						updateQlrDlrFr(this.formData).then((res)=>{
 							if(res.code===200){
 								this.$message.success("修改完成！");
-								this.getQlrInfo();
+								this.getQlrInfo(this.bsm);
 								this.update=false;
 								this.dialogVisible = false;
 							}
@@ -510,7 +512,7 @@
 								this.tableData.push(this.formData);
 								Object.assign(this.$data, this.$options.data())
 								this.dialogVisible = false;
-								this.getQlrInfo();
+								this.getQlrInfo(this.bsm);
 							}
 						})
 					}
@@ -572,7 +574,7 @@
 				deleteQlrDlrFrByQlrbsm(qlrbsms).then((res)=>{
 					if(res.code===200){
 						this.$message.success("删除完成！")
-						this.getQlrInfo();
+						this.getQlrInfo(this.bsm);
 					}
 				})
 			} else {
@@ -614,8 +616,8 @@
 				});
 			}
 		},
-		getQlrInfo(){
-			getQlrInfoByGlbsm(this.bsm).then((res)=>{
+		getQlrInfo(bsm){
+			getQlrInfoByGlbsm(bsm).then((res)=>{
 				if(res.code){
 					if(res.result!=null){
 						this.tableData=res.result;
@@ -633,7 +635,7 @@
         this.gyfsList = this.$store.state.gyfsList;
 	},
 	mounted() {
-		this.getQlrInfo();
+		this.getQlrInfo(this.bsm);
 		if(this.$store.state.gyfsList.length>0){
 			this.gyfs=this.$store.state.gyfsList[0].bsm;
 		}
@@ -711,7 +713,6 @@
 				this.$refs.zjzlbsm.$el.style.border = '';
 			}
 		},
-
 		// "formData.gyfsbsm":function (val) {
 		// 	let ddsy = '';
 		// 	for(let i = 0;i<this.gyfsList.length;i++){

@@ -263,7 +263,7 @@ export default {
 				zddm: "",
 				zl: "",
 				pageNo: 1,
-				pageSize: 12,
+				pageSize: 15,
 				type:'add',
 			},
 			Data: [],
@@ -369,7 +369,7 @@ export default {
 				zddm: "",
 				zl: "",
 				pageNo: 1,
-				pageSize: 12
+				pageSize: 15
 			};
 			this.getData(this.queryData);
 		},

@@ -380,6 +380,7 @@
         getQjZdjbxxDetailById,
         updateQjZdjbxx,
     } from "@api/zd";
+    import { Message } from 'element-ui';
 
     export default {
         inject: ['getRightTree'],
@@ -753,6 +754,9 @@
                                 type: "warning",
                             });
                         } else {
+                            if (this.$refs.qlrxxModule.getQlgyfsData() == 'PSHGSBDCQJDC000000000000DC340020' && this.$refs.qlrxxModule.getQlrxxData().length < 2 ) {
+                                Message.error('当前权利人共有方式至少需要添加两名权利人')
+                            }else{
                                  updateQjZdjbxx(this.formData)
                                     .then((res) => {
                                         if (res.code == 200) {
@@ -796,6 +800,7 @@
                                     console.log("属性保存完成!!");
                                 });
                             }
+                        }
                     } else {
                         this.$message({
                             // message: item.name+'不能为空',
@@ -922,7 +927,8 @@
                 this.$store.state.zddm = val;
             },
             zdbsm: function (val) {
-                this.getZdjbxxData(val)
+                this.getZdjbxxData(val);
+                this.$refs.qlrxxModule.getQlrInfo(val);
                 this.curZdbsm = val;
             },
             "formData.bdcdyh": function (val) {