Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	src/assets/iconfont/demo_index.html
#	src/assets/iconfont/iconfont.css
#	src/assets/iconfont/iconfont.eot
#	src/assets/iconfont/iconfont.js
#	src/assets/iconfont/iconfont.json
#	src/assets/iconfont/iconfont.svg
#	src/assets/iconfont/iconfont.ttf
#	src/assets/iconfont/iconfont.woff
#	src/assets/iconfont/iconfont.woff2
#	src/components/map/ChangeMap.vue
#	src/views/systemTX/map.vue
#	src/views/systemTX/mapWeight/mapTools.vue
#	src/views/systemTX/mapWeight/sideTools.vue

-VUE_APP_api = 'http://192.168.2.108:8000'
-VUE_APP_api1 = 'http://192.168.2.76:8000'
-VUE_APP_api2 = 'http://192.168.2.108:8006'
-VUE_APP_api5 = 'http://192.168.2.59:8443'
-VUE_APP_api3 = 'https://127.0.0.1:8006'
-VUE_APP_api4 = 'http://127.0.0.1:18080'
+VUE_APP_api = 'https://192.168.2.111:8006'
+VUE_APP_api1 = 'https://127.0.0.1:8006'
+VUE_APP_api2 = 'https://192.168.2.9:8006'
+VUE_APP_api3 = 'https://192.168.2.11:8006' 
+VUE_APP_api4 = 'http://192.168.2.111:18080'
 VUE_APP_name = '开发环境'
 VUE_APP_name = '开发环境'
 NODE_ENV="development"
 NODE_ENV="development"
 VUE_APP_VERSION = 'psh'
 VUE_APP_VERSION = 'psh'

+import request from '@/plugin/axios'
+
+/**
+ * 查询层基本信息
+ */
+export function getQjCDetailById(data) {
+    return request({
+        url: '/system/qjC/getQjCDetailById',
+        method: 'get',
+        params: {
+            id: data,
+        }
+    })
+}
+
+/**
+ * 更新保存层基本信息
+ */
+export function updateQjC(data) {
+    return request({
+        url: '/system/qjC/updateQjC',
+        method: 'put',
+        data: data,
+    })
+}
+

+import request from '@/plugin/axios'
+
+/**
+ * 查询逻辑幢基本信息
+ */
+export function getQjLjzDetailById(data) {
+    return request({
+        url: '/system/qjLjz/getQjLjzDetailById',
+        method: 'get',
+        params: {
+            id: data,
+        }
+    })
+}
+
+/**
+ * 更新保存逻辑幢基本信息
+ */
+export function updateQjLjz(data) {
+    return request({
+        url: '/system/qjLjz/updateQjLjz',
+        method: 'put',
+        data: data,
+    })
+}
+

@@ -44,3 +44,18 @@ export function  getQlrInfoByGlbsm(data) {
         },
         },
     })
     })
 }
 }
+
+/**
+ * 更新权利人共有公用情况
+ */
+export function  updateGyGyQlrQk(glbsm,type,gyqkbsm) {
+    return request({
+        url: '/system/Qlr/updateGyGyQlrQk',
+        method: 'get',
+        params: {
+            glbsm:glbsm,
+            type:type,
+            gyqkbsm:gyqkbsm,
+        },
+    })
+}
\ No newline at end of file

@@ -44,3 +44,29 @@ export function zrzList(data) {
         data:data
         data:data
     })
     })
 }
 }
+
+/**
+ * 查询宗地、自然幢等权属状态
+ * @param bsm
+ */
+export function queryStatus(bsm) {
+    return request({
+        url:"/system/basiccommon/query-status",
+        method:'get',
+        params:{
+            bsm
+        }
+    })
+}
+
+/**
+ * 范围属性变更查询
+ * @param data
+ */
+export function queryFwsxbg(data) {
+    return request({
+        url:"/system/basiccommon/query-fwsxbg",
+        method:"post",
+        data:data
+    })
+}

+import request from '@/plugin/axios'
+
+/**
+ * 查询幢单元基本信息
+ */
+export function getQjZdyDetailById(data) {
+    return request({
+        url: '/system/qjZdy/getQjZdyDetailById',
+        method: 'get',
+        params: {
+            id: data,
+        }
+    })
+}
+
+/**
+ * 更新保存幢单元基本信息
+ */
+export function updateQjZdy(data) {
+    return request({
+        url: '/system/qjZdy/updateQjZdy',
+        method: 'put',
+        data: data,
+    })
+}
+

@@ -227,6 +227,34 @@ ol, ul { list-style:none; }
     right: 6px;
     right: 6px;
     top: 4px;
     top: 4px;
 }
 }
+// 增删操作按钮样式
+.addMinus{
+    border-radius:50%;
+    width: 30px !important;
+    height: 30px !important;
+    font-size: 22px!important;
+    padding: 4px 6px;
+}
+.outAdd,.outAdd:hover:focus{
+    background-color: #2FA5FF!important;
+    border: 1px solid #2FA5FF!important;
+    color: #fff!important;
+}
+.inAdd,.inAdd:hover:focus{
+    border: 1px solid #2FA5FF!important;
+    background-color: #fff!important;
+    color: #2FA5FF!important;
+}
+.outMinus,.outMinus:hover:focus{
+    background-color: #FA6400!important;
+    border: 1px solid #FA6400!important;
+    color: #fff!important;
+}
+.inMinus,.inMinus:hover:focus{
+    border: 1px solid #FA6400!important;
+    background-color: #fff!important;
+    color: #FA6400!important;
+}
 .import{
 .import{
     background-color: #00CACD!important;
     background-color: #00CACD!important;
     border-color: #00CACD!important;
     border-color: #00CACD!important;

@@ -17,7 +17,7 @@
                             <el-button style="border:0;padding:0 10px"  @click="newAddDz">
                             <el-button style="border:0;padding:0 10px"  @click="newAddDz">
                                 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢
                                 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢
                             </el-button>
                             </el-button>
-                            <el-button style="border:0;padding:0 10px"  @click="newAddDz">
+                            <el-button style="border:0;padding:0 10px"  @click="newAddZrz">
                                 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢
                                 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢
                             </el-button>
                             </el-button>
                         </template>
                         </template>
@@ -245,7 +245,7 @@
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.bdcqzh}}</td>
-                            <td>{{item.qlr}}</td>
+                            <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zrzCount}}</td>
                             <td>{{item.zrzCount}}</td>
                         </tr>
                         </tr>
@@ -328,7 +328,7 @@
                             <td>权利人</td>
                             <td>权利人</td>
                             <td>坐落</td>
                             <td>坐落</td>
                         </tr>
                         </tr>
-                        <tr v-if="Data.length==0">
+                        <tr v-if="Data.length===0">
                             <td colspan="8">
                             <td colspan="8">
                                 <span class="noData">暂无数据</span>
                                 <span class="noData">暂无数据</span>
                             </td>
                             </td>
@@ -342,7 +342,7 @@
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.bdcqzh}}</td>
-                            <td>{{item.qlr}}</td>
+                            <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zl}}</td>
                         </tr>
                         </tr>
                     </table>
                     </table>
@@ -424,25 +424,26 @@
         methods: {
         methods: {
             getZdData(id) {
             getZdData(id) {
                 getQjZdjbxxDetailById(id).then(res => {
                 getQjZdjbxxDetailById(id).then(res => {
-                    this.dzhbhData.xzqbsm = res.result.xzqbsm
-                    this.changeXzq(this.dzhbhData.xzqbsm)
-                    this.dzhbhData.djqbsm = res.result.djqbsm
-                    this.changeDjq(this.dzhbhData.djqbsm)
-                    this.dzhbhData.djzqbsm = res.result.djzqbsm
-                    this.dzhbhData.syqlxbsm = res.result.syqlxbsm
-                    this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm
+                    this.dzhbhData.xzqbsm = res.result.xzqbsm;
+                    this.changeXzq(this.dzhbhData.xzqbsm);
+                    this.dzhbhData.djqbsm = res.result.djqbsm;
+                    this.changeDjq(this.dzhbhData.djqbsm);
+                    this.dzhbhData.djzqbsm = res.result.djzqbsm;
+                    this.dzhbhData.syqlxbsm = res.result.syqlxbsm;
+                    this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm;
                 })
                 })
             },
             },
             newAddDz() {
             newAddDz() {
                 this.dzIsVisible = true;
                 this.dzIsVisible = true;
+                this.reset();
                 this.geDztData(this.queryData)
                 this.geDztData(this.queryData)
             },
             },
             newAddZrz() {
             newAddZrz() {
                 this.zrzIsVisible = true;
                 this.zrzIsVisible = true;
+                this.reset();
                 this.geZrztData(this.queryData)
                 this.geZrztData(this.queryData)
             },
             },
             deleteData(index) {
             deleteData(index) {
-                console.log(JSON.stringify(index)+":row")
                 let data = this.dzhbqData[index];
                 let data = this.dzhbqData[index];
                 // 多幢
                 // 多幢
                 if (data.zrzCount) {
                 if (data.zrzCount) {
@@ -453,12 +454,12 @@
                     let zrzIndex = this.zrzList.indexOf(data);
                     let zrzIndex = this.zrzList.indexOf(data);
                     this.zrzList.splice(zrzIndex, 1)
                     this.zrzList.splice(zrzIndex, 1)
                 }
                 }
-                this.dzhbqData.splice(index, 1)
+                this.dzhbqData.splice(index, 1);
                 if (this.dzhbqData.length === 0) {
                 if (this.dzhbqData.length === 0) {
-                    this.dzhbhData.xzqbsm = ""
-                    this.dzhbhData.djqbsm = ""
-                    this.dzhbhData.djzqbsm = ""
-                    this.dzhbhData.syqlxbsm = ""
+                    this.dzhbhData.xzqbsm = "";
+                    this.dzhbhData.djqbsm = "";
+                    this.dzhbhData.djzqbsm = "";
+                    this.dzhbhData.syqlxbsm = "";
                     this.dzhbhData.zdtzmbsm = ""
                     this.dzhbhData.zdtzmbsm = ""
                 }
                 }
             },
             },
@@ -473,22 +474,30 @@
             },
             },
             currentChange(val) {
             currentChange(val) {
                 this.queryData.pageNo = val;
                 this.queryData.pageNo = val;
+                if (this.dzIsVisible) {
                     this.geDztData(this.queryData);
                     this.geDztData(this.queryData);
+                }else {
+                    this.geZrztData(this.queryData)
+                }
             },
             },
             geDztData(data) {
             geDztData(data) {
                 dzList(data).then(res => {
                 dzList(data).then(res => {
-                    this.Data = res.result.records
+                    this.Data = res.result.records;
                     this.total = res.result.total;
                     this.total = res.result.total;
                 })
                 })
             },
             },
             geZrztData(data) {
             geZrztData(data) {
                 zrzList(data).then(res => {
                 zrzList(data).then(res => {
-                    this.Data = res.result.records
+                    this.Data = res.result.records;
                     this.total = res.result.total;
                     this.total = res.result.total;
                 })
                 })
             },
             },
             search() {
             search() {
-                this.geDztData(this.queryData)
+                if (this.dzIsVisible) {
+                    this.geDztData(this.queryData);
+                }else {
+                    this.geZrztData(this.queryData)
+                }
             },
             },
             addData(data) {
             addData(data) {
                 if (this.dzhbqData.length === 0) {
                 if (this.dzhbqData.length === 0) {
@@ -502,7 +511,7 @@
                 let arr = [];
                 let arr = [];
                 arr = this.dzhbqData.filter(i => i.bsm === data.bsm);
                 arr = this.dzhbqData.filter(i => i.bsm === data.bsm);
                 if (arr.length > 0) {
                 if (arr.length > 0) {
-                    this.$message.info("当前多幢已选择,请重新选择")
+                    this.$message.info("当前多幢已选择,请重新选择");
                     return
                     return
                 }
                 }
                 arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm);
                 arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm);
@@ -610,13 +619,17 @@
                     pageNo: 1,
                     pageNo: 1,
                     pageSize: 10
                     pageSize: 10
                 };
                 };
-                this.geDztData(this.queryData)
+                if (this.dzIsVisible) {
+                    this.geDztData(this.queryData);
+                }else {
+                    this.geZrztData(this.queryData)
+                }
             },
             },
         },
         },
         watch: {
         watch: {
             zdbsm: function (bsm) {
             zdbsm: function (bsm) {
                 this.getZdData(bsm)
                 this.getZdData(bsm)
-            }
+            },
         }
         }
     }
     }
 </script>
 </script>
@@ -652,6 +665,7 @@
         }
         }
 
 
         .header-button {
         .header-button {
+            z-index: 3;
             width: 1624px;
             width: 1624px;
             height: 50px;
             height: 50px;
             position: fixed;
             position: fixed;

@@ -56,17 +56,18 @@
                 <div class="table-bode">
                 <div class="table-bode">
                     <table border="1">
                     <table border="1">
                         <tr>
                         <tr>
-                            <td>序号</td>
-                            <td>操作</td>
-                            <td>宗地代码</td>
-                            <td>不动产单元号</td>
-                            <td>项目名称</td>
-                            <td>不动产权证号</td>
-                            <td>权利人</td>
-                            <td>坐落</td>
+                            <th>序号</th>
+                            <th>操作</th>
+                            <th>宗地代码</th>
+                            <th>不动产单元号</th>
+                            <th>项目名称</th>
+                            <th>不动产权证号</th>
+                            <th>权利人</th>
+                            <th>坐落</th>
+                            <th>自然幢数量</th>
                         </tr>
                         </tr>
-                        <tr v-if="Data.length==0">
-                            <td colspan="8">
+                        <tr v-if="Data.length===0">
+                            <td colspan="9">
                                 <span class="noData">暂无数据</span>
                                 <span class="noData">暂无数据</span>
                             </td>
                             </td>
                         </tr>
                         </tr>
@@ -79,8 +80,9 @@
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.bdcqzh}}</td>
-                            <td>{{item.qlr}}</td>
+                            <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zl}}</td>
+                            <td>{{item.zrzCount}}</td>
                         </tr>
                         </tr>
                     </table>
                     </table>
                 </div>
                 </div>
@@ -208,7 +210,9 @@
             background-color: #F5F7FA;
             background-color: #F5F7FA;
         }
         }
     }
     }
-
+    th{
+        height: 36px;
+    }
     td {
     td {
         text-align: center;
         text-align: center;
         height: 36px;
         height: 36px;

@@ -53,8 +53,8 @@
 						:class="childIndex > 0 ? 'childYT' : ''"
 						:class="childIndex > 0 ? 'childYT' : ''"
 					>
 					>
 						<ul>
 						<ul>
-							<li>批准用途</li>
-							<li>实际用途</li>
+							<li><i class="requisite">*</i>批准用途</li>
+							<li><i class="requisite">*</i>实际用途</li>
 							<li><i class="requisite">*</i>土地使用起始时间</li>
 							<li><i class="requisite">*</i>土地使用起始时间</li>
 						</ul>
 						</ul>
 					</el-col>
 					</el-col>
@@ -69,6 +69,7 @@
 									class="formSelect percent30"
 									class="formSelect percent30"
 									v-if="show"
 									v-if="show"
 									:default-expand-all="defaultExpandAll"
 									:default-expand-all="defaultExpandAll"
+									ref="pzytdm"
 									:multiple="multiple"
 									:multiple="multiple"
 									:placeholder="placeholder"
 									:placeholder="placeholder"
 									:disabled="formData.qszt!='0'"
 									:disabled="formData.qszt!='0'"
@@ -84,6 +85,7 @@
 									class="formSelect percent30"
 									class="formSelect percent30"
 									v-if="show"
 									v-if="show"
 									:default-expand-all="defaultExpandAll"
 									:default-expand-all="defaultExpandAll"
+									ref="sjytdm"
 									:multiple="multiple"
 									:multiple="multiple"
 									:placeholder="placeholder"
 									:placeholder="placeholder"
 									:disabled="formData.qszt!='0'"
 									:disabled="formData.qszt!='0'"
@@ -234,8 +236,8 @@
 						:class="childIndex > 0 ? 'childYT' : ''"
 						:class="childIndex > 0 ? 'childYT' : ''"
 					>
 					>
 						<ul>
 						<ul>
-							<li>批准用途</li>
-							<li>实际用途</li>
+							<li><i class="requisite">*</i>批准用途</li>
+							<li><i class="requisite">*</i>实际用途</li>
 							<li><i class="requisite">*</i>土地使用起始时间</li>
 							<li><i class="requisite">*</i>土地使用起始时间</li>
 						</ul>
 						</ul>
 					</el-col>
 					</el-col>
@@ -249,6 +251,7 @@
 								<el-select-tree
 								<el-select-tree
 									v-if="show"
 									v-if="show"
 									:default-expand-all="defaultExpandAll"
 									:default-expand-all="defaultExpandAll"
+									ref="pzytdm"
 									:multiple="multiple"
 									:multiple="multiple"
 									:placeholder="placeholder"
 									:placeholder="placeholder"
 									:disabled="disabled"
 									:disabled="disabled"
@@ -263,6 +266,7 @@
 								<el-select-tree
 								<el-select-tree
 									v-if="show"
 									v-if="show"
 									:default-expand-all="defaultExpandAll"
 									:default-expand-all="defaultExpandAll"
+									ref="sjytdm"
 									:multiple="multiple"
 									:multiple="multiple"
 									:placeholder="placeholder"
 									:placeholder="placeholder"
 									:disabled="disabled"
 									:disabled="disabled"
@@ -627,6 +631,20 @@ export default {
 							// val:this.$refs.tdsyjssj[temp+ind].value,
 							// val:this.$refs.tdsyjssj[temp+ind].value,
 							rule: /^\s*$/g, //非空
 							rule: /^\s*$/g, //非空
 						},
 						},
+						{
+							data:item.list[ind].pzytdm,
+							name:'批准用途',
+							dom:this.$refs.pzytdm[temp+ind],
+							// val:this.$refs.tdsyjssj[temp+ind].value,
+							rule: /^\s*$/g, //非空
+						},
+						{
+							data:item.list[ind].sjytdm,
+							name:'实际用途',
+							dom:this.$refs.sjytdm[temp+ind],
+							// val:this.$refs.tdsyjssj[temp+ind].value,
+							rule: /^\s*$/g, //非空
+						},
 					)
 					)
 					if(this.hasSyqx){
 					if(this.hasSyqx){
 						rules.push(
 						rules.push(
@@ -696,10 +714,18 @@ export default {
 	watch:{
 	watch:{
 		countList: {
 		countList: {
 			handler : function (newVal, oldVal) {
 			handler : function (newVal, oldVal) {
-				newVal.forEach((item,ind)=>{
-					if(item.qlxzdm != ''){
+				newVal.forEach((i,ind)=>{
+					i.list.forEach((item,index)=>{
+						if(item.qlxzdm != '' &&item.qlxzdm != null){
 							this.$refs.qlxzdm[ind].$el.style.border=""
 							this.$refs.qlxzdm[ind].$el.style.border=""
 						}
 						}
+						if(item.sjytdm != '' &&item.sjytdm != null){
+							this.$refs.sjytdm[ind].$el.style.border=""
+						}
+						if(item.pzytdm != '' &&item.pzytdm != null){
+							this.$refs.pzytdm[ind].$el.style.border=""
+						}
+					})
 				})
 				})
 			},
 			},
 			deep:true
 			deep:true
@@ -868,6 +894,9 @@ export default {
 			margin-top: 16px;
 			margin-top: 16px;
 		}
 		}
 	}
 	}
+	.tdytAdd{
+		width: 100px;
+	}
 	.tdytAdd,.tdytMinus{
 	.tdytAdd,.tdytMinus{
 		span{
 		span{
 			font-size: 14px;
 			font-size: 14px;

@@ -62,9 +62,9 @@
             </div>
             </div>
             <div class="footer">
             <div class="footer">
                 <el-button type="primary" @click="save">保存</el-button>
                 <el-button type="primary" @click="save">保存</el-button>
-                <el-button type="primary" @click="cancel">取消</el-button>
+                <el-button type="primary" @click="close">取消</el-button>
             </div>
             </div>
-            <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
+            <zd-query-data :isCxlz = true :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
                         :isZdClose="true"></zd-query-data>
                         :isZdClose="true"></zd-query-data>
         </el-dialog>
         </el-dialog>
 </template>
 </template>
@@ -160,9 +160,6 @@
                 };
                 };
                 this.hcxlzData.bsms = this.bsms;
                 this.hcxlzData.bsms = this.bsms;
             },
             },
-            cancel() {
-                this.close();
-            },
             save() {
             save() {
                 if (this.hcxlzData.zrzbsm === '') {
                 if (this.hcxlzData.zrzbsm === '') {
                     Message.error("请选择自然幢");
                     Message.error("请选择自然幢");
@@ -170,7 +167,14 @@
                 }
                 }
                 hzl(this.hcxlzData).then(res => {
                 hzl(this.hcxlzData).then(res => {
                     if (res.success) {
                     if (res.success) {
-                        this.close();
+                        this.$router.push({
+                            path:'zrz',
+                            query: {
+                                bsm:this.hcxlzData.zrzbsm,
+                                source: 2,
+                                auth: '0,1,2'
+                            }
+                        })
                     } else {
                     } else {
                         Message.error(res.message)
                         Message.error(res.message)
                     }
                     }

@@ -54,6 +54,10 @@
 					:data-zdbsm="item.zdbsm"
 					:data-zdbsm="item.zdbsm"
 					:title=item.mc
 					:title=item.mc
 				>
 				>
+					<span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)" style="background: #9e9b9b">
+						<span class="qsztFont">变</span> 
+					</span>
+					<template v-else>
 						<span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; ">
 						<span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; ">
 							<span class="qsztFont">临</span> 
 							<span class="qsztFont">临</span> 
 						</span>
 						</span>
@@ -63,6 +67,7 @@
 						<span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; ">
 						<span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; ">
 							<span class="qsztFont">现</span> 
 							<span class="qsztFont">现</span> 
 						</span>
 						</span>
+					</template>
 
 
 					<!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
 					<!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
 					<img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
 					<img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
@@ -248,8 +253,7 @@ export default {
 				default:
 				default:
 					break;
 					break;
 			}
 			}
-			
-			if(item.type){
+			if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'||item.type == 'gzw'){
 				this.$router.push({
 				this.$router.push({
 					path: '/'+item.type,
 					path: '/'+item.type,
 					query:{
 					query:{

 <template>
 <template>
     <div>
     <div>
         <el-dialog v-dialogDrag :close-on-click-modal="false"
         <el-dialog v-dialogDrag :close-on-click-modal="false"
-                title="新增"
+                title="批量户"
                 :visible.sync="isVisible"
                 :visible.sync="isVisible"
-                width="70%"
+                width="72%"
                 @close="close"
                 @close="close"
                 :modal-append-to-body="false"
                 :modal-append-to-body="false"
                 >
                 >
@@ -25,7 +25,7 @@
                         <td colspan="2">其他建筑面积(㎡)</td>
                         <td colspan="2">其他建筑面积(㎡)</td>
                         <td colspan="4"><input type="text"  v-model="form.qtjzmj" class="inputtitle"/></td>
                         <td colspan="4"><input type="text"  v-model="form.qtjzmj" class="inputtitle"/></td>
                         <td colspan="2">分摊系数</td>
                         <td colspan="2">分摊系数</td>
-                        <td colspan="4"><input type="text"  v-model="form.ftxs" class="inputtitle"/></td>
+                        <td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
                         <td colspan="2">户型</td>
                         <td colspan="2">户型</td>
@@ -116,11 +116,11 @@
                         <td colspan="5">
                         <td colspan="5">
                             <el-select class="selectTitle"  v-model="form.fwjgbsm">
                             <el-select class="selectTitle"  v-model="form.fwjgbsm">
                                 <el-option
                                 <el-option
-                                        v-for="i in $store.state.fwjgList"
-                                        :key="i.bsm"
-                                        :label="i.mc"
-                                        :value="i.bsm"
-                                ></el-option>
+                                    v-for="item in  $store.state.jgOptions"
+                                    :key="item.bsm"
+                                    :label="item.mc"
+                                    :value="item.bsm">
+                                </el-option>
                             </el-select>
                             </el-select>
                         </td>
                         </td>
                     </tr>
                     </tr>
@@ -177,7 +177,7 @@
                         <td   colspan="9"  >
                         <td   colspan="9"  >
                             <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
                             <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
                                 <el-option
                                 <el-option
-                                        v-for="item in $store.state.fwjgList"
+                                    v-for="item in  $store.state.jgOptions"
                                     :key="item.bsm"
                                     :key="item.bsm"
                                     :label="item.mc"
                                     :label="item.mc"
                                     :value="item.bsm">
                                     :value="item.bsm">
@@ -187,13 +187,10 @@
                     </tr>
                     </tr>
 
 
                     <tr>
                     <tr>
-                        <td colspan="12" rowspan="4" align="center">
+                        <td colspan="12" align="center">
                             <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
                             <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
                         </td>
                         </td>
                     </tr>
                     </tr>
-                    <tr></tr>
-                    <tr></tr>
-                    <tr></tr>
 
 
                     <tr>
                     <tr>
                         <td colspan="2">东墙体归属</td>
                         <td colspan="2">东墙体归属</td>
@@ -315,6 +312,16 @@
             }
             }
         },
         },
         methods: {
         methods: {
+
+            inputBlur(e){
+                if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){
+                    e.target.style.border=""
+                }else{
+                    e.target.style.border="1px solid red";
+                    e.target.style.boxSizing = 'border-box';
+                }
+            },
+
             lodding:function(){
             lodding:function(){
                 this.$emit('lodding')
                 this.$emit('lodding')
             },
             },
@@ -360,7 +367,7 @@
             close: function () {
             close: function () {
                 this.$emit('close')
                 this.$emit('close')
                 this.isVisible = false
                 this.isVisible = false
-                this.result()
+                this.reset()
             },
             },
             reset: function () {
             reset: function () {
                 this.form={
                 this.form={
@@ -411,8 +418,36 @@
                 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
                 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
             },
             },
             save: function () {
             save: function () {
+
+                this.rules=[
+                    {
+                        data:this.form.ftxs,
+                        name:'分摊系数',
+                        dom:this.$refs.ftxs,
+                        rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
+                    },
+                ];
+                let flag = true;
+                this.rules.forEach(item=>{
+                    if(item.data !==""){
+                        if(!item.rule.test(+item.data) || item.data == null){
+                            if(item.dom.$el){
+                                item.dom.$el.style.border = '1px solid red';
+                                item.dom.$el.style.boxSizing = 'border-box';
+                            }else{
+                                item.dom.style.border = '1px solid red';
+                                item.dom.style.boxSizing = 'border-box';
+                            }
+                            flag = false;
+                            return false
+                        }
+                    }
+                })
+
                 this.form['hbsms'] = this.bsms
                 this.form['hbsms'] = this.bsms
                 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
                 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
+                this.$nextTick(()=> {
+                    if (flag) {
                         for(let i=0;i< this.form.fwjgList.length;i++){
                         for(let i=0;i< this.form.fwjgList.length;i++){
                             if(this.form.fwjgList[i].fwjgzdbsm===''){
                             if(this.form.fwjgList[i].fwjgzdbsm===''){
                                 this.form.fwjgList.splice(i,1);
                                 this.form.fwjgList.splice(i,1);
@@ -440,6 +475,14 @@
                                 this.close();
                                 this.close();
                             }
                             }
                         })
                         })
+                    }else{
+                        this.$message({
+                            // message: item.name+'不能为空',
+                            message: '表单数据有误',
+                            type: "warning",
+                        });
+                    }
+                })
             },
             },
             cancel: function () {
             cancel: function () {
                this.close()
                this.close()

@@ -10,26 +10,26 @@
             <div>
             <div>
                 <table border="1">
                 <table border="1">
                     <tr>
                     <tr>
-                        <td>前缀</td>
-                        <td>宗地</td>
-                        <td>自然幢</td>
-                        <td>逻辑幢</td>
-                        <td>幢单元</td>
-                        <td>层</td>
-                        <td>户</td>
-                        <td>后缀</td>
+                        <th>前缀</th>
+                        <th>宗地</th>
+                        <th>自然幢</th>
+                        <th>逻辑幢</th>
+                        <th>幢单元</th>
+                        <th>层</th>
+                        <th>户</th>
+                        <th>后缀</th>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
                         <td>
                         <td>
-                            <input type="text" class="inputtitle" v-model="plzlData.qz"/>
+                            <el-input v-model="plzlData.qz"></el-input>
                         </td>
                         </td>
                         <td>
                         <td>
                             <el-select v-model="plzlData.zd">
                             <el-select v-model="plzlData.zd">
                                 <el-option v-for="i in zdgz"
                                 <el-option v-for="i in zdgz"
                                            :key="i.label"
                                            :key="i.label"
                                            :label="i.label"
                                            :label="i.label"
-                                           :value="i.value">
-
+                                           :value="i.value"
+                                           :disabled="i.disabled">
                                 </el-option>
                                 </el-option>
                             </el-select>
                             </el-select>
                         </td>
                         </td>
@@ -38,8 +38,8 @@
                                 <el-option v-for="i in zrzgz"
                                 <el-option v-for="i in zrzgz"
                                            :key="i.label"
                                            :key="i.label"
                                            :label="i.label"
                                            :label="i.label"
-                                           :value="i.value">
-
+                                           :value="i.value"
+                                           :disabled="i.disabled">
                                 </el-option>
                                 </el-option>
                             </el-select>
                             </el-select>
                         </td>
                         </td>
@@ -84,7 +84,7 @@
                             </el-select>
                             </el-select>
                         </td>
                         </td>
                         <td>
                         <td>
-                            <input type="text" class="inputtitle" v-model="plzlData.hz"/>
+                            <el-input v-model="plzlData.hz"></el-input>
                         </td>
                         </td>
                     </tr>
                     </tr>
                 </table>
                 </table>
@@ -132,22 +132,27 @@
                 zdgz: [
                 zdgz: [
                     {
                     {
                         label: '宗地坐落',
                         label: '宗地坐落',
-                        value: '1'
+                        value: '1',
+                        disabled: false
                     }, {
                     }, {
                         label: "宗地名称",
                         label: "宗地名称",
-                        value: '2'
+                        value: '2',
+                        disabled: false
                     }, {
                     }, {
                         label: "空",
                         label: "空",
-                        value: '3'
+                        value: '3',
+                        disabled: false
                     }
                     }
                 ],
                 ],
                 zrzgz: [
                 zrzgz: [
                     {
                     {
                         label: '自然幢坐落',
                         label: '自然幢坐落',
-                        value: '1'
+                        value: '1',
+                        disabled: false
                     }, {
                     }, {
                         label: "自然幢名称",
                         label: "自然幢名称",
-                        value: '2'
+                        value: '2',
+                        disabled: false
                     }, {
                     }, {
                         label: "空",
                         label: "空",
                         value: '3'
                         value: '3'
@@ -305,6 +310,13 @@
         watch: {
         watch: {
             plZlVisible: function (val) {
             plZlVisible: function (val) {
                 this.isVisible = val
                 this.isVisible = val
+            },
+            plzlData: {
+                handler(val) {
+                    this.zrzgz[0].disabled = +val.zd === 1;
+                    this.zdgz[0].disabled = +val.zrz === 1;
+                },
+                deep: true
             }
             }
         }
         }
     }
     }
@@ -321,6 +333,10 @@
         }
         }
     }
     }
 
 
+    th {
+        height: 36px;
+    }
+
     td {
     td {
         text-align: center;
         text-align: center;
         height: 36px;
         height: 36px;

@@ -2,7 +2,7 @@
 	<el-row class="box">
 	<el-row class="box">
 		<el-col :span="24">
 		<el-col :span="24">
 			<el-row>
 			<el-row>
-				<el-col :span="24">
+				<el-col :span="18">
 					<el-form :inline="true" class="demo-form-inline" label-width="106px">
 					<el-form :inline="true" class="demo-form-inline" label-width="106px">
 						<el-form-item label="宗地编码">
 						<el-form-item label="宗地编码">
 							<el-input
 							<el-input
@@ -18,14 +18,17 @@
 									@change="query"
 									@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
-						<el-form-item label="不动产单元号">
-							<el-input
+						<el-form-item label="不动产单元号" >
+							<el-input style="width: 280px;"
 								maxlength="28"
 								maxlength="28"
 								v-model="queryData.bdcdyh"
 								v-model="queryData.bdcdyh"
 								placeholder="输入不动产单元号"
 								placeholder="输入不动产单元号"
 								@change="query"
 								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
+					</el-form>
+				</el-col>
+				<el-col :span="6" aria-rowspan="3">
 					<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
 					<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
 					<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
 					<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
 					<el-button 
 					<el-button 
@@ -34,11 +37,10 @@
 						>更多查询
 						>更多查询
 					</el-button>
 					</el-button>
 						<!-- @click="ismore = !ismore" -->
 						<!-- @click="ismore = !ismore" -->
-					</el-form>
 				</el-col>
 				</el-col>
 			</el-row>
 			</el-row>
 			<el-row class="row3"  v-if="ismore">
 			<el-row class="row3"  v-if="ismore">
-				<el-col :span="22">
+				<el-col :span="18">
 					<el-form :inline="true" class="demo-form-inline" label-width="106px">
 					<el-form :inline="true" class="demo-form-inline" label-width="106px">
 						<el-form-item label="权利人名称">
 						<el-form-item label="权利人名称">
 							<el-input
 							<el-input
@@ -55,7 +57,7 @@
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
 						<el-form-item label="不动产权证号">
 						<el-form-item label="不动产权证号">
-							<el-input
+							<el-input style="width: 280px;"
 								placeholder="输入不动产权证号"
 								placeholder="输入不动产权证号"
 								v-model="queryData.bdcqzh"
 								v-model="queryData.bdcqzh"
 								@change="query"
 								@change="query"
@@ -63,11 +65,11 @@
 						</el-form-item>
 						</el-form-item>
 					</el-form>
 					</el-form>
 				</el-col>
 				</el-col>
-				<el-col :span="2" :offset="offset">
-				</el-col>
+				<!-- <el-col :span="2" :offset="offset">
+				</el-col> -->
 			</el-row>
 			</el-row>
 			<el-row>
 			<el-row>
-				<el-col :span="24">
+				<el-col :span="18">
 					<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
 					<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
 						<el-form-item class="demo-form-inline" label="单元范围">
 						<el-form-item class="demo-form-inline" label="单元范围">
 							<el-checkbox-group v-model="queryData.dylxs" @change="query">
 							<el-checkbox-group v-model="queryData.dylxs" @change="query">
@@ -83,8 +85,6 @@
 						</el-form-item>
 						</el-form-item>
 					</el-form>
 					</el-form>
 				</el-col>
 				</el-col>
-				<el-col :span="2">
-				</el-col>
 			</el-row>
 			</el-row>
 		</el-col>
 		</el-col>
 	</el-row>
 	</el-row>

@@ -56,17 +56,18 @@
                 <div class="table-bode">
                 <div class="table-bode">
                     <table border="1">
                     <table border="1">
                         <tr>
                         <tr>
-                            <td>序号</td>
-                            <td>操作</td>
-                            <td>宗地代码</td>
-                            <td>不动产单元号</td>
-                            <td>项目名称</td>
-                            <td>不动产权证号</td>
-                            <td>权利人</td>
-                            <td>坐落</td>
+                            <th>序号</th>
+                            <th>操作</th>
+                            <th>宗地代码</th>
+                            <th>不动产单元号</th>
+                            <th>项目名称</th>
+                            <th>不动产权证号</th>
+                            <th>权利人</th>
+                            <th>坐落</th>
+                            <th v-if="isCxlz">自然幢数量</th>
                         </tr>
                         </tr>
                         <tr v-if="Data.length===0">
                         <tr v-if="Data.length===0">
-                            <td colspan="8">
+                            <td :colspan="isCxlz ? 9:8">
                                 <span class="noData">暂无数据</span>
                                 <span class="noData">暂无数据</span>
                             </td>
                             </td>
                         </tr>
                         </tr>
@@ -79,8 +80,9 @@
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.bdcqzh}}</td>
-                            <td>{{item.qlr}}</td>
+                            <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zl}}</td>
+                            <td  v-if="isCxlz">{{item.zrzCount}}</td>
                         </tr>
                         </tr>
                     </table>
                     </table>
                 </div>
                 </div>
@@ -132,6 +134,10 @@
             isZdClose: {
             isZdClose: {
                 type: Boolean,
                 type: Boolean,
                 default: false
                 default: false
+            },
+            isCxlz:{
+                type: Boolean,
+                default: false
             }
             }
         },
         },
         mounted() {
         mounted() {
@@ -167,7 +173,11 @@
                 this.getData(this.queryData)
                 this.getData(this.queryData)
             },
             },
             addData: function (val) {
             addData: function (val) {
-               this.$emit("getData",val)
+                if (this.isCxlz &&val.zrzCount < 1) {
+                    this.$message.warning("当前宗地下没有自然幢,请重新选择")
+                    return
+                }
+               this.$emit("getData",val);
             },
             },
             isClose(flag){
             isClose(flag){
 
 
@@ -208,7 +218,9 @@
             background-color: #F5F7FA;
             background-color: #F5F7FA;
         }
         }
     }
     }
-
+    th{
+        height: 36px;
+    }
     td {
     td {
         text-align: center;
         text-align: center;
         height: 36px;
         height: 36px;

@@ -453,7 +453,7 @@ export default {
 				cursor: pointer;
 				cursor: pointer;
 				height: 72px;
 				height: 72px;
 				padding: 0 30px;
 				padding: 0 30px;
-				font-size: 20px;
+				font-size: 18px;
 				line-height: 72px;
 				line-height: 72px;
 				float: left;
 				float: left;
 				position: relative;
 				position: relative;
@@ -462,7 +462,7 @@ export default {
     			/*border-right: 1px solid #EAEAEA;*/
     			/*border-right: 1px solid #EAEAEA;*/
 				i {
 				i {
 					margin-right: 6px;
 					margin-right: 6px;
-					font-size: 22px;
+					font-size: 18px;
 					position: relative;
 					position: relative;
 					top: 1px;
 					top: 1px;
 				}
 				}

 <template>
 <template>
     <div class="content_box">
     <div class="content_box">
-        <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
+        <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"  type="border-card" >
             <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
             <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
-            <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
+            <el-tab-pane label="附件材料" name="fjcl">
+                <fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
         </el-tabs>
         </el-tabs>
     </div>
     </div>
 </template>
 </template>
@@ -10,6 +11,7 @@
 <script>
 <script>
     import dzxx from "./dzxx";
     import dzxx from "./dzxx";
     import fjcl from "./../zd/fjcl/fjcl"
     import fjcl from "./../zd/fjcl/fjcl"
+    import {queryStatus} from "@api/search"
     export default {
     export default {
         name: "",
         name: "",
         components: {
         components: {
@@ -18,13 +20,24 @@
         props: {},
         props: {},
         data() {
         data() {
             return {
             return {
+                isDisabled:false,
                 activeName: "dzxx",
                 activeName: "dzxx",
                 dzJbxxVisble:true,
                 dzJbxxVisble:true,
                 fjclVisible:false
                 fjclVisible:false
             };
             };
         },
         },
         methods: {
         methods: {
+            loadingStatus() {
+                let bsm=this.$store.state.dzbsm;
+                queryStatus(bsm).then(res => {
+                    if (res.success) {
+                        let qszt = res.result.qszt;
+                        this.isDisabled = +qszt !== 0;
+                    }
+                })
+            },
             handleClick(tab, event) {
             handleClick(tab, event) {
+                this.loadingStatus();
                 switch (tab.name) {
                 switch (tab.name) {
                     case 'dzxx':
                     case 'dzxx':
                         this.dzJbxxVisble = true;
                         this.dzJbxxVisble = true;
@@ -43,4 +56,22 @@
         watch: {},
         watch: {},
     };
     };
 </script>
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less">
+	.el-tabs{
+		height: calc(100% - 50px);
+		/deep/.el-tabs__content{
+			//height: 100%;
+			 /deep/.el-tab-pane{
+			 	height: 100%;
+			 }
+			background: #eaedf5;
+			padding: 0;
+		}
+		/deep/ .el-tabs__item {
+			height: 48px;
+		}
+		/deep/ .el-tabs__header{
+			background-color: #ffffff;
+		}
+	}
+</style>

 <template>
 <template>
     <div class="gzw content-form">
     <div class="gzw content-form">
         <el-form ref="form" :model="form" label-width="160px">
         <el-form ref="form" :model="form" label-width="160px">
-            <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr>
+            <Qlr ref="qlrxxModule" :bsm="bsm" :type="lx"></Qlr>
             <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable">
             <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable">
                 <tr height="30">
                 <tr height="30">
                     <th colspan="12"><font size="4"></font>构筑物基本信息</th>
                     <th colspan="12"><font size="4"></font>构筑物基本信息</th>
@@ -13,17 +13,17 @@
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >项目名称</td>
                     <td  colspan="2" align="center"  >项目名称</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'">
+                        <input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="xmmc">
                     </td>
                     </td>
                 </tr>
                 </tr>
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >坐落</td>
                     <td  colspan="2" align="center"  >坐落</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'">
+                        <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl">
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >不动产单元号</td>
                     <td  colspan="2" align="center"  >不动产单元号</td>
                     <td  colspan="4"  class="psr">
                     <td  colspan="4"  class="psr">
-                        <input class="formInput percent80"  maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'">
+                        <input class="formInput percent80"  maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh">
                         <el-button @click.prevent="generatorCode"  size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>
                         <el-button @click.prevent="generatorCode"  size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>
                     </td>
                     </td>
                 </tr>
                 </tr>
@@ -114,6 +114,7 @@
                     label: 'mc'
                     label: 'mc'
                 },
                 },
 
 
+                lx:'gzw',
                 bsm:'',
                 bsm:'',
                 form:{
                 form:{
                     zdzhdm:'',
                     zdzhdm:'',
@@ -129,6 +130,7 @@
                     bsm:'',
                     bsm:'',
                 },
                 },
                 zdbsm:'',
                 zdbsm:'',
+                rules:[],
             }
             }
         },
         },
         methods:{
         methods:{
@@ -140,6 +142,16 @@
                     }
                     }
                 })
                 })
             },
             },
+
+            inputBlur(e) {
+                if (e.target.value != '') {
+                    e.target.style.border = ""
+                } else {
+                    e.target.style.border = "1px solid red";
+                    e.target.style.boxSizing = 'border-box';
+                }
+            },
+
             generatorCode(){
             generatorCode(){
                 if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){
                 if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){
                     this.open();
                     this.open();
@@ -182,6 +194,45 @@
                 });
                 });
             },
             },
             onSave(){
             onSave(){
+
+                this.rules=[
+                    {
+                        data:this.form.bdcdyh,
+                        name:'不动产单元号',
+                        dom:this.$refs.bdcdyh,
+                        rule: /^\s*$/g, //非空
+                    },
+                    {
+                        data:this.form.xmmc,
+                        name:'项目名称',
+                        dom:this.$refs.xmmc,
+                        rule: /^\s*$/g, //非空
+                    },
+                    {
+                        data:this.form.zl,
+                        name:'坐落',
+                        dom:this.$refs.zl,
+                        rule: /^\s*$/g, //非空
+                    },
+                ]
+
+                let flag = true;
+                this.rules.forEach(item=>{
+                    if(item.rule.test(item.data) || item.data == null){
+                        if(item.dom.$el){
+                            item.dom.$el.style.border = '1px solid red';
+                            item.dom.$el.style.boxSizing = 'border-box';
+                        }else{
+                            item.dom.style.border = '1px solid red';
+                            item.dom.style.boxSizing = 'border-box';
+                        }
+                        flag = false;
+                        return false
+                    }
+                })
+
+                this.$nextTick(()=> {
+                    if (flag) {
                         console.log(this.form,'this.form');
                         console.log(this.form,'this.form');
                         this.bsm=this.$route.query.bsm;
                         this.bsm=this.$route.query.bsm;
                         this.form.bsm=this.bsm;
                         this.form.bsm=this.bsm;
@@ -191,6 +242,10 @@
                                 this.$message.success("保存完成!");
                                 this.$message.success("保存完成!");
                             }
                             }
                         })
                         })
+                    }
+                })
+
+
             },
             },
             getGzwDetailInfo(data){
             getGzwDetailInfo(data){
                 getQjGzwDetailInfo(data).then((res)=>{
                 getQjGzwDetailInfo(data).then((res)=>{
@@ -206,6 +261,9 @@
                         this.form.qszt = res.result.qszt;
                         this.form.qszt = res.result.qszt;
                         this.zdbsm = res.result.zdzhbsm;
                         this.zdbsm = res.result.zdzhbsm;
                         this.getZddm(this.zdbsm);
                         this.getZddm(this.zdbsm);
+                        if(res.result.gygyqlrqk!=null){
+                            this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk);
+                        }
                     }
                     }
                 })
                 })
             },
             },
@@ -219,6 +277,7 @@
                     if(res.code===200){
                     if(res.code===200){
                         this.$message.success("提交完成！");
                         this.$message.success("提交完成！");
                         this.getGzwDetailInfo(this.bsm)
                         this.getGzwDetailInfo(this.bsm)
+                        this.getTreeByBsm(this.bsm,'gzw','0,1,2')
                     }
                     }
                 })
                 })
             },
             },
@@ -252,6 +311,12 @@
                 this.getGzwDetailInfo(val)
                 this.getGzwDetailInfo(val)
                 this.reload()
                 this.reload()
             },
             },
+
+            "form.bdcdyh":function (val) {
+                if (val != '') {
+                    this.$refs.bdcdyh.style.border = '';
+                }
+            },
         }
         }
     }
     }
 </script>
 </script>

 <template>
 <template>
 	<div id="login">
 	<div id="login">
-		<img class="login-logo" src="./images/logo-login.svg" />
+		<div class="login-logo"><img  src="./images/logo-login.png" /></div>
 		<div class="login-con">
 		<div class="login-con">
-			<div class="login-title">用户登录</div>
+<!--			<div class="login-title">用户登录</div>-->
 			<div class="login-user" :class="{ 'select-border': change.user }">
 			<div class="login-user" :class="{ 'select-border': change.user }">
 				<img class="user-icon" src="./images/user.svg" />
 				<img class="user-icon" src="./images/user.svg" />
-				<div class="line-mid"></div>
+<!--				<div class="line-mid"></div>-->
 				<input
 				<input
 					type="text"
 					type="text"
 					class="user-input"
 					class="user-input"
@@ -18,7 +18,7 @@
 			</div>
 			</div>
 			<div class="login-user user-mt" :class="{ 'select-border': change.pass }">
 			<div class="login-user user-mt" :class="{ 'select-border': change.pass }">
 				<img class="user-icon" src="./images/password.svg" />
 				<img class="user-icon" src="./images/password.svg" />
-				<div class="line-mid"></div>
+<!--				<div class="line-mid"></div>-->
 				<input
 				<input
 					type="password"
 					type="password"
 					class="user-input"
 					class="user-input"
@@ -184,74 +184,82 @@ export default {
 #login {
 #login {
 	width: 100vw;
 	width: 100vw;
 	height: 100vh;
 	height: 100vh;
-	background: url("./images/login-bg.png") center center no-repeat;
+	background: url("./images/login-bg.png") no-repeat bottom center;
 	background-size: 100% 100%;
 	background-size: 100% 100%;
 	overflow: hidden;
 	overflow: hidden;
-	position: relative;
+	//position: relative;
 	.login-logo {
 	.login-logo {
-		display: block;
-		margin: 0 auto;
-		position: absolute;
-		top: 11.5%;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-		width: 360px;
+		//display: block;
+    //position: absolute;
+		//top: 8%;
+		//left: 0;
+		//right: 0;
+    margin-top: 8%;
+    height: 38px;
+    width: 100%;
+    text-align: center;
 	}
 	}
-	.login-con {
-		position: absolute;
-		top: 24%;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
+  .login-logo img{
+    height: 100%;
   }
   }
-	.login-title {
-		width: 320px;
-		margin: 0 auto;
-		font-size: 14px;
-		font-weight: 500;
+	.login-con {
+		//position: absolute;
+		//top: 24%;
+		//left: 0;
+		//right: 0;
+		margin: 88px auto;
+    	width: 380px;
+
 	}
 	}
+	//.login-title {
+	//	width: 320px;
+	//	margin: 0 auto;
+	//	font-size: 14px;
+	//	font-weight: 500;
+	//}
 	.login-user {
 	.login-user {
-		width: 320px;
-		height: 38px;
+		width: 100%;
+		height: 46px;
 		border: 1px solid rgba(155, 155, 155, 1);
 		border: 1px solid rgba(155, 155, 155, 1);
 		box-sizing: border-box;
 		box-sizing: border-box;
-		margin: 0 auto;
-		margin-top: 20px;
+		margin: 38px auto auto auto;
 		border-radius: 2px;
 		border-radius: 2px;
-		position: relative;
+		//position: relative;
 		.user-icon {
 		.user-icon {
-			margin: 0 12px;
-			float: left;
-			width: 16px;
-			height: 16px;
-			margin-top: 11px;
-		}
-		.line-mid {
-			width: 1px;
-			height: 16px;
-			background: #cbcbcb;
       float: left;
       float: left;
-			margin-top: 11px;
-			margin-right: 9px;
+			margin: 13px auto auto 10px;
+			//float: left;
+			width: 28px;
+			height: 18px;
+			//margin-top: 11px;
 		}
 		}
+		//.line-mid {
+		//	width: 1px;
+		//	height: 16px;
+		//	background: #cbcbcb;
+		//	float: left;
+		//	margin-top: 11px;
+		//	margin-right: 9px;
+		//}
 		.user-input {
 		.user-input {
-			width: 230px;
+			width: 80%;
 			float: left;
 			float: left;
-			font-size: 12px;
-			margin-top: 11px;
-			background: none;
+			font-size: 16px;
+			//margin-top: 11px;
+			//background: none;
 			outline: 0;
 			outline: 0;
-			border: 0;
+			border: none;
 			color: #4a4a4a;
 			color: #4a4a4a;
-			box-shadow: inset 0 0 0 1000px #fff !important;
+      line-height: 266%;
+			//box-shadow: inset 0 0 0 1000px #fff !important;
+
 		}
 		}
 		.password-eye {
 		.password-eye {
 			float: right;
 			float: right;
 			width: 16px;
 			width: 16px;
 			height: 16px;
 			height: 16px;
 			margin-right: 12px;
 			margin-right: 12px;
-			margin-top: 11px;
+			margin-top: 13px;
 			cursor: pointer;
 			cursor: pointer;
 		}
 		}
 		.warning {
 		.warning {
@@ -297,7 +305,7 @@ export default {
 		}
 		}
 	}
 	}
 	.login-btn {
 	.login-btn {
-		width: 320px;
+		width: 100%;
 		height: 40px;
 		height: 40px;
 		background: rgba(0, 127, 255, 1);
 		background: rgba(0, 127, 255, 1);
 		border-radius: 1px;
 		border-radius: 1px;
@@ -310,11 +318,8 @@ export default {
 		cursor: pointer;
 		cursor: pointer;
 	}
 	}
 	.reserved-con {
 	.reserved-con {
-		position: absolute;
-		bottom: 36%;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
+
+		margin: 38px auto;
 	}
 	}
 	.reserved-words {
 	.reserved-words {
 		font-size: 12px;
 		font-size: 12px;

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

@@ -15,7 +15,7 @@
                                 <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
                                 <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
                                 <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
                                 <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
                                 <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
                                 <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
-                                <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li>
+                                <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlrmc}}</span></li>
                                 <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
                                 <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
                             </ul>
                             </ul>
                             <div class="zdmap">
                             <div class="zdmap">
@@ -44,7 +44,7 @@
                             </el-card>
                             </el-card>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="fgh" :style="{'minHeight':tableHeight+'px'}">
+                    <div class="fgh" :style="{'height':tableHeight+'px'}">
                         <span class="tips">分割后宗地信息(总计分割宗地数量{{zdFghData.newZdlist.length}}个)</span>
                         <span class="tips">分割后宗地信息(总计分割宗地数量{{zdFghData.newZdlist.length}}个)</span>
                         <table border="1">
                         <table border="1">
                             <tr>
                             <tr>
@@ -214,7 +214,7 @@
                             </el-card>
                             </el-card>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="fgh">
+                    <div class="fgh" :style="{'height':tableHeight+'px'}">
                         <span class="tips">分割后多幢信息(总计分割多幢数量{{dzFghData.fwlist.length}}个)</span>
                         <span class="tips">分割后多幢信息(总计分割多幢数量{{dzFghData.fwlist.length}}个)</span>
                         <table border="1">
                         <table border="1">
                             <tr>
                             <tr>
@@ -315,7 +315,7 @@
 
 
     export default {
     export default {
         name: "",
         name: "",
-        inject: ['getTreeByS'],
+        inject: ['getTreeByS','getRightTree'],
         components: {zdQueryData,dzQueryData,hfghb},
         components: {zdQueryData,dzQueryData,hfghb},
         props: {},
         props: {},
         data() {
         data() {
@@ -634,6 +634,7 @@
                 }
                 }
                 saveDzFg(this.dzFghData).then(res => {
                 saveDzFg(this.dzFghData).then(res => {
                     if (res.success) {
                     if (res.success) {
+                        this.getRightTree(res.result,'0,1,2');
                         Message.success("保存成功")
                         Message.success("保存成功")
                         //TO DO 多幢分割完成后的操作
                         //TO DO 多幢分割完成后的操作
                     } else {
                     } else {
@@ -1162,6 +1163,7 @@
             }
             }
         }
         }
         .header-button {
         .header-button {
+            z-index: 3;
             height: 50px;
             height: 50px;
             position: fixed;
             position: fixed;
             bottom: 0;
             bottom: 0;

@@ -826,6 +826,7 @@
     }
     }
 
 
     .header-button {
     .header-button {
+        z-index: 3;
         height: 50px;
         height: 50px;
         position: fixed;
         position: fixed;
         bottom: 0;
         bottom: 0;

@@ -342,7 +342,7 @@ export default {
         bdcdyh:'',
         bdcdyh:'',
         bdcqzh:'',
         bdcqzh:'',
         pageNo:1,
         pageNo:1,
-        pageSize:10,
+        pageSize:15,
         type:'all'
         type:'all'
       };
       };
       this.search()
       this.search()
@@ -514,7 +514,7 @@ export default {
 			if (n) {
 			if (n) {
 				this.lpbContentwidth -= 204;
 				this.lpbContentwidth -= 204;
 			} else {
 			} else {
-				this.lpbContentwidth += 204;
+				this.lpbContentwidth += 200;
 			}
 			}
     },
     },
     //选择自然幢展示楼盘表后，查询右侧图例数据
     //选择自然幢展示楼盘表后，查询右侧图例数据
@@ -522,9 +522,10 @@ export default {
       if (!n) {
       if (!n) {
         this.getDyztBsmList();
         this.getDyztBsmList();
         this.getLpbFwytAndQlxz();
         this.getLpbFwytAndQlxz();
-				this.$nextTick(()=>{
-					this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
-				})
+        // console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap');
+				// this.$nextTick(()=>{
+				// 	this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
+				// })
       }
       }
     },
     },
     //改变syclx，更新楼盘表数据
     //改变syclx，更新楼盘表数据

@@ -73,6 +73,7 @@ export default {
 		height: calc(100% - 50px);
 		height: calc(100% - 50px);
 		/deep/.el-tabs__content{
 		/deep/.el-tabs__content{
 			height: 100%;
 			height: 100%;
+			position: unset;
 			/deep/.el-tab-pane{
 			/deep/.el-tab-pane{
 				height: calc(100% - 40px);
 				height: calc(100% - 40px);
 			}
 			}

@@ -133,7 +133,7 @@
 				<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
 				<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
 			</div>
 			</div>
 		</el-tab-pane>
 		</el-tab-pane>
-		<el-tab-pane class="eltabspane" label="构筑物" name="gzw">
+		<el-tab-pane class="eltabspane"  v-if="!createZrz" label="构筑物" name="gzw">
 			<el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
 			<el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
 				<el-form-item label="项目名称" class="w100" prop="xmmc">
 				<el-form-item label="项目名称" class="w100" prop="xmmc">
 					<el-input
 					<el-input
@@ -330,6 +330,7 @@ export default {
 						.then((res) => {
 						.then((res) => {
 							if (res.code == "200") {
 							if (res.code == "200") {
 								//获取左侧树数据
 								//获取左侧树数据
+								this.$store.state.oldZdbsm = '';
 								this.getTreeByBsm(res.result.bsm,'zrz','0,1,2');
 								this.getTreeByBsm(res.result.bsm,'zrz','0,1,2');
 								this.$message({
 								this.$message({
 									message: "创建成功！",
 									message: "创建成功！",

 <template>
 <template>
-	<div class="main">
+	<div class="main" style="padding: 18px!important;">
 		<div class="panel content_box">
 		<div class="panel content_box">
 			<el-card class="panel_left">
 			<el-card class="panel_left">
 				<div slot="header" class="clearfix">
 				<div slot="header" class="clearfix">
@@ -224,6 +224,7 @@ export default {
 	flex-direction: column;
 	flex-direction: column;
 	overflow: hidden;
 	overflow: hidden;
 	height: 100%;
 	height: 100%;
+    
 	.clearfix {
 	.clearfix {
 		span {
 		span {
 			color: #6d7278;
 			color: #6d7278;
@@ -244,6 +245,7 @@ export default {
 	.panel {
 	.panel {
 		@flex();
 		@flex();
 		width: 100%;
 		width: 100%;
+		padding: 0 0 18px!important;
 		.panel_left {
 		.panel_left {
 			width: 35%;
 			width: 35%;
 			margin-right: 20px;
 			margin-right: 20px;
@@ -309,7 +311,7 @@ export default {
 	}
 	}
 	.notice {
 	.notice {
 		padding: 0;
 		padding: 0;
-		height: calc(100% - 285px);
+		height: calc(100% - 266px);
 		@flex();
 		@flex();
 		.news {
 		.news {
 			float: left;
 			float: left;

@@ -179,6 +179,7 @@
                         updateQsztByBsm(data)
                         updateQsztByBsm(data)
                             .then((res => {
                             .then((res => {
                                 if (res.code == 200) {
                                 if (res.code == 200) {
+                                    this.$store.state.oldZdbsm = '';
                                     switch (row.dylx) {
                                     switch (row.dylx) {
                                         case "zd":
                                         case "zd":
                                             this.$store.state.zdbsm = row.glbsm;
                                             this.$store.state.zdbsm = row.glbsm;

@@ -14,7 +14,7 @@
                     >
                     >
                         <el-table-column type="index" width="80" align="center" label="序号">
                         <el-table-column type="index" width="80" align="center" label="序号">
                         </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
+                        <el-table-column prop="bdcdyh" align="left" width="260" label="不动产单元号">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
                         <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
                         </el-table-column>
                         </el-table-column>
@@ -25,7 +25,7 @@
                                 {{scope.row.dylx | bdcLxFilter}}
                                 {{scope.row.dylx | bdcLxFilter}}
                             </template>
                             </template>
                         </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="qsztValue" align="left" label="权属状态">
+                        <el-table-column prop="qsztValue" align="left" width="100" label="权属状态">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
                         <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
                         </el-table-column>
                         </el-table-column>

@@ -8,7 +8,7 @@
                 <djb v-if="djbVisible"></djb>
                 <djb v-if="djbVisible"></djb>
             </el-tab-pane>
             </el-tab-pane>
             <el-tab-pane label="附件材料" name="fjcl">
             <el-tab-pane label="附件材料" name="fjcl">
-                <fjcl v-if="fjclVisible"></fjcl>
+                <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl>
             </el-tab-pane>
             </el-tab-pane>
         </el-tabs>
         </el-tabs>
     </div>
     </div>
@@ -26,6 +26,7 @@
         },
         },
         data() {
         data() {
             return {
             return {
+                isDisabled:false,
                 hbsm:this.$store.state.hbsm,
                 hbsm:this.$store.state.hbsm,
                 activeName: "hjbxx",
                 activeName: "hjbxx",
                 djbVisible: false,
                 djbVisible: false,
@@ -36,7 +37,18 @@
 
 
         },
         },
         methods: {
         methods: {
+            loadingStatus() {
+                console.log("是否禁用")
+                let bsm=this.$store.state.hbsm;
+                queryStatus(bsm).then(res => {
+                    if (res.success) {
+                        let qszt = res.result.qszt;
+                        this.isDisabled = +qszt !== 0;
+                    }
+                })
+            },
             handleClick(tab, event) {
             handleClick(tab, event) {
+                this.loadingStatus()
                 // console.log(tab, event);
                 // console.log(tab, event);
                 switch (tab.name) {
                 switch (tab.name) {
                     case 'djb':
                     case 'djb':

@@ -12,8 +12,9 @@
                 :show-file-list="false"
                 :show-file-list="false"
                 multiple
                 multiple
                 :on-exceed="handleExceed"
                 :on-exceed="handleExceed"
+                :disabled="isDisabled"
         >
         >
-            <el-button size="small" type="primary">上传</el-button>
+            <el-button size="small" type="primary" :disabled="isDisabled" >上传</el-button>
         </el-upload>
         </el-upload>
         <table border="2">
         <table border="2">
             <tr>
             <tr>
@@ -22,12 +23,12 @@
                 <th class="lx">文件类型</th>
                 <th class="lx">文件类型</th>
                 <th class="cz">操作</th>
                 <th class="cz">操作</th>
             </tr>
             </tr>
-            <tr v-if="list.length==0">
-                <td colspan="4" class="noData" >
+            <tr v-if="list.length===0">
+                <td colspan="4" class="noData">
                     <span>暂无数据</span>
                     <span>暂无数据</span>
                 </td>
                 </td>
             </tr>
             </tr>
-            <tr v-else v-for="(item,index) in list"  :key="index" >
+            <tr v-else v-for="(item,index) in list" :key="index">
                 <td class="xh">{{index+1}}</td>
                 <td class="xh">{{index+1}}</td>
                 <td class="mc">{{item.filename}}</td>
                 <td class="mc">{{item.filename}}</td>
                 <td class="lx">{{item.filepostfix}}</td>
                 <td class="lx">{{item.filepostfix}}</td>
@@ -44,47 +45,43 @@
 </template>
 </template>
 
 
 <script>
 <script>
-    import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "@api/common"
-    import {Message} from "element-ui"
+    import {insertFile, getFileLis, downloadFile, loadFile, deleteFile} from "@api/common"
+    import {queryStatus} from "@api/search"
 
 
     export default {
     export default {
         name: "fjcl",
         name: "fjcl",
         data() {
         data() {
             return {
             return {
-                fileData:{
-                    glbsm:'',
-                    dylx:''
+                fileData: {
+                    glbsm: '',
+                    dylx: ''
                 },
                 },
-                list: [
-                ],
-         /*       filesData: {
-                    dylx: "",
-                    glbsm: "",
-                    list: [
-                        {
-                            filename: "",
-                            filepostfix: "",
-                            fileurl: "",
-                            preViewUrl:""
-                        }
-                    ]
-                },*/
+                list: []
             }
             }
         },
         },
         mounted() {
         mounted() {
             this.getFileList()
             this.getFileList()
         },
         },
+        created(){
+
+        },
+        props: {
+            isDisabled:{
+                type:Boolean,
+                default:false
+            }
+        },
         methods: {
         methods: {
-            deleteFile(bsm){
+            deleteFile(bsm) {
                 this.$confirm('将删除该文件, 是否继续?', '提示', {
                 this.$confirm('将删除该文件, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     cancelButtonText: '取消',
                     type: 'warning'
                     type: 'warning'
                 }).then(() => {
                 }).then(() => {
-                    deleteFile(bsm).then(res=>{
+                    deleteFile(bsm).then(res => {
                         if (res.success) {
                         if (res.success) {
                             this.getFileList();
                             this.getFileList();
-                        }else {
+                        } else {
                             this.$message.error("删除失败")
                             this.$message.error("删除失败")
                         }
                         }
                     })
                     })
@@ -95,38 +92,38 @@
                     });
                     });
                 });
                 });
             },
             },
-            loadFile(bsm){
-                loadFile(bsm).then(res=>{
+            loadFile(bsm) {
+                loadFile(bsm).then(res => {
                     if (res.success) {
                     if (res.success) {
                         window.open(res.message)
                         window.open(res.message)
                     }
                     }
                 })
                 })
             },
             },
             downloadFile(url) {
             downloadFile(url) {
-                window.open(`/api/file/download?url=`+url);
+                window.open(`/api/file/download?url=` + url);
             },
             },
             getFileList() {
             getFileList() {
                 switch (this.$route.name) {
                 switch (this.$route.name) {
                     case "宗地":
                     case "宗地":
                         this.fileData.dylx = 'zd';
                         this.fileData.dylx = 'zd';
-                        this.fileData.glbsm = this.$store.state.zdbsm
+                        this.fileData.glbsm = this.$store.state.zdbsm;
                         break;
                         break;
                     case "自然幢":
                     case "自然幢":
                         this.fileData.dylx = 'zrz';
                         this.fileData.dylx = 'zrz';
-                        this.fileData.glbsm = this.$store.state.zrzbsm
-                        break
+                        this.fileData.glbsm = this.$store.state.zrzbsm;
+                        break;
                     case "多幢":
                     case "多幢":
                         this.fileData.dylx = 'dz';
                         this.fileData.dylx = 'dz';
-                        this.fileData.glbsm = this.$store.state.dzbsm
-                        break
+                        this.fileData.glbsm = this.$store.state.dzbsm;
+                        break;
                     case "户":
                     case "户":
                         this.fileData.dylx = 'h';
                         this.fileData.dylx = 'h';
-                        this.fileData.glbsm = this.$store.state.hbsm
+                        this.fileData.glbsm = this.$store.state.hbsm;
                         break;
                         break;
                     default:
                     default:
                         break
                         break
                 }
                 }
-                getFileLis(this.fileData.glbsm ).then(res => {
+                getFileLis(this.fileData.glbsm).then(res => {
                     if (res.success) {
                     if (res.success) {
                         this.list = res.result;
                         this.list = res.result;
                     } else {
                     } else {
@@ -185,19 +182,19 @@
             color: blue;
             color: blue;
             text-decoration: underline;
             text-decoration: underline;
         }
         }
-        .xh{
+        .xh {
             width: 100px;
             width: 100px;
         }
         }
-        .mc{
+        .mc {
             width: 300px;
             width: 300px;
         }
         }
-        .lx{
+        .lx {
             width: 120px;
             width: 120px;
         }
         }
-        .cz{
+        .cz {
             width: 150px;
             width: 150px;
         }
         }
-        .noData span{
+        .noData span {
             color: #BBB;
             color: #BBB;
         }
         }
     }
     }

@@ -2,12 +2,17 @@
 	<!-- <div class="content_box"> -->
 	<!-- <div class="content_box"> -->
 		<el-tabs v-model="activeName" class="tabs"  @tab-click="handleClick" type="border-card" >
 		<el-tabs v-model="activeName" class="tabs"  @tab-click="handleClick" type="border-card" >
 			<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
 			<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
-			<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
-			<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
-			<el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
+			<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
+			<el-tab-pane label="界址点" name="jzd">
+				<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
+			</el-tab-pane>
+			<el-tab-pane label="界址线" name="jzx" >
+				<jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx>
+			</el-tab-pane>
 			<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
 			<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
 			<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
 			<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
-			<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
+			<el-tab-pane label="附件材料" name="fjcl">
+				<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
 		</el-tabs>
 		</el-tabs>
 	<!-- </div> -->
 	<!-- </div> -->
 </template>
 </template>
@@ -20,6 +25,7 @@ import jzx from "./jzx";
 import djb from "./djb";
 import djb from "./djb";
 import lshs from "./lshs";
 import lshs from "./lshs";
 import fjcl from "./fjcl/fjcl"
 import fjcl from "./fjcl/fjcl"
+import {queryStatus} from "@api/search"
 export default {
 export default {
 	name: "",
 	name: "",
 	components: {
 	components: {
@@ -28,6 +34,7 @@ export default {
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
+            isDisabled:false,
 			activeName: "djdcb",
 			activeName: "djdcb",
 			mjftbVisible:false,
 			mjftbVisible:false,
 			jzdVisible:false,
 			jzdVisible:false,
@@ -38,8 +45,23 @@ export default {
 		};
 		};
 	},
 	},
 	methods: {
 	methods: {
+        loadingStatus() {
+            console.log("是否禁用")
+            let bsm=this.$route.query.bsm;
+            queryStatus(bsm).then(res => {
+                if (res.success) {
+                    let qszt = res.result.qszt;
+                    this.isDisabled = +qszt !== 0;
+                }
+            })
+        },
+	   /* loading(){
+            console.log("附件材料是否禁用")
+	        this.$refs.fjcl.isUpload(this.$store.state.zdbsm)
+		},*/
 		handleClick(tab, event) {
 		handleClick(tab, event) {
 			// console.log(tab, event);
 			// console.log(tab, event);
+            this.loadingStatus();
 			switch (tab.name) {
 			switch (tab.name) {
 				case 'mjftb':
 				case 'mjftb':
 					this.mjftbVisible = true;
 					this.mjftbVisible = true;
@@ -67,8 +89,16 @@ export default {
 	},
 	},
 	created() {},
 	created() {},
 	mounted() {},
 	mounted() {},
-	computed: {},
-	watch: {},
+	computed: {
+		zdbsm() {
+			return this.$route.query.bsm;
+		},
+	},
+	watch: {
+		zdbsm: function (val) {
+			this.loadingStatus();
+		},
+	},
 };
 };
 </script>
 </script>
 <style scoped lang="less">
 <style scoped lang="less">

 <template>
 <template>
     <div class="main">
     <div class="main">
         <div class="button">
         <div class="button">
-            <el-button type="primary" @click="oneExit">编辑</el-button>
-            <el-button type="primary" @click="save">保存</el-button>
-            <el-button type="primary" @click="batchExit">批量修改</el-button>
+            <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
+            <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
+            <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
         </div>
         </div>
         <div class="table">
         <div class="table">
             <table border="1">
             <table border="1">
                 <tr>
                 <tr>
-                    <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
-                    <td class="jzdh">界址点号</td>
-                    <td class="sxh">顺序号</td>
-                    <td class="xzbz">X坐标值</td>
-                    <td class="yzbz">Y坐标值</td>
-                    <td class="jblx">界标类型</td>
-                    <td class="jzdlx">界址点类型</td>
+                    <th class="cz">
+                        <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox>
+                    </th>
+                    <th class="">界址点号</th>
+                    <th class="">顺序号</th>
+                    <th class="">X坐标值</th>
+                    <th class="">Y坐标值</th>
+                    <th class="">界标类型</th>
+                    <th class="">界址点类型</th>
                 </tr>
                 </tr>
-                <tr v-if="jzdlist.length==0">
+                <tr v-if="jzdlist.length===0">
                     <td colspan="7"><span class="nodata">暂无数据</span></td>
                     <td colspan="7"><span class="nodata">暂无数据</span></td>
                 </tr>
                 </tr>
                 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
                 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
-                    <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
-                    <td class="jzdh"><input type="text" class="formInput" v-model="item.jzdh" readonly="readonly"/></td>
-                    <td class="sxh"><input type="text" class="formInput" v-model="item.sxh" readonly="readonly"/></td>
-                    <td class="xzbz"><input type="text" class="formInput" v-model="item.xzbz" :readonly="item.iszb"
-                                            @keydown="oninput"/></td>
-                    <td class="yzbz"><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb"
-                                            @keydown="oninput"/></td>
+                    <td class="cz">
+                        <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox>
+                    </td>
+                    <td class="jzdh">
+                        <el-input v-model="item.jzdh" readonly></el-input>
+                    </td>
+                    <td class="sxh">
+                        <el-input class="" v-model="item.sxh" readonly></el-input>
+                    </td>
+                    <td class="xzbz">
+                        <el-input class="" v-model="item.xzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
+                                  @keydown="oninput"></el-input>
+                    </td>
+                    <td class="yzbz">
+                        <el-input class="" v-model="item.yzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
+                                  @keydown="oninput"></el-input>
+                    </td>
                     <td class="jblx">
                     <td class="jblx">
                         <el-select v-model="item.jblx" :disabled="item.jzdisdisabled">
                         <el-select v-model="item.jblx" :disabled="item.jzdisdisabled">
                             <el-option
                             <el-option
@@ -97,12 +109,18 @@
 
 
 <script>
 <script>
     import {queryjzd, jzdsingleModify, jzdbatchModify} from '@api/zd'
     import {queryjzd, jzdsingleModify, jzdbatchModify} from '@api/zd'
+    import {queryStatus} from "@api/search"
     import {Message} from 'element-ui'
     import {Message} from 'element-ui'
 
 
     export default {
     export default {
         name: "jzd",
         name: "jzd",
         components: {},
         components: {},
-        props: {},
+        props: {
+            isDisabled:{
+                type:Boolean,
+                default:false
+            }
+        },
         data() {
         data() {
             return {
             return {
                 bsm: '',
                 bsm: '',
@@ -191,7 +209,7 @@
                 })
                 })
             },
             },
             save() {
             save() {
-                if(this.jzdlist.length === 0){
+                if (this.jzdlist.length === 0) {
                     Message.info("至少填写一条界址点信息")
                     Message.info("至少填写一条界址点信息")
                     return
                     return
                 }
                 }
@@ -215,7 +233,7 @@
                 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
                 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
             },
             },
             changeAll(e) {
             changeAll(e) {
-                if (!e.target.checked) {
+                if (!e) {
                     this.isCheckAll = false;
                     this.isCheckAll = false;
                     return
                     return
                 }
                 }
@@ -229,7 +247,7 @@
             },
             },
             allcheck(value) {
             allcheck(value) {
                 for (let item of this.jzdlist) {
                 for (let item of this.jzdlist) {
-                    item.isCheck = value.target.checked;
+                    item.isCheck = value;
                 }
                 }
             },
             },
             oneExit() {
             oneExit() {
@@ -294,6 +312,7 @@
         height: auto;
         height: auto;
         width: 100%;
         width: 100%;
         .header-button {
         .header-button {
+            z-index: 3;
             height: 50px;
             height: 50px;
             position: fixed;
             position: fixed;
             bottom: 0;
             bottom: 0;
@@ -315,18 +334,10 @@
             background-color: #fff;
             background-color: #fff;
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;
-            .formInput {
-                margin: 0;
-                height: 36px;
-                outline: none;
-                border: none;
-                color: #606764;
-                overflow: visible;
-                text-align: center;
-                cursor: text;
         }
         }
+        th{
+            height: 36px;
         }
         }
-
         td {
         td {
             text-align: center;
             text-align: center;
             height: 36px;
             height: 36px;
@@ -336,7 +347,7 @@
             cursor: pointer;
             cursor: pointer;
         }
         }
         .plxg {
         .plxg {
-           .el-select{
+            .el-select {
                 float: left;
                 float: left;
             }
             }
         }
         }
@@ -348,11 +359,12 @@
             color: #b2b2b2;
             color: #b2b2b2;
         }
         }
     }
     }
-
     .cz {
     .cz {
         width: 50px;
         width: 50px;
     }
     }
 
 
+ /*
+
     .jzdh {
     .jzdh {
         width: 120px;
         width: 120px;
     }
     }
@@ -375,7 +387,7 @@
 
 
     .jzdlx {
     .jzdlx {
         width: 180px
         width: 180px
-    }
+    }*/
 
 
     .dialog-footer {
     .dialog-footer {
         text-align: center;
         text-align: center;

 <template>
 <template>
     <div class="main">
     <div class="main">
         <div class="button">
         <div class="button">
-            <el-button type="primary" @click="oneExit">编辑</el-button>
-            <el-button type="primary" @click="save">保存</el-button>
-            <el-button type="primary" @click="batchExit">批量修改</el-button>
+            <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
+            <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
+            <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
         </div>
         </div>
         <div class="table">
         <div class="table">
             <table border="1">
             <table border="1">
                 <tr>
                 <tr>
-                    <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
-                    <td class="qdh">起始点号</td>
-                    <td class="zdh">终止点号</td>
-                    <td class="jzjj">界址间距(m)</td>
-                    <td class="jzxlx">界址线类型</td>
-                    <td class="jzxwz">界址线位置</td>
-                    <td class="jxxz">界限性质</td>
-                    <td class="sm">说明</td>
+                    <th class="cz">
+                        <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox>
+                    </th>
+                    <th class="">起始点号</th>
+                    <th class="">终止点号</th>
+                    <th class="">界址间距(m)</th>
+                    <th class="">界址线类型</th>
+                    <th class="">界址线位置</th>
+                    <th class="">界限性质</th>
+                    <th class="">说明</th>
                 </tr>
                 </tr>
-                <tr v-if="jzxlist.length==0">
+                <tr v-if="jzxlist.length===0">
                     <td colspan="8"><span class="nodata">暂无数据</span></td>
                     <td colspan="8"><span class="nodata">暂无数据</span></td>
                 </tr>
                 </tr>
                 <tr v-for="(item,index) in jzxlist" :key="index" v-else>
                 <tr v-for="(item,index) in jzxlist" :key="index" v-else>
-                    <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
-                    <td class="qsd"><input type="text" class="formInput" v-model="item.qdh" readonly="readonly"/></td>
-                    <td class="zzd"><input type="text" class="formInput" v-model="item.zdh" readonly="readonly"/></td>
-                    <td class="jzdj"><input type="text" class="formInput" v-model="item.jzjj"
-                                            :readonly="item.jjisdisabled"/></td>
-                    <td class="jzxlx">
+                    <td class="">
+                        <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox>
+                    </td>
+                    <td class="">
+                        <el-input v-model="item.qdh" readonly="readonly"></el-input>
+                    </td>
+                    <td class="">
+                        <el-input v-model="item.zdh" readonly="readonly"></el-input>
+                    </td>
+                    <td class="">
+                        <el-input v-model="item.jzjj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
+                                  :readonly="item.jjisdisabled"></el-input>
+                    </td>
+                    <td class="">
                         <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled">
                         <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled">
                             <el-option
                             <el-option
                                     v-for="i in jzxlx"
                                     v-for="i in jzxlx"
@@ -36,7 +46,7 @@
                             ></el-option>
                             ></el-option>
                         </el-select>
                         </el-select>
                     </td>
                     </td>
-                    <td class="jzxwz">
+                    <td class="">
                         <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled">
                         <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled">
                             <el-option
                             <el-option
                                     v-for="i in jzxwz"
                                     v-for="i in jzxwz"
@@ -46,7 +56,7 @@
                             ></el-option>
                             ></el-option>
                         </el-select>
                         </el-select>
                     </td>
                     </td>
-                    <td class="jxxz">
+                    <td class="">
                         <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled">
                         <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled">
                             <el-option
                             <el-option
                                     v-for="i in jxxz"
                                     v-for="i in jxxz"
@@ -56,8 +66,8 @@
                             ></el-option>
                             ></el-option>
                         </el-select>
                         </el-select>
                     </td>
                     </td>
-                    <td class="sm">
-                        <input type="text" class="formInput" v-model="item.sm" readonly="readonly"/>
+                    <td class="">
+                        <el-input v-model="item.sm" readonly="readonly"></el-input>
                     </td>
                     </td>
                 </tr>
                 </tr>
             </table>
             </table>
@@ -127,7 +137,12 @@
     export default {
     export default {
         name: "jzx",
         name: "jzx",
         components: {},
         components: {},
-        props: {},
+        props: {
+            isDisabled:{
+                type:Boolean,
+                default:false
+            }
+        },
         data() {
         data() {
             return {
             return {
                 bsm: '',
                 bsm: '',
@@ -236,13 +251,13 @@
             }
             }
         },
         },
         created() {
         created() {
-
-        },
-        mounted() {
-            let bsm = this.$store.state.zdbsm
+            let bsm = this.$store.state.zdbsm;
             this.bsm = bsm;
             this.bsm = bsm;
             this.getData(bsm)
             this.getData(bsm)
         },
         },
+        mounted() {
+
+        },
         methods: {
         methods: {
             result() {
             result() {
                 this.batchJzx.jzxlx = '';
                 this.batchJzx.jzxlx = '';
@@ -261,7 +276,7 @@
                 })
                 })
             },
             },
             save() {
             save() {
-                if(this.jzxlist.length === 0){
+                if (this.jzxlist.length === 0) {
                     Message.info("至少填写一条界址线信息")
                     Message.info("至少填写一条界址线信息")
                     return
                     return
                 }
                 }
@@ -284,7 +299,8 @@
                 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
                 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
             },
             },
             changeAll(e) {
             changeAll(e) {
-                if (!e.target.checked) {
+                console.log(e,"单选")
+                if (!e) {
                     this.isCheckAll = false;
                     this.isCheckAll = false;
                     return
                     return
                 }
                 }
@@ -297,8 +313,9 @@
                 this.isCheckAll = true;
                 this.isCheckAll = true;
             },
             },
             allcheck(value) {
             allcheck(value) {
+                console.log(value,'全选')
                 for (let item of this.jzxlist) {
                 for (let item of this.jzxlist) {
-                    item.isCheck = value.target.checked;
+                    item.isCheck = value;
                 }
                 }
             },
             },
             oneExit() {
             oneExit() {
@@ -368,20 +385,13 @@
             background-color: #fff;
             background-color: #fff;
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;
-            .formInput {
-                margin: 0;
-                height: 36px;
-                outline: none;
-                border: none;
-                color: #606764;
-                overflow: visible;
-                text-align: center;
-                cursor: text;
-            }
         }
         }
         table:hover {
         table:hover {
             cursor: pointer;
             cursor: pointer;
         }
         }
+        th {
+            height: 36px;
+        }
         td {
         td {
             text-align: center;
             text-align: center;
             height: 36px;
             height: 36px;
@@ -401,6 +411,8 @@
         width: 50px;
         width: 50px;
     }
     }
 
 
+    /*
+
         .qsd {
         .qsd {
             width: 150px;
             width: 150px;
         }
         }
@@ -423,7 +435,7 @@
 
 
         .jxxz {
         .jxxz {
             width: 150px;
             width: 150px;
-    }
+        }*/
 
 
     .sm {
     .sm {
         width: 150px;
         width: 150px;
@@ -433,8 +445,9 @@
         text-align: center;
         text-align: center;
         margin-top: 20px;
         margin-top: 20px;
     }
     }
-    .plxg{
-        .el-select{
+
+    .plxg {
+        .el-select {
             float: left;
             float: left;
         }
         }
     }
     }

@@ -2,22 +2,23 @@
     <div class="main" ref="mainBox">
     <div class="main" ref="mainBox">
         <table border="1">
         <table border="1">
             <tr>
             <tr>
-                <td colspan="2">土地坐落</td>
-                <td colspan="3"><input type="text" class="formInput" v-model="tdzl" disabled/></td>
+                <th colspan="2">土地坐落</th>
+                <th colspan="3"><el-input  v-model="tdzl" disabled></el-input></th>
             </tr>
             </tr>
             <tr>
             <tr>
-                <td colspan="2">宗地代码</td>
-                <td colspan="3"><input type="text" class="formInput" v-model="zddm " disabled/></td>
+                <th colspan="2">宗地代码</th>
+                <td colspan="3"><el-input v-model="zddm " disabled></el-input></td>
             </tr>
             </tr>
             <tr>
             <tr>
-                <td colspan="2">宗地面积(㎡)</td>
-                <td><input type="number" class="formInput" v-model.number="zdmj" disabled/></td>
-                <td>定着物数量</td>
+                <th colspan="2">宗地面积(㎡)</th>
+                <th>
+                    <el-input  v-model="zdmj" disabled/></th>
+                <th>定着物数量</th>
                 <td class="dzwsl">{{dzwdsl}}</td>
                 <td class="dzwsl">{{dzwdsl}}</td>
             </tr>
             </tr>
             <tr>
             <tr>
-                <td colspan="2">备注</td>
-                <td colspan="3"><input type="text" class="formInput" v-model="mjftData.bz"/></td>
+                <th colspan="2">备注</th>
+                <td colspan="3"><el-input v-model="mjftData.bz" :disabled="isDisabled"></el-input></td>
             </tr>
             </tr>
         </table>
         </table>
         <table border="1">
         <table border="1">
@@ -26,12 +27,13 @@
 									type="primary"
 									type="primary"
 									class="changeBtn inAdd addMinus"
 									class="changeBtn inAdd addMinus"
 									@click="addRow"
 									@click="addRow"
+                                    :disabled="isDisabled"
 									>+</el-button
 									>+</el-button
 								></td>
 								></td>
-                <td class="dzwdm">定着物代码</td>
-                <td class="syqmj">土地所有权/使用权面积(㎡)</td>
-                <td class="dytdmj">独有独用土地面积(㎡)</td>
-                <td class="fttjmj">分摊土地面积(㎡)</td>
+                <th class="dzwdm">定着物代码</th>
+                <th class="syqmj">土地所有权/使用权面积(㎡)</th>
+                <th class="dytdmj">独有独用土地面积(㎡)</th>
+                <th class="fttjmj">分摊土地面积(㎡)</th>
             </tr>
             </tr>
             <tr v-for="(item,i) in mjftData.list" :key="i">
             <tr v-for="(item,i) in mjftData.list" :key="i">
                 <td class="cz">
                 <td class="cz">
@@ -39,42 +41,40 @@
                         type="primary"
                         type="primary"
                         class="changeBtn inMinus addMinus"
                         class="changeBtn inMinus addMinus"
                         @click="delRow(i)"
                         @click="delRow(i)"
+                        :disabled="isDisabled"
                         >-</el-button
                         >-</el-button
                     >
                     >
                 </td>
                 </td>
                 <td class="dzwdm">
                 <td class="dzwdm">
                     <el-input v-model="item.dzwdm"
                     <el-input v-model="item.dzwdm"
                               maxlength="9"
                               maxlength="9"
+                              :disabled="isDisabled"
                     >
                     >
                     </el-input>
                     </el-input>
                 </td>
                 </td>
                 <td class="syqmj">
                 <td class="syqmj">
                     <el-input  style="ime-mode:inactive"
                     <el-input  style="ime-mode:inactive"
-                              oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
-                            v-model="item.tdsyqsyqmj"
+                               oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"
+                            v-model="item.tdsyqsyqmj" :disabled="isDisabled"
                     ></el-input>
                     ></el-input>
                 </td>
                 </td>
                 <td class="dytdmj">
                 <td class="dytdmj">
-                    <el-input v-model="item.dydytdmj" style="ime-mode:inactive"  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                    <el-input v-model="item.dydytdmj" style="ime-mode:inactive"  oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input>
                 </td>
                 </td>
                 <td class="fttjmj">
                 <td class="fttjmj">
-                    <el-input v-model="item.fttdmj" style="ime-mode:inactive"  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                    <el-input v-model="item.fttdmj" style="ime-mode:inactive"  oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input>
                 </td>
                 </td>
             </tr>
             </tr>
             <tr>
             <tr>
                 <td class="cz"></td>
                 <td class="cz"></td>
-                <td class="dzwdm">统计</td>
+                <th class="dzwdm">统计</th>
                 <td class="syqmj">{{sumTdsyqsyqmj}}</td>
                 <td class="syqmj">{{sumTdsyqsyqmj}}</td>
                 <td class="dytdmj">{{sumDydytdmj}}</td>
                 <td class="dytdmj">{{sumDydytdmj}}</td>
                 <td class="fttjmj">{{sumFttdmj}}</td>
                 <td class="fttjmj">{{sumFttdmj}}</td>
             </tr>
             </tr>
         </table>
         </table>
-        <!-- <div class="pers">
-            <el-button @click="save" type="primary">保存</el-button>
-        </div> -->
-
         <div class="header-button" :style="{width:mainBoxWidth+'px'}">
         <div class="header-button" :style="{width:mainBoxWidth+'px'}">
-            <el-button type="primary" class="saveBtn"  @click="save">保存</el-button>
+            <el-button type="primary" class="saveBtn"  @click="save" :disabled="isDisabled">保存</el-button>
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
@@ -85,6 +85,12 @@
 
 
     export default {
     export default {
         name: "index",
         name: "index",
+        props: {
+            isDisabled:{
+                type:Boolean,
+                default:false
+            }
+        },
         data() {
         data() {
             return {
             return {
                 tdzl: '',       // 土地坐落 继承获取
                 tdzl: '',       // 土地坐落 继承获取
@@ -203,7 +209,10 @@
                 let num = this.mjftData.list.length ? this.mjftData.list.length : 0
                 let num = this.mjftData.list.length ? this.mjftData.list.length : 0
                 self.mjftData.dzwdys = num
                 self.mjftData.dzwdys = num
                 return num;
                 return num;
-            }
+            },
+            zdbsm() {
+                return this.$route.query.bsm;
+            },
         },
         },
         created() {
         created() {
             console.log("create init...")
             console.log("create init...")
@@ -233,6 +242,9 @@
             "$store.state.zddm": function (zddm) {
             "$store.state.zddm": function (zddm) {
                 this.zddm = zddm
                 this.zddm = zddm
             },
             },
+            zdbsm: function (val) {
+                this.getData(val);
+            },
         }
         }
     }
     }
 </script>
 </script>
@@ -250,16 +262,6 @@
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;
             cursor: pointer;
             cursor: pointer;
-            .formInput {
-                margin: 0;
-                height: 36px;
-                outline: none;
-                border: none;
-                color: #606764;
-                overflow: visible;
-                text-align: center;
-                cursor: text;
-            }
             td {
             td {
                 text-align: center;
                 text-align: center;
                 height: 36px;
                 height: 36px;
@@ -267,6 +269,7 @@
             }
             }
         }
         }
         .header-button {
         .header-button {
+            z-index: 3;
             height: 50px;
             height: 50px;
             position: fixed;
             position: fixed;
             bottom: 0;
             bottom: 0;
@@ -302,11 +305,11 @@
         width: 50px;
         width: 50px;
     }
     }
 
 
-    .dzwdm {
+    .dzwdm ,.syqmj,.dytdmj,.fttjmj{
         width: 150px;
         width: 150px;
     }
     }
 
 
-    .syqmj {
+  /*  .syqmj {
         width: 150px;
         width: 150px;
     }
     }
 
 
@@ -316,6 +319,6 @@
 
 
     .fttjmj {
     .fttjmj {
         width: 150px;
         width: 150px;
-    }
+    }*/
 
 
 </style>
 </style>

@@ -6,7 +6,7 @@
 			<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
 			<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
 			<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
 			<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
 			<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
 			<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
-			<el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
+			<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
 		</el-tabs>
 		</el-tabs>
 	</div>
 	</div>
 </template>
 </template>
@@ -18,6 +18,7 @@ import djb from "./djb";
 import lpb from "./lpb";
 import lpb from "./lpb";
 import lshs from "./lshs";
 import lshs from "./lshs";
 import fjcl from "./../zd/fjcl/fjcl";
 import fjcl from "./../zd/fjcl/fjcl";
+import {queryStatus} from "@api/search"
 export default {
 export default {
 	name: "",
 	name: "",
 	components: {
 	components: {
@@ -26,13 +27,25 @@ export default {
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
+            isDisabled:false,
 			activeName: "zrzxx",
 			activeName: "zrzxx",
 			lpbLoad:false, //默认不加载楼盘表组件
 			lpbLoad:false, //默认不加载楼盘表组件
 			yzgyLoad:false,
 			yzgyLoad:false,
 		};
 		};
 	},
 	},
 	methods: {
 	methods: {
+        loadingStatus() {
+            console.log("是否禁用")
+            let bsm=this.$store.state.zrzbsm;
+            queryStatus(bsm).then(res => {
+                if (res.success) {
+                    let qszt = res.result.qszt;
+                    this.isDisabled = +qszt !== 0;
+                }
+            })
+        },
 		handleClick(tab, event) {
 		handleClick(tab, event) {
+            this.loadingStatus()
 			if(!this.lpbLoad){
 			if(!this.lpbLoad){
 				this.lpbLoad = tab.name == 'lpb' ? true : false
 				this.lpbLoad = tab.name == 'lpb' ? true : false
 			}
 			}

@@ -4,7 +4,7 @@
             <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
             <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
                 <tbody>
                 <tbody>
                 <tr height="30">
                 <tr height="30">
-                    <td colspan="12" align="center"  ><font size="4">逻辑幢基本信息</font></td>
+                    <td colspan="12" align="center"  ><font size="4">层基本信息</font></td>
                 </tr>
                 </tr>
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >层号</td>
                     <td  colspan="2" align="center"  >层号</td>
@@ -77,19 +77,21 @@
                 </tbody>
                 </tbody>
             </table>
             </table>
         </el-form>
         </el-form>
-        <div style="min-height: 40px;text-align: center;margin-top: 10px">
-            <el-button type="success" @click="onSave">保存</el-button>
-            <el-button type="primary" @click="onSubmit">提交</el-button>
-        </div>
     </div>
     </div>
 
 
 </template>
 </template>
 
 
 <script>
 <script>
-    import {insertCInfo} from "@api/zrz";
+    import {getQjCDetailById,updateQjC} from "@api/c";
     export default {
     export default {
         name:'c',
         name:'c',
         components:{},
         components:{},
+        props: {
+            cbsm:{
+                type: String,
+                default: '',
+            }
+        },
         data () {
         data () {
             return {
             return {
                 form:{
                 form:{
@@ -112,28 +114,65 @@
         },
         },
         methods: {
         methods: {
             onSave(){
             onSave(){
-                this.form.zrzbsm=this.$router.query.bsm;
-                insertCInfo(this.form).then((res)=>{
-                    if(res.code===200){
+                this.form.zrzbsm=this.$route.query.bsm;
+                //编辑层信息接口调用 TODO
+                updateQjC(this.form).then((res)=>{
+                    if(res.code === 200){
                         this.$message.success("保存成功")
                         this.$message.success("保存成功")
                     }
                     }
                 })
                 })
-                console.log(this.form)
             },
             },
-            onSubmit(){
-                console.log(this.form)
+            getCinfo(bsm){
+                this.reset();
+                //获取层信息接口调用 TODO
+                getQjCDetailById(bsm).then((res)=>{
+                    if(res.code === 200){
+                        this.form = res.result;
+                        this.form.zrzh = this.$store.state.zrzh;
                     }
                     }
+                })
+
+            },
+            reset(){
+                this.form = {
+                    zrzbsm:'',
+                    ch:'',  //层号
+                    zrzh:'',  //自然幢号
+                    sjc:'',  //实际层
+                    myc:'',  //名义层
+                    cjzmj:'',  //层建筑面积
+                    ctnjzmj:'',  //层套内建筑面积
+                    cytmj:'',  //层阳台面积
+                    cbqmj:'',  //层半墙面积
+                    cgyjzmj:'',  //层共有建筑面积
+                    cftjzmj:'',  //层分摊建筑面积
+                    cg:'',  //层高
+                    sptymj:'',  //水平投影面积
+                }
+            }
+        },
+        mounted(){
+            this.getCinfo(this.cbsm);
+        },
+        watch:{
+            cbsm: {
+                handler: function (item) {
+                    console.log(item,"item")
+                    console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType")
+                    if(item!='' && this.$parent.$parent.menuType == 'c'){
+                        this.getCinfo(item)
+                    }
+                },
+                immediate: true
+            },
         }
         }
     }
     }
 </script>
 </script>
 <style rel="stylesheet/less" lang="less" scoped>
 <style rel="stylesheet/less" lang="less" scoped>
     .h {
     .h {
         min-height: 200px;
         min-height: 200px;
-        width: 80%;
-        margin-top: 10px;
-        margin-left: 10%;
-        float: left;
-
+        width: 100%;
+        margin: 0 auto;
         /deep/.el-input__inner{
         /deep/.el-input__inner{
             width: 100%;
             width: 100%;
             border: 0;
             border: 0;

@@ -9,33 +9,24 @@
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="zrzmc" label="自然幢" align="center">
 			<el-table-column prop="zrzmc" label="自然幢" align="center">
-				<!-- <template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.ljzbsm"></el-input>
-				</template> -->
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="ljzmc" label="逻辑幢" align="center">
 			<el-table-column prop="ljzmc" label="逻辑幢" align="center">
-				<!-- <template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.ljzbsm"></el-input>
-				</template> -->
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="zdymc" label="幢单元" align="center">
 			<el-table-column prop="zdymc" label="幢单元" align="center">
-				<!-- <template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.zdybsm"></el-input>
-				</template> -->
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="qsc" label="起始层" align="center">
 			<el-table-column prop="qsc" label="起始层" align="center">
 				<template slot-scope="scope">
 				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.qsc"></el-input>
+					<el-input  v-model="scope.row.qsc" type="number"></el-input>
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="jsc" label="结束层" align="center">
 			<el-table-column prop="jsc" label="结束层" align="center">
 				<template slot-scope="scope">
 				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.jsc"></el-input>
+					<el-input v-model="scope.row.jsc" type="number"></el-input>
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="hs" label="每层户数" align="center">
 			<el-table-column prop="hs" label="每层户数" align="center">
 				<template slot-scope="scope">
 				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.hs"></el-input>
+					<el-input v-model="scope.row.hs" type="number"></el-input>
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 		</el-table>
 		</el-table>
@@ -87,6 +78,9 @@ export default {
 		handleRowClick(row, index) {
 		handleRowClick(row, index) {
 			if (row.cz == "+") {
 			if (row.cz == "+") {
 				let temp = JSON.parse(JSON.stringify(this.formData));
 				let temp = JSON.parse(JSON.stringify(this.formData));
+				temp.qsc = '';
+				temp.jsc = '';
+				temp.hs = '';
 				temp.cz = "-";
 				temp.cz = "-";
 				this.tableData.push(temp);
 				this.tableData.push(temp);
 			} else {
 			} else {
@@ -94,6 +88,23 @@ export default {
 			}
 			}
 		},
 		},
 		onSave(bsm) {
 		onSave(bsm) {
+			console.log(this.tableData)
+			let totalHs = 0;
+			for(let k =0;k<this.tableData.length;k++){
+				if(this.tableData[k].qsc === ""||this.tableData[k].jsc === ""||this.tableData[k].hs === ""){
+					this.$message.warning("表单不完整，请填写完整")
+					return false
+				}
+				if(this.tableData[k].qsc - this.tableData[k].jsc > 0){
+					this.$message.warning("存在结束层大于起始层，请重写填写")
+					return false
+				}
+				totalHs = totalHs + (this.tableData[k].jsc-this.tableData[k].qsc+1)*this.tableData[k].hs;
+			}
+			if(totalHs >= 5000){
+				this.$message.warning("单次添加户数累积超过5000户，请分次添加！")
+				return false
+			}
 			insertChInfo(this.tableData).then((res) => {
 			insertChInfo(this.tableData).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {
 					this.$message.success("保存成功");
 					this.$message.success("保存成功");

@@ -2,7 +2,7 @@
 	<div class="edit">
 	<div class="edit">
 		<div class="tab-header">
 		<div class="tab-header">
 			<el-row class="searchContent">
 			<el-row class="searchContent">
-				<el-col :span="6">
+				<el-col :span="24" style="margin:0 0 10px 18px;">
 					<el-radio-group  v-model="scyclx" @change="scyclxChange">
 					<el-radio-group  v-model="scyclx" @change="scyclxChange">
 						<el-radio-button label="0">预测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 						<el-radio-button label="1">实测</el-radio-button>
 						<el-radio-button label="1">实测</el-radio-button>
@@ -11,9 +11,6 @@
 						maxlength="28"
 						maxlength="28"
 						v-model="bdcdyh"
 						v-model="bdcdyh"
 						:style="{ width: inputWidth + 'px' }"
 						:style="{ width: inputWidth + 'px' }"
-						@focus="inputFocus"
-						@blur="inputBlur"
-						@change="inputChange"
 						class="searchInput"
 						class="searchInput"
 						placeholder="输入不动产单元号或室号"
 						placeholder="输入不动产单元号或室号"
 						><i
 						><i
@@ -23,8 +20,10 @@
 						></i
 						></i
 					></el-input>
 					></el-input>
 				</el-col>
 				</el-col>
-				<el-col :span="18">
-					<div class="fr">
+			</el-row>
+			<el-row class="searchContent">
+				<el-col :span="24">
+					<div class="fl">
 						<el-button class="radioBtn" label="1" border @click="create"
 						<el-button class="radioBtn" label="1" border @click="create"
 							><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
 							><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
 						>
 						>
@@ -82,12 +81,17 @@
 					</div>
 					</div>
 				</el-col>
 				</el-col>
 			</el-row>
 			</el-row>
+			<div class="change">
+				<i class="iconfont iconloupanbiaoxinxi" v-show="bjztFlag" @click="bjztChange" title="详细信息"></i>
+				<i class="iconfont iconloupanbiaobianji" v-show="!bjztFlag" @click="bjztChange" title="编辑楼盘"></i>
+			</div>
 		</div>
 		</div>
 		<div
 		<div
 			class="tab-content"
 			class="tab-content"
 			ref="tabContent"
 			ref="tabContent"
 			:style="{ height: lpbContentHight + 'px' }"
 			:style="{ height: lpbContentHight + 'px' }"
 			v-loading="lpbloading"
 			v-loading="lpbloading"
+			v-if="bjztFlag"
 		>
 		>
 			<!-- 左侧树结构 -->
 			<!-- 左侧树结构 -->
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
@@ -223,14 +227,19 @@
 			</div>
 			</div>
 		</div>
 		</div>
 		
 		
+        <xxxx v-if="!bjztFlag"></xxxx>
+
 		<!-- 右键菜单弹出框 -->
 		<!-- 右键菜单弹出框 -->
-		<el-dialog v-dialogDrag :close-on-click-modal="false" title="添加" :visible.sync="dialogVisible" width="50%" >
+		<el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" >
 			<!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容  -->
 			<!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容  -->
 			<div class="addCh" v-show="menuType == 'ljz'">
 			<div class="addCh" v-show="menuType == 'ljz'">
-				<addLjz ref="ljz"></addLjz>
+				<addLjz ref="ljz" :ljzbsm="curBsm"></addLjz>
 			</div>
 			</div>
 			<div class="addCh" v-show="menuType == 'zdy'">
 			<div class="addCh" v-show="menuType == 'zdy'">
-				<addZdy ref="zdy"></addZdy>
+				<addZdy ref="zdy" :zdybsm="curBsm"></addZdy>
+			</div>
+			<div class="addCh" v-show="menuType == 'c'">
+				<editCinfo ref="c" :cbsm="curBsm"></editCinfo>
 			</div>
 			</div>
 			<div class="addCh" v-show="menuType == 'ch'">
 			<div class="addCh" v-show="menuType == 'ch'">
 				<addCh
 				<addCh
@@ -266,8 +275,10 @@ import LineTree from "@components/lineTree/lineTree";
 import addLjz from "./ljz/index";
 import addLjz from "./ljz/index";
 import addZdy from "./zdy/index";
 import addZdy from "./zdy/index";
 import addCh from "./ch/index";
 import addCh from "./ch/index";
+import editCinfo from "./c/index";
 import lpbContent from "./lpbContent/index";
 import lpbContent from "./lpbContent/index";
 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
+import xxxx from '../xxxx/index'
 
 
 export default {
 export default {
 	name: "",
 	name: "",
@@ -281,6 +292,8 @@ export default {
 		PlSh,
 		PlSh,
 		PlH,
 		PlH,
 		PlZl,
 		PlZl,
+		xxxx,
+		editCinfo
 	},
 	},
 	props: {},
 	props: {},
 	data() {
 	data() {
@@ -300,7 +313,7 @@ export default {
 			pd: [], //创建楼盘的树结构数据
 			pd: [], //创建楼盘的树结构数据
 			menuType: "",
 			menuType: "",
 			treeData: {},
 			treeData: {},
-			inputWidth: 74,
+			inputWidth: 200,
 			selectedZt: "dyzt", //图例选中项，默认选中单元状态
 			selectedZt: "dyzt", //图例选中项，默认选中单元状态
 			dyztList: [
 			dyztList: [
 				{
 				{
@@ -367,6 +380,10 @@ export default {
 			dyztBsmList: {}, //单元状态bsmList
 			dyztBsmList: {}, //单元状态bsmList
 			cbsmList:[], // 层bsmlist
 			cbsmList:[], // 层bsmlist
 			lpbloading:true,
 			lpbloading:true,
+			bjztFlag:true,
+			taskTitle:'添加',
+			curBsm:'',
+			qsztList:[],
 		};
 		};
 	},
 	},
 	created() {
 	created() {
@@ -390,12 +407,20 @@ export default {
             if (this.bsms.length <= 0) {
             if (this.bsms.length <= 0) {
                 Message.warning("请选择操作户")
                 Message.warning("请选择操作户")
                 return
                 return
-            }
+            }else{
+				if (this.qsztList.indexOf('1') > -1) {
+					Message.warning("已提交的户无法继续操作")
+				}else{
 					batchCommit(this.bsms).then(res=>{
 					batchCommit(this.bsms).then(res=>{
-                if (res.success) {
-                    Message.success("提交成功")
+						if(res.code === 200){
+							Message.success("提交成功");
+							this.getlpbData();
+						}else {
+							this.$message.error(res.message);
 						}
 						}
 					})
 					})
+				}
+			}
 		},
 		},
         loading(){
         loading(){
             this.getLpbMenuTree(this.$store.state.zrzbsm);
             this.getLpbMenuTree(this.$store.state.zrzbsm);
@@ -411,7 +436,10 @@ export default {
             if (this.bsms.length <= 0) {
             if (this.bsms.length <= 0) {
                 Message.warning("请选择操作户")
                 Message.warning("请选择操作户")
                 return
                 return
-            }
+            }else{
+				if (this.qsztList.indexOf('1') > -1) {
+                	Message.warning("已提交的户无法继续操作")
+				}else{
 					switch (val) {
 					switch (val) {
 						case 'h':
 						case 'h':
 							this.plhVisible=true;
 							this.plhVisible=true;
@@ -425,6 +453,8 @@ export default {
 						default:
 						default:
 							break;
 							break;
 					}
 					}
+				}
+			}
         },
         },
 	    lodding(){
 	    lodding(){
 			this.getlpbData();
 			this.getlpbData();
@@ -441,11 +471,16 @@ export default {
 		plshClose() {
 		plshClose() {
 			this.plShVisible = false;
 			this.plShVisible = false;
 		},
 		},
+		//改变编辑或详细信息状态
+		bjztChange(){
+			this.bjztFlag = !this.bjztFlag;
+		},
 		//改变实预测数据类型
 		//改变实预测数据类型
 		scyclxChange(val){
 		scyclxChange(val){
 			//清空已选中层户
 			//清空已选中层户
 			this.cbsmList = [];
 			this.cbsmList = [];
 			this.bsms = [];
 			this.bsms = [];
+			this.qsztList = [];
 			this.$refs.lpbContent.hbsmList = [];
 			this.$refs.lpbContent.hbsmList = [];
 			this.$nextTick(()=>{
 			this.$nextTick(()=>{
 				//户
 				//户
@@ -495,6 +530,8 @@ export default {
 				this.resetInfo();
 				this.resetInfo();
 			});
 			});
 			this.dialogVisible = true;
 			this.dialogVisible = true;
+			this.taskTitle = '添加';
+			this.curBsm = '';
 		},
 		},
 		//弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
 		//弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
 		saveInfo() {
 		saveInfo() {
@@ -508,6 +545,9 @@ export default {
 				case "ch":
 				case "ch":
 					this.$refs.ch.onSave(this.pd[0].bsm);
 					this.$refs.ch.onSave(this.pd[0].bsm);
 					break;
 					break;
+				case "c":
+					this.$refs.c.onSave(this.pd[0].bsm);
+					break;
 				default:
 				default:
 					break;
 					break;
 			}
 			}
@@ -524,6 +564,9 @@ export default {
 				case "ch":
 				case "ch":
 					this.$refs.ch.reset();
 					this.$refs.ch.reset();
 					break;
 					break;
+				case "c":
+					this.$refs.c.reset();
+					break;
 
 
 				default:
 				default:
 					break;
 					break;
@@ -547,18 +590,29 @@ export default {
 				this.bsms = data;
 				this.bsms = data;
 			}
 			}
 		},
 		},
+		//获取选中户信息
+		getQsztList(data, type) {
+			if (type) {
+				// 双击
+				
+			} else {
+				//单击 TO DO
+				this.qsztList = data;
+			}
+		},
 		//获取选中层bsmlist
 		//获取选中层bsmlist
 		getCbsm(data){
 		getCbsm(data){
 			this.cbsmList = data;
 			this.cbsmList = data;
 		},
 		},
 		//不动产单元号输入框事件
 		//不动产单元号输入框事件
-		inputFocus() {
-			this.inputWidth = 200;
-		},
-		inputBlur() {
-			this.inputWidth = 74;
-		},
+		// inputFocus() {
+		// 	this.inputWidth = 200;
+		// },
+		// inputBlur() {
+		// 	this.inputWidth = 74;
+		// },
 		inputChange() {
 		inputChange() {
+			console.log(this.bdcdyh,'this.bdcdyh');
 			if (this.bdcdyh != "") {
 			if (this.bdcdyh != "") {
 				// console.log("查询" + this.bdcdyh);
 				// console.log("查询" + this.bdcdyh);
 				this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
 				this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
@@ -569,11 +623,13 @@ export default {
 				});
 				});
 			}
 			}
 		},
 		},
-		//调用楼盘表信息查询接口
+		//调用楼盘表信息查询和图例统计接口
 		getlpbData() {
 		getlpbData() {
 			this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
 			this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
+			this.getDyztBsmList();
+			this.getLpbFwytAndQlxz();
 			//改变楼盘表子组件的key值，重新渲染
 			//改变楼盘表子组件的key值，重新渲染
-			// this.time = new Date().getTime();
+			this.time = new Date().getTime();
 		},
 		},
 		//实预测装换
 		//实预测装换
 		plScYcChange() {
 		plScYcChange() {
@@ -612,7 +668,9 @@ export default {
 		},
 		},
 		//批量添加不动产单元号
 		//批量添加不动产单元号
 		addBdcdyh() {
 		addBdcdyh() {
-			// this.pd[0].bsm //自然幢标识码
+			if (this.qsztList.indexOf('1') > -1) {
+				Message.warning("已提交的户无法继续操作")
+			}else{
 				batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then(
 				batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then(
 					(res) => {
 					(res) => {
 						if (res.code === 200) {
 						if (res.code === 200) {
@@ -621,9 +679,12 @@ export default {
 							let hasGenerateCount = res.result.hasGenerateCount;
 							let hasGenerateCount = res.result.hasGenerateCount;
 							let unGenerateCount = res.result.unGenerateCount;
 							let unGenerateCount = res.result.unGenerateCount;
 							this.open(hasGenerateCount,unGenerateCount);
 							this.open(hasGenerateCount,unGenerateCount);
+						}else {
+							this.$message.warning(res.message)
 						}
 						}
 					}
 					}
 				);
 				);
+			}
 		},
 		},
 
 
 		open(hasGenerateCount,unGenerateCount) {
 		open(hasGenerateCount,unGenerateCount) {
@@ -774,7 +835,9 @@ export default {
 		padding: 20px 0;
 		padding: 20px 0;
 		background-color: #ffffff;
 		background-color: #ffffff;
 		margin-bottom: 15px;
 		margin-bottom: 15px;
+		position: relative;
 		.searchContent {
 		.searchContent {
+			margin-left: 62px;
 			box-sizing: border-box;
 			box-sizing: border-box;
 			padding: 0 20px;
 			padding: 0 20px;
 			/deep/.el-radio-button__inner {
 			/deep/.el-radio-button__inner {
@@ -797,6 +860,22 @@ export default {
 				display: inline-block;
 				display: inline-block;
 			}
 			}
 		}
 		}
+		.change{
+			position: absolute;
+			left: 0;
+			top: 0;
+			height: 100%;
+			width: 80px;
+			border-right: 1px solid #dedede;
+			i{
+				cursor: pointer;
+				color: #0090FF;
+				font-size: 36px;
+				display: inherit;
+				text-align: center;
+				line-height: 128px;
+			}
+		}
 		.radioBtn {
 		.radioBtn {
 			margin-left: 10px;
 			margin-left: 10px;
 			padding: 12px 10px;
 			padding: 12px 10px;
@@ -918,7 +997,7 @@ export default {
 	}
 	}
 	.btnGroup {
 	.btnGroup {
 		margin: 20px auto 0;
 		margin: 20px auto 0;
-		width: 230px;
+		width: 260px;
 	}
 	}
 	.hbjDialog{
 	.hbjDialog{
 		/deep/ .el-dialog{
 		/deep/ .el-dialog{

@@ -21,7 +21,7 @@
 						</td>
 						</td>
 						<td colspan="2" align="center">自然幢号</td>
 						<td colspan="2" align="center">自然幢号</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.zrzh" maxlength="24"></el-input>
+							<el-input v-model="form.zrzh" maxlength="24" disabled></el-input>
 						</td>
 						</td>
 					</tr>
 					</tr>
 					<tr height="30">
 					<tr height="30">
@@ -55,33 +55,33 @@
 					<tr height="30">
 					<tr height="30">
 						<td colspan="2" align="center">预测建筑面积(㎡)</td>
 						<td colspan="2" align="center">预测建筑面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.ycjzmj"></el-input>
+							<el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 						<td colspan="2" align="center">实测建筑面积(㎡)</td>
 						<td colspan="2" align="center">实测建筑面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.scjzmj"></el-input>
+							<el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 					</tr>
 					</tr>
 
 
 					<tr height="30">
 					<tr height="30">
 						<td colspan="2" align="center">预测地下面积(㎡)</td>
 						<td colspan="2" align="center">预测地下面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.ycdxmj"></el-input>
+							<el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 						<td colspan="2" align="center">实测地下面积(㎡)</td>
 						<td colspan="2" align="center">实测地下面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.scdxmj"></el-input>
+							<el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 					</tr>
 					</tr>
 
 
 					<tr height="30">
 					<tr height="30">
 						<td colspan="2" align="center">预测其他面积(㎡)</td>
 						<td colspan="2" align="center">预测其他面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.ycqtmj"></el-input>
+							<el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 						<td colspan="2" align="center">实测其他面积(㎡)</td>
 						<td colspan="2" align="center">实测其他面积(㎡)</td>
 						<td colspan="4">
 						<td colspan="4">
-							<el-input v-model="form.scqymj"></el-input>
+							<el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
 						</td>
 						</td>
 					</tr>
 					</tr>
 
 
@@ -96,28 +96,25 @@
 							:rowspan="ytTitleRowspan"
 							:rowspan="ytTitleRowspan"
 							align="center"
 							align="center"
 						>
 						>
-							<el-button
-								type="primary"
-								size="mini"
-								style="margin-right: 10px"
-								@click="addYtInfo"
-								>添加</el-button
-							>
+							<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
 							<span>用途</span>
 							<span>用途</span>
 						</td>
 						</td>
 						<td colspan="1" align="center">
 						<td colspan="1" align="center">
-							<span @click="deleteYtInfo(index)">删除</span>
+							<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
 						</td>
 						</td>
 						<td colspan="9">
 						<td colspan="9">
-							<el-select v-model="item1.fwytzdbsm" placeholder="请选择">
-								<el-option
-									v-for="item in $store.state.tdytList"
-									:key="item.bsm"
-									:label="item.mc"
-									:value="item.bsm"
-								>
-								</el-option>
-							</el-select>
+							<el-select-tree  style="width:100%"
+											 ref="yt"
+											 v-if="show"
+											 :default-expand-all="defaultExpandAll"
+											 :multiple="multiple"
+											 :placeholder="placeholder"
+											 :data="$store.state.fwytList"
+											 :props="treeProps"
+											 :check-strictly="checkStrictly"
+											 :clearable="clearable"
+											 v-model="item1.fwytzdbsm"
+							></el-select-tree>
 						</td>
 						</td>
 					</tr>
 					</tr>
 
 
@@ -132,28 +129,25 @@
 							:rowspan="fwjgTitleRowspan"
 							:rowspan="fwjgTitleRowspan"
 							align="center"
 							align="center"
 						>
 						>
-							<el-button
-								type="primary"
-								size="mini"
-								style="margin-right: 10px"
-								@click="addFwjgInfo"
-								>添加</el-button
-							>
+							<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
 							<span>房屋结构</span>
 							<span>房屋结构</span>
 						</td>
 						</td>
 						<td colspan="1" align="center">
 						<td colspan="1" align="center">
-							<span @click="deleteFwjgInfo(index)">删除</span>
+							<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
 						</td>
 						</td>
 						<td colspan="9">
 						<td colspan="9">
-							<el-select v-model="item1.fwjgzdbsm" placeholder="请选择">
-								<el-option
-									v-for="item in $store.state.jgOptions"
-									:key="item.bsm"
-									:label="item.mc"
-									:value="item.bsm"
-								>
-								</el-option>
-							</el-select>
+							<el-select-tree  style="width:100%"
+											 ref="yt"
+											 v-if="show"
+											 :default-expand-all="defaultExpandAll"
+											 :multiple="multiple"
+											 :placeholder="placeholder"
+											 :data="$store.state.jgOptions"
+											 :props="treeProps"
+											 :check-strictly="checkStrictly"
+											 :clearable="clearable"
+											 v-model="item1.fwjgzdbsm"
+							></el-select-tree>
 						</td>
 						</td>
 					</tr>
 					</tr>
 
 
@@ -192,12 +186,34 @@
 
 
 <script>
 <script>
 import { insertLjzInfo } from "@api/lpb";
 import { insertLjzInfo } from "@api/lpb";
+import { getQjLjzDetailById,updateQjLjz } from "@api/ljz";
 import { formdate } from "@libs/function";
 import { formdate } from "@libs/function";
 export default {
 export default {
 	name: "ljz",
 	name: "ljz",
 	components: {},
 	components: {},
+	props: {
+		ljzbsm:{
+			type: String,
+			default: '',
+		}
+	},
 	data() {
 	data() {
 		return {
 		return {
+
+			//树型结构
+			show:true,
+			clearable: true,
+			defaultExpandAll: true,
+			multiple: false,
+			placeholder: '请选择',
+			disabled: false,
+			checkStrictly: true,
+			treeProps: {
+				value: 'bsm',
+				children: 'children',
+				label: 'mc'
+			},
+
 			form: {
 			form: {
 				zrzbsm: "",
 				zrzbsm: "",
 				ljzh: "", //逻辑幢号
 				ljzh: "", //逻辑幢号
@@ -269,7 +285,7 @@ export default {
 			this.form = {
 			this.form = {
 				// zrzbsm: "",
 				// zrzbsm: "",
 				ljzh: "", //逻辑幢号
 				ljzh: "", //逻辑幢号
-				// zrzh: "", //自然幢号
+				zrzh: this.$store.state.zrzh, //自然幢号
 				ljzmc: "", //逻辑幢顺序号
 				ljzmc: "", //逻辑幢顺序号
 				bdcdyh: "", //不动产单元号
 				bdcdyh: "", //不动产单元号
 				mph: "", //门牌号
 				mph: "", //门牌号
@@ -299,6 +315,8 @@ export default {
 				zcs: "", //总层数
 				zcs: "", //总层数
 				jzwzt: "", //建筑物状态
 				jzwzt: "", //建筑物状态
 			};
 			};
+			this.ytTitleRowspan= 1; //用途的单元格垂直合并数量
+			this.fwjgTitleRowspan= 1; //用途的单元格垂直合并数量
 		},
 		},
 		deleteFwjgInfo(index) {
 		deleteFwjgInfo(index) {
 			if (this.form.fwjgList.length <= 1) {
 			if (this.form.fwjgList.length <= 1) {
@@ -314,6 +332,7 @@ export default {
 		onSave(data, bsm) {
 		onSave(data, bsm) {
 			//自然幢标识码
 			//自然幢标识码
 			this.form.zrzbsm = bsm;
 			this.form.zrzbsm = bsm;
+			if(this.ljzbsm == ''){
 				insertLjzInfo(this.form).then((res) => {
 				insertLjzInfo(this.form).then((res) => {
 					if (res.code === 200) {
 					if (res.code === 200) {
 						this.$message.success("保存成功");
 						this.$message.success("保存成功");
@@ -322,16 +341,86 @@ export default {
 						this.$parent.$parent.getLpbMenuTree(bsm);
 						this.$parent.$parent.getLpbMenuTree(bsm);
 						//关闭弹框
 						//关闭弹框
 						this.$parent.$parent.closeDaialog();
 						this.$parent.$parent.closeDaialog();
+					}else{
+						this.$message.error(res.message);
 					}
 					}
 				});
 				});
+			}else{
+				//逻辑幢更新接口调用 TODO
+				console.log('保存');
+				updateQjLjz(this.form).then((res)=>{
+					if(res.code === 200){
+						this.$message.success("修改成功")
+					}
+				})
+			}
 		},
 		},
 		onSubmit() {
 		onSubmit() {
-			console.log(this.form);
+			// console.log(this.form);
+		},
+		//根据逻辑幢bsm查询逻辑幢信息
+		getLjzInfo(bsm){
+			//逻辑幢信息查询接口调用 bsm为逻辑幢bsm
+			getQjLjzDetailById(bsm).then((res)=>{
+				if(res.code === 200){
+					this.form = res.result;
+					this.form.zrzh = this.$store.state.zrzh;
+					this.form.fwjgList= [
+						{
+							fwjgzdbsm: "", //房屋结构字典标识码
+							glbsm: "", //关联标识码
+							sx: "", //顺序
+						},
+					];
+					this.form.ytList= [
+						{
+							glbsm: "", //关联标识码
+							fwytzdbsm: "", //房屋用途字典标识码
+							sx: "", //顺序
 						},
 						},
+					];
+					if(this.form.qjfwjg.length>0){
+						this.form.fwjgList= [];
+						for(let i =0;i<this.form.qjfwjg.length;i++){
+							this.form.fwjgList.push({
+								fwjgzdbsm: this.form.qjfwjg[i].fwjgzdbsm, //房屋结构字典标识码
+								glbsm: this.form.qjfwjg[i].glbsm, //关联标识码
+								sx: this.form.qjfwjg[i].sx, //顺序
+							})
+						}
+					}
+					if(this.form.qjfwyt.length>0){
+						this.form.ytList= [];
+						for(let i =0;i<this.form.qjfwyt.length;i++){
+							this.form.ytList.push({
+								fwytzdbsm: this.form.qjfwyt[i].fwytzdbsm, //房屋结构字典标识码
+								glbsm: this.form.qjfwyt[i].glbsm, //关联标识码
+								sx: this.form.qjfwyt[i].sx, //顺序
+							})
+						}
+					}
+					console.log(JSON.stringify(this.form)+":this.form")
+				}
+			})
+			this.$forceUpdate();
+		}
+	},
+	created() {
 	},
 	},
-	created() {this.form.zrzh = this.$store.state.zrzh;},
 	mounted() {
 	mounted() {
+		this.form.zrzh = this.$store.state.zrzh;
 	},
 	},
+	watch:{
+		ljzbsm: {
+			handler: function (item) {
+				console.log(item,'item');
+				if(item!='' && this.$parent.menuType == 'ljz'){
+					this.getLjzInfo(this.ljzbsm)
+				}
+			},
+			immediate: true
+		},
+	}
 };
 };
 </script>
 </script>
 <style rel="stylesheet/less" lang="less" scoped>
 <style rel="stylesheet/less" lang="less" scoped>

@@ -46,9 +46,16 @@
 <script>
 <script>
 
 
     import {insertZdyInfo} from "@api/lpb"
     import {insertZdyInfo} from "@api/lpb"
+    import {getQjZdyDetailById,updateQjZdy} from "@api/zdy"
     export default {
     export default {
         name: "index",
         name: "index",
         components: {},
         components: {},
+        props: {
+            zdybsm:{
+                type: String,
+                default: '',
+            }
+        },
         data(){
         data(){
             return{
             return{
                 form:{
                 form:{
@@ -86,6 +93,8 @@
             submitForm(formName,zrzbsm,ljzbsm) {
             submitForm(formName,zrzbsm,ljzbsm) {
                 this.form.zrzbsm=zrzbsm;
                 this.form.zrzbsm=zrzbsm;
                 this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm;
                 this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm;
+                //判断zdybsm是否为空，不为空的时候是编辑，为空的时候是新增
+                if (this.zdybsm == '') {
                     this.$refs[formName].validate((valid) => {
                     this.$refs[formName].validate((valid) => {
                         if (valid) {
                         if (valid) {
                             insertZdyInfo(this.form).then((res)=>{
                             insertZdyInfo(this.form).then((res)=>{
@@ -103,6 +112,23 @@
                             return false;
                             return false;
                         }
                         }
                     });
                     });
+                }else{
+                    //编辑幢单元接口
+                    updateQjZdy(this.form).then((res)=>{
+                        if(res.code === 200){
+                            this.$message.success("保存成功")
+                        }
+                    })
+                }
+            },
+            getZdyInfo(bsm){
+                //查询幢单元信息接口
+                getQjZdyDetailById(bsm).then((res)=>{
+                    if(res.code === 200){
+                        this.form = res.result;
+                    }
+                })
+
             },
             },
             reset(){
             reset(){
                 this.form = {
                 this.form = {
@@ -114,11 +140,21 @@
                     bz:'',
                     bz:'',
                 }
                 }
             }
             }
+        },
+        watch:{
+            zdybsm: {
+                handler: function (item) {
+                    if(item!='' && this.$parent.$parent.menuType == 'zdy'){
+                        this.getZdyInfo(item)
+                    }
+                },
+                immediate: true
+            },
         }
         }
     }
     }
 </script>
 </script>
 
 
-<style scoped>
+<style scoped lang="less">
     /deep/.el-input__inner{
     /deep/.el-input__inner{
         width: 100%;
         width: 100%;
         border:0;
         border:0;

 <template>
 <template>
   <div class="lpb">
   <div class="lpb">
-     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="编辑楼盘" name="edit">
       <bjlp></bjlp>
       <bjlp></bjlp>
+     <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="编辑楼盘" name="edit">
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="预览楼盘" name="preview">
       <el-tab-pane label="预览楼盘" name="preview">
         <yllp></yllp>
         <yllp></yllp>
@@ -10,17 +10,15 @@
       <el-tab-pane label="详细信息" name="detail">
       <el-tab-pane label="详细信息" name="detail">
         <xxxx></xxxx>
         <xxxx></xxxx>
       </el-tab-pane>
       </el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import bjlp from "./bjlp"
 import bjlp from "./bjlp"
-import yllp from "./yllp"
-import xxxx from "./xxxx"
 export default {
 export default {
   name:"",
   name:"",
-  components:{bjlp,yllp,xxxx},
+  components:{bjlp},
   props:{},
   props:{},
   data() {
   data() {
       return {
       return {

 <template>
 <template>
   <div class="">
   <div class="">
-    <el-radio-group  v-model="scyclx" @change="scyclxChange">
-      <el-radio-button label="0">预测</el-radio-button>
-      <el-radio-button label="1">实测</el-radio-button>
-    </el-radio-group>
-    <el-button @click="update">更新数据</el-button>
     <el-table
     <el-table
             :data="tableData"
             :data="tableData"
             style="width: 100%;margin-bottom: 20px;"
             style="width: 100%;margin-bottom: 20px;"
@@ -14,6 +9,7 @@
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column
       <el-table-column
               prop="mc"
               prop="mc"
+              width="200"
               label="地址(单元名称)">
               label="地址(单元名称)">
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
@@ -73,7 +69,6 @@ export default {
       tableData: [],
       tableData: [],
       scData:[],
       scData:[],
       ycData:[],
       ycData:[],
-      scyclx:'0',
     }
     }
   },
   },
   created(){},
   created(){},
@@ -82,13 +77,6 @@ export default {
   },
   },
   methods:{
   methods:{
 
 
-    scyclxChange(){
-      if(this.scyclx === '0'){
-        this.tableData = this.ycData;
-      }else {
-        this.tableData = this.scData;
-      }
-    },
 
 
     chFilter(row, column){
     chFilter(row, column){
       if(row.ch === 0){
       if(row.ch === 0){
@@ -106,26 +94,20 @@ export default {
       }
       }
     },
     },
 
 
-    update(){
-      this.getData();
-    },
+    // update(){
+    //   this.getData();
+    // },
 
 
     getData(){
     getData(){
       let zrzbsm = this.$store.state.zrzbsm;
       let zrzbsm = this.$store.state.zrzbsm;
       // let scyclx = this.scyclx;
       // let scyclx = this.scyclx;
-      getDetailInfo(zrzbsm,'0').then((res)=>{
+      getDetailInfo(zrzbsm,this.$parent.scyclx).then((res)=>{
         if(res.code===200){
         if(res.code===200){
           console.log(res.result)
           console.log(res.result)
           this.ycData = res.result;
           this.ycData = res.result;
           this.tableData=this.ycData;
           this.tableData=this.ycData;
         }
         }
       });
       });
-      getDetailInfo(zrzbsm,'1').then((res)=>{
-        if(res.code===200){
-          console.log(res.result)
-          this.scData = res.result;
-        }
-      })
     },
     },
 
 
     load(tree, treeNode, resolve) {
     load(tree, treeNode, resolve) {
@@ -148,8 +130,16 @@ export default {
 
 
 
 
   },
   },
-  computed: {},
-  watch: {},
+  computed: {
+    scyclx(){
+      return this.$parent.scyclx
+    }
+  },
+  watch: {
+    scyclx(){
+      this.getData();
+    }
+  },
 }
 }
 </script>
 </script>
 <style scoped  lang="less">
 <style scoped  lang="less">

@@ -3,29 +3,34 @@
         <table border="1">
         <table border="1">
             <tr>
             <tr>
                 <td colspan="3">宗地代码</td>
                 <td colspan="3">宗地代码</td>
-                <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td>
+                <td colspan="4">
+                    <el-input v-model="zddm " disabled></el-input>
+                </td>
             </tr>
             </tr>
             <tr>
             <tr>
                 <td colspan="3">建筑物区分所有权业主共有部分权利人</td>
                 <td colspan="3">建筑物区分所有权业主共有部分权利人</td>
-                <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td>
+                <td colspan="4">
+                    <el-input v-model="Data.qlr" disabled></el-input>
+                </td>
             </tr>
             </tr>
         </table>
         </table>
         <table border="1">
         <table border="1">
             <tr>
             <tr>
-                <td>
+                <th>
                     <el-button
                     <el-button
                             type="primary"
                             type="primary"
                             class="changeBtn inAdd addMinus"
                             class="changeBtn inAdd addMinus"
                             @click="addRow"
                             @click="addRow"
-                                >+</el-button
+                    >+
+                    </el-button
                     >
                     >
-                </td>
-                <td>建(构)筑物编号</td>
-                <td>建(构)筑物数量</td>
-                <td>建(构)筑物面积(㎡)</td>
-                <td>占地面积(㎡)</td>
-                <td>分摊土地面积(㎡)</td>
-                <td>附记</td>
+                </th>
+                <th>建(构)筑物编号</th>
+                <th>建(构)筑物数量</th>
+                <th>建(构)筑物面积(㎡)</th>
+                <th>占地面积(㎡)</th>
+                <th>分摊土地面积(㎡)</th>
+                <th>附记</th>
             </tr>
             </tr>
             <tr v-for="(item,i) in Data.list" :key="i">
             <tr v-for="(item,i) in Data.list" :key="i">
                 <td>
                 <td>
@@ -33,29 +38,34 @@
                             type="primary"
                             type="primary"
                             class="changeBtn inMinus addMinus"
                             class="changeBtn inMinus addMinus"
                             @click="delRow(i)"
                             @click="delRow(i)"
-                        >-</el-button
+                    >-
+                    </el-button
                     >
                     >
                 </td>
                 </td>
-                <td><el-input  v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
-                <td><el-input  v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
-                <td><el-input  v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
-                <td><el-input  v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
-                <td><el-input  v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
-                <td><el-input  v-model="item.fj" placeholder="请输入附记"></el-input></td>
+                <td>
+                    <el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号" maxlength="10"></el-input>
+                </td>
+                <td>
+                    <el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,9}/g)) || null"
+                              placeholder="请输入建(构)筑物数量"></el-input>
+                </td>
+                <td>
+                    <el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
+                              placeholder="请输入建(构)筑物面积(㎡)"></el-input>
+                </td>
+                <td>
+                    <el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
+                              placeholder="请输入占地面积(㎡)"></el-input>
+                </td>
+                <td>
+                    <el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
+                              placeholder="请输入分摊土地面积(㎡)"></el-input>
+                </td>
+                <td>
+                    <el-input v-model="item.fj" placeholder="请输入附记"></el-input>
+                </td>
             </tr>
             </tr>
-            <!--   <tr>
-                    <td>统计</td>
-                    <td>{{sumTdsyqsyqmj}}</td>
-                    <td>{{sumDydytdmj}}</td>
-                    <td>{{sumFttdmj}}</td>
-                    <td>{{sumFttdmj}}</td>
-                    <td>{{sumFttdmj}}</td>
-                    <td>{{sumFttdmj}}</td>
-                </tr>-->
         </table>
         </table>
-        <!-- <div class="pers">
-            <el-button @click="save" type="primary">保存</el-button>
-        </div> -->
         <div class="header-button" :style="{width:mainBoxWidth+'px'}">
         <div class="header-button" :style="{width:mainBoxWidth+'px'}">
             <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
             <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
         </div>
         </div>
@@ -85,14 +95,13 @@
                         fj: ''
                         fj: ''
                     }]
                     }]
                 },
                 },
-                mainBoxWidth:0
+                mainBoxWidth: 0
             }
             }
         },
         },
 
 
         methods: {
         methods: {
             getData(id) {
             getData(id) {
                 queryYzgy(id).then(res => {
                 queryYzgy(id).then(res => {
-                    console.log(res)
                     if (res.result != null) {
                     if (res.result != null) {
                         this.Data = res.result
                         this.Data = res.result
                     }
                     }
@@ -100,12 +109,11 @@
             },
             },
             save() {
             save() {
                 console.log(this.Data);
                 console.log(this.Data);
-                if(this.Data.list.length === 0){
+                if (this.Data.list.length === 0) {
                     Message.info("至少填写一条建筑物信息")
                     Message.info("至少填写一条建筑物信息")
                     return
                     return
                 }
                 }
                 saveYzgy(this.Data).then(res => {
                 saveYzgy(this.Data).then(res => {
-                    console.log(res)
                     if (res.success) {
                     if (res.success) {
                         Message.success("新增成功")
                         Message.success("新增成功")
                         this.getData(this.$store.state.zrzbsm)
                         this.getData(this.$store.state.zrzbsm)
@@ -194,7 +202,9 @@
     .dzwsl {
     .dzwsl {
         width: 200px;
         width: 200px;
     }
     }
+
     .header-button {
     .header-button {
+        z-index: 3;
         height: 50px;
         height: 50px;
         position: fixed;
         position: fixed;
         bottom: 0;
         bottom: 0;

@@ -5,6 +5,7 @@ let Timestamp = new Date().getTime();
 function resolve(dir) {
 function resolve(dir) {
     return path.join(__dirname, dir)
     return path.join(__dirname, dir)
 }
 }
+const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 
 
 module.exports = {
 module.exports = {
     publicPath: './',
     publicPath: './',
@@ -19,6 +20,7 @@ module.exports = {
             .set('@libs', resolve('src/libs'))
             .set('@libs', resolve('src/libs'))
             .set('@router', resolve('src/router'))
             .set('@router', resolve('src/router'))
             .set('@components', resolve('src/components'))
             .set('@components', resolve('src/components'))
+			.set('@assets', resolve('src/assets'))
     },
     },
     pluginOptions: {
     pluginOptions: {
         'style-resources-loader': {
         'style-resources-loader': {
@@ -31,8 +33,17 @@ module.exports = {
             filename: `js/[name].${Timestamp}.js`,
             filename: `js/[name].${Timestamp}.js`,
             chunkFilename: `js/[name].${Timestamp}.js`
             chunkFilename: `js/[name].${Timestamp}.js`
         },
         },
-        // plugins: [
-
+        plugins: [
+          // 去除console和debugger
+          // new UglifyJsPlugin({
+          //   uglifyOptions: {
+          //     compress: {
+          //       drop_console: true,
+          //       drop_debugger: true,
+          //     },
+          //   },
+          //   parallel: true,
+          // }),
         //     new FileManagerPlugin({  //初始化 filemanager-webpack-plugin 插件实例
         //     new FileManagerPlugin({  //初始化 filemanager-webpack-plugin 插件实例
         //       onEnd: {
         //       onEnd: {
         //         mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
         //         mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
@@ -41,16 +52,20 @@ module.exports = {
         //         ]
         //         ]
         //       }
         //       }
         //     })
         //     })
-        // ]
+        ]
     },
     },
     devServer: {
     devServer: {
+      host: "192.168.2.61",
       host: "0.0.0.0",
       host: "0.0.0.0",
-      port: 8006,
+      port: 8008,
       https: false,
       https: false,
       hotOnly: false,
       hotOnly: false,
       proxy: {
       proxy: {
         "/api": {
         "/api": {
-          target: process.env.VUE_APP_api3,
+          // target: 'https://192.168.2.119:8006', //泽平 
+          // target: process.env.VUE_APP_api1, //本地
+          target: process.env.VUE_APP_api, //赵千
+          // target: process.env.VUE_APP_api4, //赵千
           changeOrigin: true,
           changeOrigin: true,
           pathRewrite: {
           pathRewrite: {
             "^/api": "/",
             "^/api": "/",