--no commit message

@@ -210,6 +210,18 @@ export function selectZrz (data) {
 }
 
 /*
+业务办理-选择单元-查询自然幢信息
+*/
+export function selectDz (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDz',
+        method: 'post',
+        data
+    })
+}
+
+
+/*
 业务办理-选择单元-查询户信息
 */
 export function selectH (data) {

@@ -153,7 +153,7 @@
 
           <el-col :span="5" v-show="ruleForm.qlxx && ruleForm.qlxx.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -189,7 +189,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -186,7 +186,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -125,7 +125,7 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="14">
+          <el-col :span="12">
             <el-form-item label="共有方式：">
               <el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.slywxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
@@ -135,18 +135,18 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.gyfs == '2'">
+          <el-col :span="6" v-show="ruleForm.slywxx.gyfs == '1'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
+                <el-radio :label = 1>是</el-radio>
+                <el-radio :label = 0>否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.gyfs == '2'">
+          <el-col :span="6" v-show="ruleForm.slywxx.sqfbcz == '0'&&ruleForm.slywxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -203,7 +203,8 @@ export default {
       this.$nextTick(() => {
         that.ruleForm = res.result;
         that.$endLoading();
-        that.isShow = true
+        that.isShow = true;
+        this.czrOptions=this.ruleForm.qlrList;
       })
     })
   },
@@ -226,12 +227,22 @@ export default {
     // 更新权利人信息
     upDateQlrxxList (val) {
       this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
+      this.czrOptions=this.ruleForm.qlrList;
     },
     // 更新义务人信息
     upDateYwrxxList (val) {
       this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
     },
-    onSubmit () {
+    onSubmit () {  
+      if (this.ruleForm.qlrList.length == 0) {
+          this.$message({
+            showClose: true,
+            message: "请确认权利人信息",
+            type: "error",
+          });
+          return false;
+        }
+   
       if (this.ruleForm.slywxx.gyfs == "0") {
         if (this.ruleForm.qlrList.length > 1) {
           this.$message({
@@ -241,7 +252,23 @@ export default {
           });
           return false;
         }
+        this.ruleForm.qlrList[0].sfczr="1";
       }
+      if (this.ruleForm.slywxx.gyfs == "1") {
+        //是否分别持证
+        if(this.ruleForm.slywxx.sqfbcz == '1'){ //是
+          this.ruleForm.qlrList.forEach((item, index) => {
+            item.sfczr = "1";
+          });
+        }else{
+          this.ruleForm.qlrList.forEach((item, index) => {
+            if(item.zjh==this.ruleForm.czr){
+              item.sfczr = "1";
+            }
+          });
+        }      
+      }
+
       saveData(this.ruleForm).then((res) => {
         if (res.code === 200) {
           this.$message({

@@ -142,7 +142,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -186,7 +186,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -186,7 +186,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>

@@ -192,7 +192,7 @@
           </el-col>
           <el-col :span="5" v-show="ruleForm.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>