Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -112,30 +112,30 @@
                         <td colspan="4"></td>
                     </tr>
                     <tr>
-                        <td colspan="2" class="tdright">房屋结构</td>
-                        <td colspan="5">
-                            <el-select class="selectTitle"  v-model="form.fwjgbsm">
-                                <el-option
-                                    v-for="item in  $store.state.jgOptions"
-                                    :key="item.bsm"
-                                    :label="item.mc"
-                                    :value="item.bsm">
-                                </el-option>
-                            </el-select>
-                        </td>
+                        <td colspan="2" class="tdright">东墙体归属</td>
+                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
+                        <td colspan="2" class="tdright">南墙体归属</td>
+                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
                     </tr>
+                    <tr>
+                        <td colspan="2" class="tdright">西墙体归属</td>
+                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
+                        <td colspan="2" class="tdright">北墙体归属</td>
+                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
+                    </tr>
+
                     <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
                         <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center"   id="ytTitle" class="tdright">
-						    <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
-                            <span>用途</span>
+						    <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
+                            <span>房屋用途</span>
                         </td>
 
                         <td width="30" colspan="1" align="center"  class="tdright">
 					        <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
                             规划用途
                         </td>
-                        <td width="30" colspan="4" align="center"  >
-                            <el-select-tree
+                        <td width="30" colspan="3" align="center"  >
+                            <el-select-tree style="width:100%"
                                     v-if="show"
                                     :default-expand-all="defaultExpandAll"
                                     :multiple="multiple"
@@ -148,9 +148,9 @@
                                     v-model="item1.fwytzdbsm"
                             ></el-select-tree>
                         </td>
-                        <td width="30" colspan="1" align="center"  class="tdright">用途</td>
+                        <td width="30" colspan="2" align="center"  class="tdright">用途</td>
                         <td width="30" colspan="4" align="center"  >
-                            <el-select-tree
+                            <el-select-tree style="width:100%"
                                     v-if="show" 
                                     :default-expand-all="defaultExpandAll"
                                     :multiple="multiple"
@@ -167,15 +167,15 @@
 
                     <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
                         <td   colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center"  class="tdright">
-						    <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
+						    <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
                             <span>房屋结构</span>
                         </td>
                         <td   colspan="1" align="center"  >
-					        <i class="iconfont iconicon-test" style="margin-right: 10px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
-                            <span>删除</span>
+					        <i class="iconfont iconicon-test" style="margin-right: 8px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
+                            <span>房屋结构</span>
                         </td>
                         <td   colspan="9"  >
-                            <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
+                            <el-select style="width:100%" v-model="item1.fwjgzdbsm" placeholder="请选择" >
                                 <el-option
                                     v-for="item in  $store.state.jgOptions"
                                     :key="item.bsm"
@@ -192,18 +192,6 @@
                         </td>
                     </tr>
 
-                    <tr>
-                        <td colspan="2" class="tdright">东墙体归属</td>
-                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
-                        <td colspan="2" class="tdright">南墙体归属</td>
-                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2" class="tdright">西墙体归属</td>
-                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
-                        <td colspan="2" class="tdright">北墙体归属</td>
-                        <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
-                    </tr>
                 </table>
             </div>
             <div class="shop">