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

 {
   "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj",
+  "SERVERAPI": "/bdcdj-ssq",
+  "ip": "http://192.168.2.38",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
-}
\ No newline at end of file
+}

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-05-17 10:39:47
 -->
@@ -33,7 +33,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="证件号" prop="zjh">
-            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
+            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-05-17 10:43:10
 -->
@@ -314,6 +314,7 @@ export default {
   async created() {
     this.propsParam = this.$attrs;
     this.ableEdit = this.$parent.showBatch;
+    this.ableOperation = this.$parent.currentSelectTab.ableOperation
     if (this.propsParam.djlx == "400") {
       this.isJfOperation = true;
     }
@@ -364,4 +365,4 @@ export default {
 <style scoped lang='scss'>
 @import "~@/styles/public.scss";
 @import "~@/styles/slxx/slxx.scss";
-</style>
\ No newline at end of file
+</style>

@@ -191,7 +191,7 @@
           <el-col>
             <el-form-item v-if="ruleForm.sldy" label="登记原因：" prop="djyy">
               <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
-                v-model="ruleForm.sldy.djyy">
+                v-model="ruleForm.fdcq2.djyy">
               </el-input>
             </el-form-item>
           </el-col>

@@ -75,7 +75,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10" v-if="ruleForm.qlxx">          
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
           <el-col :span="8">
             <el-form-item label="房屋结构：">
               <el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
@@ -102,8 +102,8 @@
             <el-form-item label="总层数：">
               <el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
             </el-form-item>
-          </el-col>          
-        </el-row>       
+          </el-col>
+        </el-row>
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -111,7 +111,7 @@
         <el-row :gutter="10">
           <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -155,8 +155,9 @@
   import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
   import { mapGetters } from "vuex";
   export default {
-    mounted () {
+    created () {
       this.ableOperation = this.$parent.currentSelectTab.ableOperation
+      this.propsParam = this.$attrs;
       this.$startLoading();
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
@@ -164,8 +165,9 @@
       formdata.append("isEdit", this.ableOperation);
       Init(formdata).then(res => {
         if (res.code === 200 && res.result) {
-          this.$endLoading();
+          console.log(res.result.ygdj.ygdjzlmc);
           this.ruleForm = res.result;
+          this.$endLoading();
         }
       })
     },
@@ -180,7 +182,13 @@
         disabled: true,
         tdytOption: [],
         czrOptions: [],
-        ruleForm: {},
+        ruleForm: {
+          qlxx:{}
+          ,sldy:{}
+          ,slsq:{}
+          ,ygdj:{}
+          ,zdjbxx:{}
+        },
         //传递参数
         propsParam: this.$attrs,
         rules: {},

@@ -78,7 +78,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10" v-if="ruleForm.qlxx">          
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
           <el-col :span="8">
             <el-form-item label="房屋结构：">
               <el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
@@ -105,8 +105,8 @@
             <el-form-item label="总层数：">
               <el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
             </el-form-item>
-          </el-col>          
-        </el-row>    
+          </el-col>
+        </el-row>
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -114,7 +114,7 @@
         <el-row :gutter="10">
           <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>

@@ -54,21 +54,21 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="不动产权证号：">
-              <el-input disabled v-model="ruleForm.qlxxold.bdcqzh"></el-input>
+              <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
            <el-col :span="8">
             <el-form-item label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="权利人：">
               <el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
             </el-form-item>
-          </el-col>         
+          </el-col>
           <el-col :span="8">
             <el-form-item label="证件种类：">
               <el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
@@ -79,8 +79,8 @@
               <el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>     
-        <el-row :gutter="10">         
+        </el-row>
+        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="房屋面积：">
               <el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input>
@@ -97,7 +97,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row :gutter="10">         
+         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="房屋取得价格：">
               <el-input disabled v-model="ruleForm.ssQlxx.qdjg"></el-input>
@@ -132,10 +132,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-           <el-col :span="8">
+        <el-row  :gutter="10">
+           <el-col :span="16">
             <el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
-              <el-input v-model="ruleForm.ygdj.dbfw"
+              <el-input v-model="ruleForm.ygdj.sfczjzhxz"
                 :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
             </el-form-item>
           </el-col>
@@ -145,7 +145,7 @@
                 :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
             </el-form-item>
           </el-col>
-        
+
         </el-row>
          <el-row>
              <el-col :span="24">
@@ -161,7 +161,7 @@
         <el-row :gutter="10">
           <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>