Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
1 changed file
with
38 additions
and
33 deletions
... | @@ -71,9 +71,9 @@ | ... | @@ -71,9 +71,9 @@ |
71 | </tr> | 71 | </tr> |
72 | 72 | ||
73 | <tr height="30"> | 73 | <tr height="30"> |
74 | <td colspan="2" align="center" type="number" >多幢独用土地面积(㎡)</td> | 74 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> |
75 | <td colspan="4" > | 75 | <td colspan="4" > |
76 | <input class="formInput" v-model="form.dlsytdmj"> | 76 | <input class="formInput" type="number" v-model="form.dlsytdmj"> |
77 | </td> | 77 | </td> |
78 | <td colspan="2" align="center" >产权来源</td> | 78 | <td colspan="2" align="center" >产权来源</td> |
79 | <td colspan="4" > | 79 | <td colspan="4" > |
... | @@ -89,43 +89,45 @@ | ... | @@ -89,43 +89,45 @@ |
89 | </tr> | 89 | </tr> |
90 | 90 | ||
91 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> | 91 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> |
92 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> | 92 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle"> |
93 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> | 93 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
94 | <span>用途</span> | 94 | <span><i class="requisite">*</i>房屋用途</span> |
95 | </td> | 95 | </td> |
96 | 96 | ||
97 | <td colspan="1" align="center" > | 97 | <td colspan="1" style="min-width:120px" class="tdright"> |
98 | <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> | 98 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> |
99 | 规划用途 | 99 | 规划用途 |
100 | </td> | 100 | </td> |
101 | <td colspan="3" align="center" > | 101 | <td colspan="3" > |
102 | <el-select-tree style="width:100%" | 102 | <el-select-tree style="width:100%" |
103 | v-if="show" | 103 | ref="ghyt" |
104 | @change="updateSjfyyt(item1)" | 104 | v-if="show" |
105 | :default-expand-all="defaultExpandAll" | 105 | @change="updateSjfyyt(item1)" |
106 | :multiple="multiple" | 106 | :default-expand-all="defaultExpandAll" |
107 | :placeholder="placeholder" | 107 | :multiple="multiple" |
108 | :disabled="disabled" | 108 | :placeholder="placeholder" |
109 | :data="$store.state.fwytList" | 109 | :disabled="form.qszt!='0'" |
110 | :props="treeProps" | 110 | :data="$store.state.fwytList" |
111 | :check-strictly="checkStrictly" | 111 | :props="treeProps" |
112 | :clearable="clearable" | 112 | :check-strictly="checkStrictly" |
113 | v-model="item1.fwytzdbsm" | 113 | :clearable="clearable" |
114 | v-model="item1.fwytzdbsm" | ||
114 | ></el-select-tree> | 115 | ></el-select-tree> |
115 | </td> | 116 | </td> |
116 | <td colspan="2" align="center" >用途</td> | 117 | <td colspan="2" class="tdright">实际用途</td> |
117 | <td colspan="4"> | 118 | <td colspan="4" > |
118 | <el-select-tree style="width:100%" | 119 | <el-select-tree style="width:100%" |
119 | v-if="show" | 120 | ref="yt" |
120 | :default-expand-all="defaultExpandAll" | 121 | v-if="show" |
121 | :multiple="multiple" | 122 | :default-expand-all="defaultExpandAll" |
122 | :placeholder="placeholder" | 123 | :multiple="multiple" |
123 | :disabled="disabled" | 124 | :placeholder="placeholder" |
124 | :data="$store.state.fwytList" | 125 | :disabled="form.qszt!='0'" |
125 | :props="treeProps" | 126 | :data="$store.state.fwytList" |
126 | :check-strictly="checkStrictly" | 127 | :props="treeProps" |
127 | :clearable="clearable" | 128 | :check-strictly="checkStrictly" |
128 | v-model="item1.fwsjytbsm" | 129 | :clearable="clearable" |
130 | v-model="item1.fwsjytbsm" | ||
129 | ></el-select-tree> | 131 | ></el-select-tree> |
130 | </td> | 132 | </td> |
131 | </tr> | 133 | </tr> |
... | @@ -523,6 +525,9 @@ | ... | @@ -523,6 +525,9 @@ |
523 | box-sizing: border-box; | 525 | box-sizing: border-box; |
524 | padding: 18px; | 526 | padding: 18px; |
525 | padding-bottom: 0; | 527 | padding-bottom: 0; |
528 | .iconfont{ | ||
529 | cursor: pointer; | ||
530 | } | ||
526 | 531 | ||
527 | /deep/textarea{ | 532 | /deep/textarea{ |
528 | width: 100%; | 533 | width: 100%; | ... | ... |
-
Please register or sign in to post a comment