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

@@ -71,9 +71,9 @@
                 </tr>
 
                 <tr height="30">
-                    <td  colspan="2" align="center" type="number" >多幢独用土地面积（㎡）</td>
+                    <td  colspan="2" align="center" >多幢独用土地面积（㎡）</td>
                     <td  colspan="4"  >
-                        <input class="formInput" v-model="form.dlsytdmj">
+                        <input class="formInput" type="number"  v-model="form.dlsytdmj">
                     </td>
                     <td  colspan="2" align="center"  >产权来源</td>
                     <td  colspan="4"  >
@@ -89,23 +89,24 @@
                 </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">
-                        <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
-                        <span>用途</span>
+                    <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright"  id="ytTitle">
+						<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
+                        <span><i class="requisite">*</i>房屋用途</span>
                     </td>
 
-                    <td  colspan="1" align="center"  >
-                        <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
+                    <td  colspan="1" style="min-width:120px" class="tdright">
+					    <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
                         规划用途
                     </td>
-                    <td  colspan="3" align="center"  >
+                    <td colspan="3" >
                         <el-select-tree  style="width:100%"
+                                ref="ghyt"
                                 v-if="show"
                                 @change="updateSjfyyt(item1)"
                                 :default-expand-all="defaultExpandAll"
                                 :multiple="multiple"
                                 :placeholder="placeholder"
-                                        :disabled="disabled"
+                                :disabled="form.qszt!='0'"
                                 :data="$store.state.fwytList"
                                 :props="treeProps"
                                 :check-strictly="checkStrictly"
@@ -113,14 +114,15 @@
                                 v-model="item1.fwytzdbsm"
                         ></el-select-tree>
                     </td>
-                    <td  colspan="2" align="center"  >用途</td>
-                    <td  colspan="4">
+                    <td colspan="2" class="tdright">实际用途</td>
+                    <td colspan="4" >
                         <el-select-tree  style="width:100%"
+                                ref="yt"
                                 v-if="show"
                                 :default-expand-all="defaultExpandAll"
                                 :multiple="multiple"
                                 :placeholder="placeholder"
-                                        :disabled="disabled"
+                                :disabled="form.qszt!='0'"
                                 :data="$store.state.fwytList"
                                 :props="treeProps"
                                 :check-strictly="checkStrictly"
@@ -523,6 +525,9 @@
         box-sizing: border-box;
         padding: 18px;
         padding-bottom: 0;
+        .iconfont{
+            cursor: pointer;
+        }
 
         /deep/textarea{
             width: 100%;