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

@@ -271,7 +271,6 @@
     },
     },
     created () {
     created () {
       window.addEventListener("resize", this.getHeight);
       window.addEventListener("resize", this.getHeight);
-      console.log(this.formData);
       this.getHeight();
       this.getHeight();
     },
     },
     mounted () {
     mounted () {

@@ -180,7 +180,7 @@
                 display: flex;
                 display: flex;
                 align-items: center;
                 align-items: center;
                 justify-content: center;
                 justify-content: center;
-                min-width: 280px;
+                min-width: 360px;
                 z-index: 1;
                 z-index: 1;
             }
             }
             td:first-child{
             td:first-child{

@@ -94,12 +94,12 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="面积：">
             <el-form-item label="面积：">
-              <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="用途：">
             <el-form-item label="用途：">
-              <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -110,10 +110,9 @@
         </div>
         </div>
 
 
         <el-row :gutter="10">
         <el-row :gutter="10">
-          <el-col :span="8" v-if="ruleForm.sldy.djlx != '100'">
-            <el-form-item label="原不动产登记证明号：">
-              <el-input v-if="ruleForm.sldy.djlx == '400'" disabled v-model="ruleForm.qlxx.bdcqzh"></el-input>
-              <el-input v-else disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
+          <el-col :span="8" >
+            <el-form-item label="原不动产权证号：">
+              <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="7">
           <el-col :span="7">

@@ -311,11 +311,11 @@
         }
         }
       },
       },
       handleLpbClick (item) {
       handleLpbClick (item) {
-        console.log("item",item);
          this.$popup('楼盘表', 'lpb/index', {
          this.$popup('楼盘表', 'lpb/index', {
           width: '85%',
           width: '85%',
           formData: {
           formData: {
             bsm: item.bsm,
             bsm: item.bsm,
+            bsmSqyw:this.sqywInfo.bsmSqyw
 
 
           }
           }
         })
         })

@@ -89,7 +89,6 @@
        */
        */
       queryClick () {
       queryClick () {
         this.$startLoading();
         this.$startLoading();
-        console.log("this.sqywInfo.zrzbsm",this.sqywInfo);
          this.queryForm.zrzbsm = this.sqywInfo.bsm;
          this.queryForm.zrzbsm = this.sqywInfo.bsm;
         // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
         // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
         selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
         selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {

@@ -159,7 +159,6 @@
         if (this.selectType == 'together') {
         if (this.selectType == 'together') {
           getTogetherBiz().then(res => {
           getTogetherBiz().then(res => {
             if (res) {
             if (res) {
-              console.log("res", res);
               this.djqxList = res.result;
               this.djqxList = res.result;
             }
             }
           })
           })

@@ -37,7 +37,8 @@
        * @param {*} view
        * @param {*} view
        * @author: renchao
        * @author: renchao
        */
        */
-      loadView (view) {        
+
+      loadView (view) {
         return (r) =>
         return (r) =>
           require.ensure([], () => r(require(`./components/${view}.vue`)));
           require.ensure([], () => r(require(`./components/${view}.vue`)));
       },
       },