Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
1 changed file
with
22 additions
and
34 deletions
| ... | @@ -112,30 +112,30 @@ | ... | @@ -112,30 +112,30 @@ |
| 112 | <td colspan="4"></td> | 112 | <td colspan="4"></td> |
| 113 | </tr> | 113 | </tr> |
| 114 | <tr> | 114 | <tr> |
| 115 | <td colspan="2" class="tdright">房屋结构</td> | 115 | <td colspan="2" class="tdright">东墙体归属</td> |
| 116 | <td colspan="5"> | 116 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td> |
| 117 | <el-select class="selectTitle" v-model="form.fwjgbsm"> | 117 | <td colspan="2" class="tdright">南墙体归属</td> |
| 118 | <el-option | 118 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td> |
| 119 | v-for="item in $store.state.jgOptions" | 119 | </tr> |
| 120 | :key="item.bsm" | 120 | <tr> |
| 121 | :label="item.mc" | 121 | <td colspan="2" class="tdright">西墙体归属</td> |
| 122 | :value="item.bsm"> | 122 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td> |
| 123 | </el-option> | 123 | <td colspan="2" class="tdright">北墙体归属</td> |
| 124 | </el-select> | 124 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td> |
| 125 | </td> | ||
| 126 | </tr> | 125 | </tr> |
| 126 | |||
| 127 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> | 127 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> |
| 128 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright"> | 128 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright"> |
| 129 | <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> | 129 | <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
| 130 | <span>用途</span> | 130 | <span>房屋用途</span> |
| 131 | </td> | 131 | </td> |
| 132 | 132 | ||
| 133 | <td width="30" colspan="1" align="center" class="tdright"> | 133 | <td width="30" colspan="1" align="center" class="tdright"> |
| 134 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> | 134 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> |
| 135 | 规划用途 | 135 | 规划用途 |
| 136 | </td> | 136 | </td> |
| 137 | <td width="30" colspan="4" align="center" > | 137 | <td width="30" colspan="3" align="center" > |
| 138 | <el-select-tree | 138 | <el-select-tree style="width:100%" |
| 139 | v-if="show" | 139 | v-if="show" |
| 140 | :default-expand-all="defaultExpandAll" | 140 | :default-expand-all="defaultExpandAll" |
| 141 | :multiple="multiple" | 141 | :multiple="multiple" |
| ... | @@ -148,10 +148,10 @@ | ... | @@ -148,10 +148,10 @@ |
| 148 | v-model="item1.fwytzdbsm" | 148 | v-model="item1.fwytzdbsm" |
| 149 | ></el-select-tree> | 149 | ></el-select-tree> |
| 150 | </td> | 150 | </td> |
| 151 | <td width="30" colspan="1" align="center" class="tdright">用途</td> | 151 | <td width="30" colspan="2" align="center" class="tdright">用途</td> |
| 152 | <td width="30" colspan="4" align="center" > | 152 | <td width="30" colspan="4" align="center" > |
| 153 | <el-select-tree | 153 | <el-select-tree style="width:100%" |
| 154 | v-if="show" | 154 | v-if="show" |
| 155 | :default-expand-all="defaultExpandAll" | 155 | :default-expand-all="defaultExpandAll" |
| 156 | :multiple="multiple" | 156 | :multiple="multiple" |
| 157 | :placeholder="placeholder" | 157 | :placeholder="placeholder" |
| ... | @@ -167,15 +167,15 @@ | ... | @@ -167,15 +167,15 @@ |
| 167 | 167 | ||
| 168 | <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> | 168 | <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> |
| 169 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright"> | 169 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright"> |
| 170 | <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> | 170 | <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> |
| 171 | <span>房屋结构</span> | 171 | <span>房屋结构</span> |
| 172 | </td> | 172 | </td> |
| 173 | <td colspan="1" align="center" > | 173 | <td colspan="1" align="center" > |
| 174 | <i class="iconfont iconicon-test" style="margin-right: 10px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> | 174 | <i class="iconfont iconicon-test" style="margin-right: 8px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> |
| 175 | <span>删除</span> | 175 | <span>房屋结构</span> |
| 176 | </td> | 176 | </td> |
| 177 | <td colspan="9" > | 177 | <td colspan="9" > |
| 178 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > | 178 | <el-select style="width:100%" v-model="item1.fwjgzdbsm" placeholder="请选择" > |
| 179 | <el-option | 179 | <el-option |
| 180 | v-for="item in $store.state.jgOptions" | 180 | v-for="item in $store.state.jgOptions" |
| 181 | :key="item.bsm" | 181 | :key="item.bsm" |
| ... | @@ -192,18 +192,6 @@ | ... | @@ -192,18 +192,6 @@ |
| 192 | </td> | 192 | </td> |
| 193 | </tr> | 193 | </tr> |
| 194 | 194 | ||
| 195 | <tr> | ||
| 196 | <td colspan="2" class="tdright">东墙体归属</td> | ||
| 197 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td> | ||
| 198 | <td colspan="2" class="tdright">南墙体归属</td> | ||
| 199 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td> | ||
| 200 | </tr> | ||
| 201 | <tr> | ||
| 202 | <td colspan="2" class="tdright">西墙体归属</td> | ||
| 203 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td> | ||
| 204 | <td colspan="2" class="tdright">北墙体归属</td> | ||
| 205 | <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td> | ||
| 206 | </tr> | ||
| 207 | </table> | 195 | </table> |
| 208 | </div> | 196 | </div> |
| 209 | <div class="shop"> | 197 | <div class="shop"> | ... | ... |
-
Please register or sign in to post a comment