Merge remote-tracking branch 'origin/master'

@@ -8,7 +8,6 @@
                 :modal-append-to-body="false"
         >
             <div>
-                <span class="xl" @click="xl">祥例</span>
                 <table border="1">
                     <tr>
                         <td>室号前缀</td>
@@ -57,14 +56,6 @@
                 <div class="gz">
                     <span>室号规则：{{gz}}</span>
                 </div>
-            </div>
-            <div>
-                <el-dialog
-                        title="祥例"
-                        :visible.sync="xlVisible"
-                        width="50%"
-                        :modal-append-to-body="false"
-                >
                 <div class="xlgz">
                         <span>
                             样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
@@ -80,7 +71,6 @@
                             样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”)
                         </span>
                 </div>
-                </el-dialog>
             </div>
             <div class="shop">
                 <el-button type="primary" @click="save">保存</el-button>
@@ -109,7 +99,6 @@
         data() {
             return {
                 isVisible: false,
-                xlVisible: false,
                 plshData: {
                     shqz: '',
                     selectDyh: false,
@@ -153,9 +142,6 @@
             lodding: function () {
                 this.$emit('lodding')
             },
-            xl: function () {
-                this.xlVisible = true;
-            },
             close: function () {
                 this.$emit("close")
                 this.isVisible = false
@@ -204,9 +190,9 @@
                 if (this.plshData.fgfA !== "") {
                     gz += this.plshData.fgfA
                 }
-                if (this.plshData.c === 1) {
+                if (+this.plshData.c === 1) {
                     gz += "[名义层]"
-                } else if (this.plshData.c === 2) {
+                } else if (+this.plshData.c === 2) {
                     gz += "[实际层]"
                 }
                 if (this.plshData.fgfB !== "") {
@@ -267,7 +253,7 @@
 
     .gz {
         color: #b2b2b2;
-        font-size: 12px;
+        font-size: 14px;
         margin-top: 40px;
     }
 

@@ -262,36 +262,35 @@
                 if (this.plzlData.qz !== '') {
                     gz += this.plzlData.qz
                 }
-
-                if (this.plzlData.zd === 1) {
+                if (+this.plzlData.zd === 1) {
                     gz += "[宗地坐落]";
-                } else if (this.plzlData.zd === 2) {
+                } else if (+this.plzlData.zd === 2) {
                     gz += "[宗地名称]";
                 }
 
-                if (this.plzlData.zrz === 1) {
+                if (+this.plzlData.zrz === 1) {
                     gz += "[自然幢坐落]"
-                } else if (this.plzlData.zrz === 2) {
+                } else if (+this.plzlData.zrz === 2) {
                     gz += "[自然幢名称]";
                 }
-                if (this.plzlData.ljz === 1) {
+                if (+this.plzlData.ljz === 1) {
                     gz += "[逻辑幢名称]"
-                } else if (this.plzlData.ljz === 2) {
+                } else if (+this.plzlData.ljz === 2) {
                     gz += "[逻辑幢号]"
                 }
-                if (this.plzlData.zdy === 1) {
+                if (+this.plzlData.zdy === 1) {
                     gz += "[幢单元名称]";
-                } else if (this.plzlData.zdy === 2) {
+                } else if (+this.plzlData.zdy === 2) {
                     gz += "[幢单元号]"
                 }
-                if (this.plzlData.c === 1) {
+                if (+this.plzlData.c === 1) {
                     gz += "[名义层]"
-                } else if (this.plzlData.c === 2) {
+                } else if (+this.plzlData.c === 2) {
                     gz += "[实际层]"
                 }
-                if (this.plzlData.h === 1) {
+                if (+this.plzlData.h === 1) {
                     gz += "[室号]"
-                } else if (this.plzlData.h === 2) {
+                } else if (+this.plzlData.h === 2) {
                     gz += "[户号]"
                 }
                 if (this.plzlData.hz !== "") {

@@ -6,6 +6,7 @@
                 width="70%"
                 @close="close"
                 :modal-append-to-body="false"
+                :close-on-click-modal="false"
         >
             <div class="search">
                 <el-row>
@@ -64,6 +65,7 @@
                             <td>不动产权证号</td>
                             <td>权利人</td>
                             <td>坐落</td>
+                            <td>自然幢数量</td>
                         </tr>
                         <tr v-if="Data.length==0">
                             <td colspan="8">
@@ -81,6 +83,7 @@
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.qlr}}</td>
                             <td>{{item.zl}}</td>
+                            <td>{{item.zrzCount}}</td>
                         </tr>
                     </table>
                 </div>
@@ -167,8 +170,14 @@
                 this.getData(this.queryData)
             },
             addData: function (val) {
-                this.$emit("getData", val)
-                if (this.isZdClose) {
+                let flag;
+               this.$emit("getData",
+                    val
+                , i => {
+                    flag = i
+                })
+                console.log(flag,"返回值")
+                if (flag&&this.isZdClose) {
                     this.close();
                 }
             },
@@ -234,9 +243,11 @@
     .noData {
         color: #b2b2b2;
     }
-    .table-bode{
+
+    .table-bode {
         height: 450px;
     }
+
     .page {
         margin-top: 20px;
     }

@@ -237,7 +237,7 @@
                                 <th class="xmmc" width="300px">项目名称</th>
                                 <th class="xmmc">幢信息</th>
                             </tr>
-                            <tr v-for="(item,index) in dzFghData.fwlist" :key="index*Math.random()">
+                            <tr v-for="(item,index) in dzFghData.fwlist" :key="index">
                                 <td class="cz">
                                     <el-button
                                             type="primary"
@@ -258,7 +258,7 @@
                                     </el-select>
                                 </td>
                                 <td class="xmmc">
-                                    <input type="text" v-model="item.xmmc" class="formInput"/>
+                                    <el-input v-model="item.xmmc" ></el-input>
                                 </td>
                                 <td class="zxx">
                                     <div class="fghzxx">
@@ -767,10 +767,10 @@
                     case 'dz':
                         this.dzFghData.fwlist.push(
                             {
-                                "xmmc": "",
-                                "zrzlist": [],
-                                "zrzmclist": [],
-                                "ztype": "zrz"
+                                xmmc: "",
+                                zrzlist: [],
+                                zrzmclist: [],
+                                ztype: "zrz"
                             }
                         );
                         this.dzFghData.olddzbsm = this.dzFgqData.bsm;