Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
6 changed files
with
224 additions
and
215 deletions
| ... | @@ -6,30 +6,34 @@ | ... | @@ -6,30 +6,34 @@ |
| 6 | <span class="tips">分割前宗地信息</span> | 6 | <span class="tips">分割前宗地信息</span> |
| 7 | <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> | 7 | <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> |
| 8 | <div class="fgq"> | 8 | <div class="fgq"> |
| 9 | <div class="data"> | 9 | <el-card class="data"> |
| 10 | <div slot="header" class="clearfix"> | ||
| 11 | <span>基本信息</span> | ||
| 12 | </div> | ||
| 10 | <ul> | 13 | <ul> |
| 11 | <li><span>宗地代码:</span>{{zdFgqData.zddm}}</li> | 14 | <li><span class="label">宗地代码:</span><span class="value">{{zdFgqData.zddm}}</span></li> |
| 12 | <li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li> | 15 | <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li> |
| 13 | <li><span>项目名称:</span>{{zdFgqData.xmmc}}</li> | 16 | <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li> |
| 14 | <li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li> | 17 | <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li> |
| 15 | <li><span>权利人:</span>{{zdFgqData.qlr}}</li> | 18 | <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li> |
| 16 | <li><span>坐落:</span>{{zdFgqData.zl}}</li> | 19 | <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li> |
| 17 | </ul> | 20 | </ul> |
| 18 | </div> | 21 | </el-card> |
| 19 | <div class="zxx"> | 22 | <div class="zxx"> |
| 20 | <div class="dz"> | 23 | <el-card class="dz"> |
| 21 | <div class="title"> | 24 | <div slot="header" class="clearfix"> |
| 22 | <span>多幢信息({{zdZxx.dzList.length}}个)</span> | 25 | <span>多幢信息({{zdZxx.dzList.length}}个)</span> |
| 23 | </div> | 26 | </div> |
| 24 | <ul> | 27 | <ul> |
| 25 | <li v-for="(item,index) in zdZxx.dzList" :key="index" | 28 | <li v-for="(item,index) in zdZxx.dzList" :key="index" |
| 26 | :class="[{'search':!zdDzList.includes(item)}]" | 29 | :class="[{'search':!zdDzList.includes(item)}]" |
| 27 | >{{item.displays}} | 30 | ><span class="label">多幢名称:</span> <span class="value">{{item.displays}}</span> |
| 28 | </li> | 31 | </li> |
| 29 | </ul> | 32 | </ul> |
| 30 | </div> | 33 | </el-card> |
| 31 | <div class="zrz"> | 34 | |
| 32 | <div class="title"> | 35 | <el-card class="zrz"> |
| 36 | <div slot="header" class="clearfix"> | ||
| 33 | <span>自然幢信息({{zdZxx.zrzList.length}}个)</span> | 37 | <span>自然幢信息({{zdZxx.zrzList.length}}个)</span> |
| 34 | </div> | 38 | </div> |
| 35 | <ul> | 39 | <ul> |
| ... | @@ -38,7 +42,8 @@ | ... | @@ -38,7 +42,8 @@ |
| 38 | {{item.displays}} | 42 | {{item.displays}} |
| 39 | </li> | 43 | </li> |
| 40 | </ul> | 44 | </ul> |
| 41 | </div> | 45 | <div class="line"></div> |
| 46 | </el-card> | ||
| 42 | </div> | 47 | </div> |
| 43 | </div> | 48 | </div> |
| 44 | <div class="fgh"> | 49 | <div class="fgh"> |
| ... | @@ -53,7 +58,25 @@ | ... | @@ -53,7 +58,25 @@ |
| 53 | <th class="tdtzm">土地特征码</th> | 58 | <th class="tdtzm">土地特征码</th> |
| 54 | <th class="xmmc">项目名称</th> | 59 | <th class="xmmc">项目名称</th> |
| 55 | <th class="xzzxx">幢信息</th> | 60 | <th class="xzzxx">幢信息</th> |
| 56 | <th class="">选择</th> | 61 | <!-- <th class="">选择</th> --> |
| 62 | </tr> | ||
| 63 | <tr> | ||
| 64 | <td> | ||
| 65 | <el-button | ||
| 66 | type="primary" | ||
| 67 | class="changeBtn outAdd addMinus" | ||
| 68 | @click="addRow" | ||
| 69 | >+ | ||
| 70 | </el-button | ||
| 71 | > | ||
| 72 | </td> | ||
| 73 | <td></td> | ||
| 74 | <td></td> | ||
| 75 | <td></td> | ||
| 76 | <td></td> | ||
| 77 | <td></td> | ||
| 78 | <td></td> | ||
| 79 | <td></td> | ||
| 57 | </tr> | 80 | </tr> |
| 58 | <tr v-for="(item,index) in zdFghData.newZdlist" :key="index"> | 81 | <tr v-for="(item,index) in zdFghData.newZdlist" :key="index"> |
| 59 | <td class="cz"> | 82 | <td class="cz"> |
| ... | @@ -66,7 +89,7 @@ | ... | @@ -66,7 +89,7 @@ |
| 66 | > | 89 | > |
| 67 | </td> | 90 | </td> |
| 68 | <td class="xzq"> | 91 | <td class="xzq"> |
| 69 | <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> | 92 | <el-select class="" v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> |
| 70 | <el-option | 93 | <el-option |
| 71 | v-for="i in xzq" | 94 | v-for="i in xzq" |
| 72 | :key="i.bsm" | 95 | :key="i.bsm" |
| ... | @@ -76,7 +99,7 @@ | ... | @@ -76,7 +99,7 @@ |
| 76 | </el-select> | 99 | </el-select> |
| 77 | </td> | 100 | </td> |
| 78 | <td class="djq"> | 101 | <td class="djq"> |
| 79 | <el-select v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)"> | 102 | <el-select class="" v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)"> |
| 80 | <el-option | 103 | <el-option |
| 81 | v-for="i in djq" | 104 | v-for="i in djq" |
| 82 | :key="i.bsm" | 105 | :key="i.bsm" |
| ... | @@ -86,7 +109,7 @@ | ... | @@ -86,7 +109,7 @@ |
| 86 | </el-select> | 109 | </el-select> |
| 87 | </td> | 110 | </td> |
| 88 | <td class="syqlx"> | 111 | <td class="syqlx"> |
| 89 | <el-select v-model="item.djzqbsm"> | 112 | <el-select class="" v-model="item.djzqbsm"> |
| 90 | <el-option | 113 | <el-option |
| 91 | v-for="i in djzq" | 114 | v-for="i in djzq" |
| 92 | :key="i.bsm" | 115 | :key="i.bsm" |
| ... | @@ -96,7 +119,7 @@ | ... | @@ -96,7 +119,7 @@ |
| 96 | </el-select> | 119 | </el-select> |
| 97 | </td> | 120 | </td> |
| 98 | <td class="tdtzm"> | 121 | <td class="tdtzm"> |
| 99 | <el-select v-model="item.syqlxbsm"> | 122 | <el-select class="" v-model="item.syqlxbsm"> |
| 100 | <el-option | 123 | <el-option |
| 101 | v-for="i in syq" | 124 | v-for="i in syq" |
| 102 | :key="i.value" | 125 | :key="i.value" |
| ... | @@ -106,7 +129,7 @@ | ... | @@ -106,7 +129,7 @@ |
| 106 | </el-select> | 129 | </el-select> |
| 107 | </td> | 130 | </td> |
| 108 | <td class="syqlx"> | 131 | <td class="syqlx"> |
| 109 | <el-select v-model="item.zdtzmbsm"> | 132 | <el-select class="" v-model="item.zdtzmbsm"> |
| 110 | <el-option | 133 | <el-option |
| 111 | v-for="i in tdtzm" | 134 | v-for="i in tdtzm" |
| 112 | :key="i.bsm" | 135 | :key="i.bsm" |
| ... | @@ -119,7 +142,7 @@ | ... | @@ -119,7 +142,7 @@ |
| 119 | <input type="text" v-model="item.xmmc" class="formInput"/> | 142 | <input type="text" v-model="item.xmmc" class="formInput"/> |
| 120 | </td> | 143 | </td> |
| 121 | <td class="xzzxx"> | 144 | <td class="xzzxx"> |
| 122 | <span>多幢:</span> | 145 | <!-- <span>多幢:</span> |
| 123 | <ul> | 146 | <ul> |
| 124 | <li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex" | 147 | <li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex" |
| 125 | @mouseenter="mouseenter($event,index,dzIndex,'dz')" | 148 | @mouseenter="mouseenter($event,index,dzIndex,'dz')" |
| ... | @@ -135,9 +158,14 @@ | ... | @@ -135,9 +158,14 @@ |
| 135 | >{{zrzItem.xmmc}} | 158 | >{{zrzItem.xmmc}} |
| 136 | <span v-if="zrzIndex<item.zrz.length-1">,</span> | 159 | <span v-if="zrzIndex<item.zrz.length-1">,</span> |
| 137 | </li> | 160 | </li> |
| 138 | </ul> | 161 | </ul> --> |
| 162 | <span class="zxx">自然幢1 <i class="fa fa-times"></i></span> | ||
| 163 | <span class="zxx">自然幢2 <i class="fa fa-times"></i></span> | ||
| 164 | <span class="zxx">自然幢3 <i class="fa fa-times"></i></span> | ||
| 165 | <span class="zxx">多幢1 <i class="fa fa-times"></i></span> | ||
| 166 | <span class="choose">选择</span> | ||
| 139 | </td> | 167 | </td> |
| 140 | <td class=""> | 168 | <!-- <td class=""> |
| 141 | <el-dropdown @command="dzHandleCommand($event,index)"> | 169 | <el-dropdown @command="dzHandleCommand($event,index)"> |
| 142 | <span class="el-dropdown-link"> | 170 | <span class="el-dropdown-link"> |
| 143 | 选择多幢<i class="el-icon-arrow-down el-icon--right"></i> | 171 | 选择多幢<i class="el-icon-arrow-down el-icon--right"></i> |
| ... | @@ -160,25 +188,7 @@ | ... | @@ -160,25 +188,7 @@ |
| 160 | </el-dropdown-item> | 188 | </el-dropdown-item> |
| 161 | </el-dropdown-menu> | 189 | </el-dropdown-menu> |
| 162 | </el-dropdown> | 190 | </el-dropdown> |
| 163 | </td> | 191 | </td> --> |
| 164 | </tr> | ||
| 165 | <tr> | ||
| 166 | <td> | ||
| 167 | <el-button | ||
| 168 | type="primary" | ||
| 169 | class="changeBtn outAdd addMinus" | ||
| 170 | @click="addRow" | ||
| 171 | >+ | ||
| 172 | </el-button | ||
| 173 | > | ||
| 174 | </td> | ||
| 175 | <td></td> | ||
| 176 | <td></td> | ||
| 177 | <td></td> | ||
| 178 | <td></td> | ||
| 179 | <td></td> | ||
| 180 | <td></td> | ||
| 181 | <td></td> | ||
| 182 | </tr> | 192 | </tr> |
| 183 | </table> | 193 | </table> |
| 184 | </div> | 194 | </div> |
| ... | @@ -988,116 +998,146 @@ | ... | @@ -988,116 +998,146 @@ |
| 988 | 998 | ||
| 989 | .fgq { | 999 | .fgq { |
| 990 | margin-left: 20px; | 1000 | margin-left: 20px; |
| 991 | margin-top: 20px; | 1001 | margin-top: 14px; |
| 992 | display: flex; | 1002 | display: flex; |
| 993 | flex-direction: column; | 1003 | flex-direction: column; |
| 994 | flex-flow: nowrap; | 1004 | flex-flow: nowrap; |
| 995 | .data { | 1005 | .data{ |
| 1006 | width: 36%; | ||
| 1007 | } | ||
| 1008 | .el-card { | ||
| 1009 | border: 1px solid #E6E6E6; | ||
| 996 | background-color: white; | 1010 | background-color: white; |
| 997 | height: 180px; | ||
| 998 | overflow: auto; | 1011 | overflow: auto; |
| 1012 | .clearfix{ | ||
| 1013 | span{ | ||
| 1014 | color: #9B9B9B; | ||
| 1015 | } | ||
| 1016 | } | ||
| 1017 | /deep/ .el-card__body{ | ||
| 1018 | padding:10px 12px; | ||
| 1019 | } | ||
| 999 | ul { | 1020 | ul { |
| 1000 | li { | 1021 | li { |
| 1001 | padding: 5px; | 1022 | padding: 5px; |
| 1002 | line-height: 20px; | 1023 | line-height: 20px; |
| 1003 | color: #BBB; | 1024 | color: #BBB; |
| 1004 | span { | 1025 | .label{ |
| 1005 | color: #000; | 1026 | color: #4A4A4A; |
| 1027 | display: inline-block; | ||
| 1028 | width: 104px; | ||
| 1029 | text-align: right; | ||
| 1030 | } | ||
| 1031 | .value{ | ||
| 1032 | color: #6D7278; | ||
| 1033 | padding-left: 10px; | ||
| 1006 | } | 1034 | } |
| 1007 | } | 1035 | } |
| 1008 | } | 1036 | } |
| 1009 | } | 1037 | } |
| 1010 | .zxx { | 1038 | .zxx { |
| 1039 | width: calc(64% - 40px); | ||
| 1040 | margin-left: 20px; | ||
| 1011 | display: flex; | 1041 | display: flex; |
| 1012 | flex-direction: column; | 1042 | flex-direction: column; |
| 1013 | flex-flow: nowrap; | 1043 | flex-flow: nowrap; |
| 1014 | background-color: white; | ||
| 1015 | .title { | 1044 | .title { |
| 1016 | color: red; | 1045 | color: red; |
| 1017 | text-align: center; | 1046 | text-align: center; |
| 1018 | padding: 5px 0; | 1047 | padding: 5px 0; |
| 1019 | } | 1048 | } |
| 1049 | /deep/ .el-card__body{ | ||
| 1050 | height: 200px; | ||
| 1051 | overflow-y: scroll; | ||
| 1052 | position: relative; | ||
| 1053 | } | ||
| 1054 | .line{ | ||
| 1055 | width: 1px; | ||
| 1056 | height: calc(100% - 20px); | ||
| 1057 | background-color: #EDEDED; | ||
| 1058 | position: absolute; | ||
| 1059 | top: 10px; | ||
| 1060 | left: 50%; | ||
| 1061 | } | ||
| 1020 | .dz { | 1062 | .dz { |
| 1021 | width: 33%; | 1063 | width: 33%; |
| 1022 | border-right: 1px solid #000; | ||
| 1023 | height: 180px; | ||
| 1024 | overflow: auto; | 1064 | overflow: auto; |
| 1025 | ul { | 1065 | ul{ |
| 1026 | overflow: auto; | 1066 | li{ |
| 1027 | li { | 1067 | width: 96% !important; |
| 1028 | padding: 5px; | ||
| 1029 | text-align: center; | ||
| 1030 | line-height: 20px; | ||
| 1031 | } | 1068 | } |
| 1032 | } | 1069 | } |
| 1070 | |||
| 1033 | } | 1071 | } |
| 1034 | .zrz { | 1072 | .zrz { |
| 1035 | width: 66%; | 1073 | width: 66%; |
| 1036 | height: 180px; | 1074 | margin-left: 20px; |
| 1037 | overflow: auto; | 1075 | overflow: auto; |
| 1076 | } | ||
| 1038 | ul { | 1077 | ul { |
| 1078 | overflow: auto; | ||
| 1039 | li { | 1079 | li { |
| 1040 | padding: 5px; | ||
| 1041 | width: 48%; | 1080 | width: 48%; |
| 1042 | text-align: center; | 1081 | padding: 5px; |
| 1082 | text-align: left; | ||
| 1083 | line-height: 20px; | ||
| 1043 | display: inline-block; | 1084 | display: inline-block; |
| 1085 | .label{ | ||
| 1086 | width: 90px; | ||
| 1044 | } | 1087 | } |
| 1045 | } | 1088 | } |
| 1089 | li:nth-of-type(even){ | ||
| 1090 | .label{ | ||
| 1091 | width: 110px; | ||
| 1092 | text-indent: 20px; | ||
| 1046 | } | 1093 | } |
| 1047 | } | 1094 | } |
| 1048 | } | 1095 | } |
| 1049 | |||
| 1050 | .oddborder { | ||
| 1051 | border-right: 1px solid #000; | ||
| 1052 | } | 1096 | } |
| 1053 | |||
| 1054 | .fgq .data { | ||
| 1055 | width: 30%; | ||
| 1056 | border: 1px solid #000; | ||
| 1057 | } | 1097 | } |
| 1058 | 1098 | ||
| 1059 | .fgq .zxx { | 1099 | .oddborder { |
| 1060 | width: 67%; | 1100 | border-right: 1px solid #000; |
| 1061 | margin-left: 20px; | ||
| 1062 | border: 1px solid #000; | ||
| 1063 | } | 1101 | } |
| 1064 | 1102 | ||
| 1065 | .fg-tabs { | 1103 | .fg-tabs { |
| 1066 | height: auto; | 1104 | height: auto; |
| 1067 | width: 100%; | 1105 | width: 100%; |
| 1068 | position: relative; | 1106 | position: relative; |
| 1107 | top: 36px; | ||
| 1069 | .table { | 1108 | .table { |
| 1070 | margin-top: 12px; | 1109 | margin-top: 12px; |
| 1071 | box-sizing: border-box; | 1110 | box-sizing: border-box; |
| 1072 | padding: 18px; | 1111 | padding: 18px; |
| 1073 | } | 1112 | } |
| 1074 | .addBtn { | 1113 | .addBtn { |
| 1075 | /* position: absolute; | 1114 | position: absolute; |
| 1076 | right: 30px; | 1115 | right: 24px; |
| 1077 | top: -46px; | 1116 | top: -14px; |
| 1078 | z-index: 999;*/ | ||
| 1079 | } | 1117 | } |
| 1080 | table { | 1118 | table { |
| 1081 | margin-top: 10px; | 1119 | margin-top: 10px; |
| 1082 | background-color: #fff; | 1120 | background-color: #fff; |
| 1083 | font-size: 14px; | 1121 | font-size: 14px; |
| 1084 | width: 100%; | 1122 | width: calc(100% - 40px); |
| 1085 | tr:nth-of-type(odd) { | 1123 | /deep/.el-input__inner { |
| 1086 | background: #FAFAFA; | ||
| 1087 | th { | ||
| 1088 | height: 36px; | ||
| 1089 | } | ||
| 1090 | } | ||
| 1091 | .formInput { | ||
| 1092 | margin: 0; | 1124 | margin: 0; |
| 1093 | height: 36px; | 1125 | height: 44px; |
| 1094 | outline: none; | 1126 | outline: none; |
| 1095 | border: none; | 1127 | border: none; |
| 1096 | color: #606764; | 1128 | color: #606764; |
| 1097 | overflow: visible; | 1129 | overflow: visible; |
| 1098 | text-align: center; | 1130 | text-align: center; |
| 1099 | cursor: text; | ||
| 1100 | } | 1131 | } |
| 1132 | tr:nth-of-type(odd) { | ||
| 1133 | background: #FAFAFA; | ||
| 1134 | } | ||
| 1135 | tr{ | ||
| 1136 | th,td{ | ||
| 1137 | height: 44px; | ||
| 1138 | } | ||
| 1139 | } | ||
| 1140 | |||
| 1101 | tr:hover { | 1141 | tr:hover { |
| 1102 | background-color: #F5F7FA; | 1142 | background-color: #F5F7FA; |
| 1103 | } | 1143 | } |
| ... | @@ -1124,10 +1164,14 @@ | ... | @@ -1124,10 +1164,14 @@ |
| 1124 | /*padding: 0 18px;*/ | 1164 | /*padding: 0 18px;*/ |
| 1125 | height: 480px; | 1165 | height: 480px; |
| 1126 | overflow: auto; | 1166 | overflow: auto; |
| 1127 | margin-top: 10px; | 1167 | margin-top: 26px; |
| 1128 | table { | 1168 | table { |
| 1129 | margin: 0 20px; | 1169 | margin: 0 20px; |
| 1130 | } | 1170 | } |
| 1171 | .tips { | ||
| 1172 | display: inline-block; | ||
| 1173 | margin-bottom: 14px; | ||
| 1174 | } | ||
| 1131 | } | 1175 | } |
| 1132 | .header-button { | 1176 | .header-button { |
| 1133 | height: 50px; | 1177 | height: 50px; |
| ... | @@ -1161,10 +1205,25 @@ | ... | @@ -1161,10 +1205,25 @@ |
| 1161 | } | 1205 | } |
| 1162 | 1206 | ||
| 1163 | .xzzxx { | 1207 | .xzzxx { |
| 1164 | ul { | 1208 | .zxx{ |
| 1165 | li { | 1209 | padding-right: 16px; |
| 1166 | display: inline-block; | 1210 | position: relative; |
| 1211 | i{ | ||
| 1212 | color: #9F9F9F; | ||
| 1213 | position: absolute; | ||
| 1214 | right: 12px; | ||
| 1215 | top: -8px; | ||
| 1216 | display: none; | ||
| 1217 | } | ||
| 1167 | } | 1218 | } |
| 1219 | .zxx:hover{ | ||
| 1220 | >i{ | ||
| 1221 | display: inline; | ||
| 1222 | } | ||
| 1223 | } | ||
| 1224 | .choose{ | ||
| 1225 | color: #30A4FD; | ||
| 1226 | cursor: pointer; | ||
| 1168 | } | 1227 | } |
| 1169 | } | 1228 | } |
| 1170 | 1229 | ... | ... |
| ... | @@ -38,11 +38,6 @@ | ... | @@ -38,11 +38,6 @@ |
| 38 | <el-tooltip class="item" effect="light" content="定位" placement="top"> | 38 | <el-tooltip class="item" effect="light" content="定位" placement="top"> |
| 39 | <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i> | 39 | <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i> |
| 40 | </el-tooltip> | 40 | </el-tooltip> |
| 41 | <!-- <el-button type="text" size="small" | ||
| 42 | >办理 | ||
| 43 | </el-button | ||
| 44 | > | ||
| 45 | <el-button type="text" size="small">定位</el-button> --> | ||
| 46 | </template> | 41 | </template> |
| 47 | </el-table-column> | 42 | </el-table-column> |
| 48 | </el-table> | 43 | </el-table> |
| ... | @@ -52,15 +47,6 @@ | ... | @@ -52,15 +47,6 @@ |
| 52 | </el-pagination> | 47 | </el-pagination> |
| 53 | </div> | 48 | </div> |
| 54 | 49 | ||
| 55 | <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> | ||
| 56 | <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj> | ||
| 57 | <div class="btnGroup"> | ||
| 58 | <el-button type="primary" @click="hbjSaveInfo">保存</el-button> | ||
| 59 | <el-button type="primary" @click="hbjSubmitInfo">提交</el-button> | ||
| 60 | <el-button type="primary" @click="hbjResetInfo">重置</el-button> | ||
| 61 | <el-button type="primary" @click="hbjVisible = false">取消</el-button> | ||
| 62 | </div> | ||
| 63 | </el-dialog> | ||
| 64 | </div> | 50 | </div> |
| 65 | </div> | 51 | </div> |
| 66 | </template> | 52 | </template> |
| ... | @@ -68,11 +54,10 @@ | ... | @@ -68,11 +54,10 @@ |
| 68 | <script> | 54 | <script> |
| 69 | import SearchHead from "../../../components/searchHead/searchHead"; | 55 | import SearchHead from "../../../components/searchHead/searchHead"; |
| 70 | import {getSearchList} from "../../../api/search"; | 56 | import {getSearchList} from "../../../api/search"; |
| 71 | import hbj from "./../../zrz/lpb/bjlp/hbj/index"; | ||
| 72 | 57 | ||
| 73 | export default { | 58 | export default { |
| 74 | name: "", | 59 | name: "", |
| 75 | components: {SearchHead,hbj}, | 60 | components: {SearchHead}, |
| 76 | props: {}, | 61 | props: {}, |
| 77 | data() { | 62 | data() { |
| 78 | return { | 63 | return { |
| ... | @@ -82,9 +67,6 @@ | ... | @@ -82,9 +67,6 @@ |
| 82 | tableData: [], | 67 | tableData: [], |
| 83 | tableHeight: 0, | 68 | tableHeight: 0, |
| 84 | queryData: {}, | 69 | queryData: {}, |
| 85 | hbjVisible: false, | ||
| 86 | hbsm:'', | ||
| 87 | tabPosition: "1", //1是实测 0是预测 | ||
| 88 | }; | 70 | }; |
| 89 | }, | 71 | }, |
| 90 | created() { | 72 | created() { |
| ... | @@ -106,20 +88,6 @@ | ... | @@ -106,20 +88,6 @@ |
| 106 | return ""; | 88 | return ""; |
| 107 | } | 89 | } |
| 108 | }, | 90 | }, |
| 109 | //户保存 | ||
| 110 | hbjSaveInfo() { | ||
| 111 | this.$refs.hbj.onSave(this.hbsm, this.tabPosition); | ||
| 112 | this.getData({pageSize:15}); | ||
| 113 | }, | ||
| 114 | //户提交 | ||
| 115 | hbjSubmitInfo() { | ||
| 116 | this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition); | ||
| 117 | this.getData({pageSize:15}); | ||
| 118 | }, | ||
| 119 | //户编辑表单重置 | ||
| 120 | hbjResetInfo() { | ||
| 121 | this.$refs.hbj.onReset(); | ||
| 122 | }, | ||
| 123 | handleCurrentChange(val) { | 91 | handleCurrentChange(val) { |
| 124 | this.pageNo = val; | 92 | this.pageNo = val; |
| 125 | this.queryData.pageNo = val; | 93 | this.queryData.pageNo = val; |
| ... | @@ -159,17 +127,6 @@ | ... | @@ -159,17 +127,6 @@ |
| 159 | case "h": | 127 | case "h": |
| 160 | case "h0": | 128 | case "h0": |
| 161 | case "h1": | 129 | case "h1": |
| 162 | this.hbsm = row.glbsm; | ||
| 163 | this.hbjVisible = true; | ||
| 164 | if(row.dylx === "h0"){ | ||
| 165 | this.tabPosition = 0; | ||
| 166 | }else { | ||
| 167 | this.tabPosition = 1; | ||
| 168 | } | ||
| 169 | this.$nextTick(()=>{ | ||
| 170 | console.log(this.$refs.hbj); | ||
| 171 | this.$refs.hbj.getHInfo(this.hbsm); | ||
| 172 | }); | ||
| 173 | path="/h"; | 130 | path="/h"; |
| 174 | this.$store.state.hbsm=row.glbsm | 131 | this.$store.state.hbsm=row.glbsm |
| 175 | break; | 132 | break; | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="content_box"> | 2 | <div class="content_box"> |
| 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> | 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> |
| 4 | <el-tab-pane label="户基本信息表" name="hjbxx"> | 4 | <el-tab-pane label="户基本信息表" name="hjbxx"> |
| 5 | <hbj ></hbj> | 5 | <hbj :bsm="hbsm"></hbj> |
| 6 | </el-tab-pane> | 6 | </el-tab-pane> |
| 7 | <el-tab-pane label="登记簿" name="djb"> | 7 | <el-tab-pane label="登记簿" name="djb"> |
| 8 | <djb v-if="djbVisible"></djb> | 8 | <djb v-if="djbVisible"></djb> |
| ... | @@ -26,6 +26,7 @@ | ... | @@ -26,6 +26,7 @@ |
| 26 | }, | 26 | }, |
| 27 | data() { | 27 | data() { |
| 28 | return { | 28 | return { |
| 29 | hbsm:this.$store.state.hbsm, | ||
| 29 | activeName: "hjbxx", | 30 | activeName: "hjbxx", |
| 30 | djbVisible: false, | 31 | djbVisible: false, |
| 31 | fjclVisible: false, | 32 | fjclVisible: false, | ... | ... |
| ... | @@ -95,8 +95,8 @@ export default { | ... | @@ -95,8 +95,8 @@ export default { |
| 95 | ); | 95 | ); |
| 96 | 96 | ||
| 97 | const tooltip = new G6.Tooltip({ | 97 | const tooltip = new G6.Tooltip({ |
| 98 | offsetX: 210, | 98 | offsetX: 10, |
| 99 | offsetY: 210, | 99 | offsetY: 10, |
| 100 | itemTypes: ['node', 'edge'], | 100 | itemTypes: ['node', 'edge'], |
| 101 | getContent: (e) => { | 101 | getContent: (e) => { |
| 102 | const outDiv = document.createElement('div'); | 102 | const outDiv = document.createElement('div'); | ... | ... |
| ... | @@ -21,7 +21,7 @@ | ... | @@ -21,7 +21,7 @@ |
| 21 | <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> | 21 | <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> |
| 22 | <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> | 22 | <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> |
| 23 | <td colspan="4" class="psr"> | 23 | <td colspan="4" class="psr"> |
| 24 | <el-input v-model="form.bdcdyh" class="percent80"></el-input> | 24 | <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag"></el-input> |
| 25 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> | 25 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> |
| 26 | </td> | 26 | </td> |
| 27 | <td colspan="2" align="center" >原不动产单元</td> | 27 | <td colspan="2" align="center" >原不动产单元</td> |
| ... | @@ -37,36 +37,36 @@ | ... | @@ -37,36 +37,36 @@ |
| 37 | </td> | 37 | </td> |
| 38 | <td colspan="2" align="center" >层号</td> | 38 | <td colspan="2" align="center" >层号</td> |
| 39 | <td colspan="4" > | 39 | <td colspan="4" > |
| 40 | <el-input v-model="form.ch"></el-input> | 40 | <el-input v-model="form.ch" :disabled="disableFlag"></el-input> |
| 41 | </td> | 41 | </td> |
| 42 | </tr> | 42 | </tr> |
| 43 | 43 | ||
| 44 | <tr height="30"> | 44 | <tr height="30"> |
| 45 | <td colspan="2" align="center" >实际层数</td> | 45 | <td colspan="2" align="center" >实际层数</td> |
| 46 | <td colspan="4" > | 46 | <td colspan="4" > |
| 47 | <el-input v-model="form.sjcs"></el-input> | 47 | <el-input v-model="form.sjcs" :disabled="disableFlag"></el-input> |
| 48 | </td> | 48 | </td> |
| 49 | <td colspan="2" align="center" >实际层</td> | 49 | <td colspan="2" align="center" >实际层</td> |
| 50 | <td colspan="4" > | 50 | <td colspan="4" > |
| 51 | <el-input v-model="form.sjc"></el-input> | 51 | <el-input v-model="form.sjc" :disabled="disableFlag"></el-input> |
| 52 | </td> | 52 | </td> |
| 53 | </tr> | 53 | </tr> |
| 54 | 54 | ||
| 55 | <tr height="30"> | 55 | <tr height="30"> |
| 56 | <td colspan="2" align="center" >所在单元</td> | 56 | <td colspan="2" align="center" >所在单元</td> |
| 57 | <td colspan="4" > | 57 | <td colspan="4" > |
| 58 | <el-input v-model="form.zdymc"></el-input> | 58 | <el-input v-model="form.zdymc" :disabled="disableFlag"></el-input> |
| 59 | </td> | 59 | </td> |
| 60 | <td colspan="2" align="center" >房屋编号</td> | 60 | <td colspan="2" align="center" >房屋编号</td> |
| 61 | <td colspan="4" > | 61 | <td colspan="4" > |
| 62 | <el-input v-model="form.fwbh"></el-input> | 62 | <el-input v-model="form.fwbh" :disabled="disableFlag"></el-input> |
| 63 | </td> | 63 | </td> |
| 64 | </tr> | 64 | </tr> |
| 65 | 65 | ||
| 66 | <tr height="30"> | 66 | <tr height="30"> |
| 67 | <td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td> | 67 | <td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td> |
| 68 | <td colspan="4" > | 68 | <td colspan="4" > |
| 69 | <el-select v-model="form.fwlxbsm" placeholder="请选择" > | 69 | <el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag"> |
| 70 | <el-option | 70 | <el-option |
| 71 | v-for="item in $store.state.fwlxList" | 71 | v-for="item in $store.state.fwlxList" |
| 72 | :key="item.bsm" | 72 | :key="item.bsm" |
| ... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
| 77 | </td> | 77 | </td> |
| 78 | <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td> | 78 | <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td> |
| 79 | <td colspan="4" > | 79 | <td colspan="4" > |
| 80 | <el-select v-model="form.fwxzbsm" placeholder="请选择" > | 80 | <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag"> |
| 81 | <el-option | 81 | <el-option |
| 82 | v-for="item in $store.state.fwxzOptions" | 82 | v-for="item in $store.state.fwxzOptions" |
| 83 | :key="item.bsm" | 83 | :key="item.bsm" |
| ... | @@ -91,18 +91,18 @@ | ... | @@ -91,18 +91,18 @@ |
| 91 | <tr height="30"> | 91 | <tr height="30"> |
| 92 | <td colspan="2" align="center" >户号</td> | 92 | <td colspan="2" align="center" >户号</td> |
| 93 | <td colspan="4" > | 93 | <td colspan="4" > |
| 94 | <el-input v-model="form.hh"></el-input> | 94 | <el-input v-model="form.hh" :disabled="disableFlag"></el-input> |
| 95 | </td> | 95 | </td> |
| 96 | <td colspan="2" align="center" >室号</td> | 96 | <td colspan="2" align="center" >室号</td> |
| 97 | <td colspan="4" > | 97 | <td colspan="4" > |
| 98 | <el-input v-model="form.shbw"></el-input> | 98 | <el-input v-model="form.shbw" :disabled="disableFlag"></el-input> |
| 99 | </td> | 99 | </td> |
| 100 | </tr> | 100 | </tr> |
| 101 | 101 | ||
| 102 | <tr height="30"> | 102 | <tr height="30"> |
| 103 | <td colspan="2" align="center" >户型</td> | 103 | <td colspan="2" align="center" >户型</td> |
| 104 | <td colspan="4" > | 104 | <td colspan="4" > |
| 105 | <el-select v-model="form.hxbsm" placeholder="请选择" > | 105 | <el-select v-model="form.hxbsm" placeholder="请选择" :disabled="disableFlag"> |
| 106 | <el-option | 106 | <el-option |
| 107 | v-for="item in $store.state.hxList" | 107 | v-for="item in $store.state.hxList" |
| 108 | :key="item.bsm" | 108 | :key="item.bsm" |
| ... | @@ -113,7 +113,7 @@ | ... | @@ -113,7 +113,7 @@ |
| 113 | </td> | 113 | </td> |
| 114 | <td colspan="2" align="center" >户型结构</td> | 114 | <td colspan="2" align="center" >户型结构</td> |
| 115 | <td colspan="4" > | 115 | <td colspan="4" > |
| 116 | <el-select v-model="form.hxjgbsm" placeholder="请选择" > | 116 | <el-select v-model="form.hxjgbsm" placeholder="请选择" :disabled="disableFlag"> |
| 117 | <el-option | 117 | <el-option |
| 118 | v-for="item in $store.state.hxjgList" | 118 | v-for="item in $store.state.hxjgList" |
| 119 | :key="item.bsm" | 119 | :key="item.bsm" |
| ... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
| 127 | <tr height="30"> | 127 | <tr height="30"> |
| 128 | <td colspan="2" align="center" >产别<i class="requisite">*</i></td> | 128 | <td colspan="2" align="center" >产别<i class="requisite">*</i></td> |
| 129 | <td colspan="4" > | 129 | <td colspan="4" > |
| 130 | <el-select v-model="form.fwcbbsm" placeholder="请选择" > | 130 | <el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag"> |
| 131 | <el-option | 131 | <el-option |
| 132 | v-for="item in $store.state.cbOptions" | 132 | v-for="item in $store.state.cbOptions" |
| 133 | :key="item.bsm" | 133 | :key="item.bsm" |
| ... | @@ -138,7 +138,7 @@ | ... | @@ -138,7 +138,7 @@ |
| 138 | </td> | 138 | </td> |
| 139 | <td colspan="2" align="center" >产权来源<i class="requisite">*</i></td> | 139 | <td colspan="2" align="center" >产权来源<i class="requisite">*</i></td> |
| 140 | <td colspan="4" > | 140 | <td colspan="4" > |
| 141 | <el-select v-model="form.fwcqlybsm" placeholder="请选择" > | 141 | <el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag"> |
| 142 | <el-option | 142 | <el-option |
| 143 | v-for="item in $store.state.cqlyOptions" | 143 | v-for="item in $store.state.cqlyOptions" |
| 144 | :key="item.bsm" | 144 | :key="item.bsm" |
| ... | @@ -153,62 +153,62 @@ | ... | @@ -153,62 +153,62 @@ |
| 153 | <td colspan="2" rowspan="6" align="center" >预测</td> | 153 | <td colspan="2" rowspan="6" align="center" >预测</td> |
| 154 | <td colspan="2" align="center" >建筑面积(㎡) </td> | 154 | <td colspan="2" align="center" >建筑面积(㎡) </td> |
| 155 | <td colspan="2" align="center" > | 155 | <td colspan="2" align="center" > |
| 156 | <el-input v-model="form.ycjzmj" :disabled="form.scyclx==='1'"></el-input> | 156 | <el-input v-model="form.ycjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 157 | </td> | 157 | </td> |
| 158 | <td colspan="2" rowspan="6" align="center" >实测</td> | 158 | <td colspan="2" rowspan="6" align="center" >实测</td> |
| 159 | <td colspan="2" align="center" >建筑面积(㎡)</td> | 159 | <td colspan="2" align="center" >建筑面积(㎡)</td> |
| 160 | <td colspan="2" align="center" > | 160 | <td colspan="2" align="center" > |
| 161 | <el-input v-model="form.scjzmj" :disabled="form.scyclx==='0'"></el-input> | 161 | <el-input v-model="form.scjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 162 | </td> | 162 | </td> |
| 163 | </tr> | 163 | </tr> |
| 164 | <tr height="30"> | 164 | <tr height="30"> |
| 165 | <td colspan="2" align="center" >套内建筑面积(㎡))</td> | 165 | <td colspan="2" align="center" >套内建筑面积(㎡))</td> |
| 166 | <td colspan="2" align="center" > | 166 | <td colspan="2" align="center" > |
| 167 | <el-input v-model="form.yctnjzmj" :disabled="form.scyclx==='1'"></el-input> | 167 | <el-input v-model="form.yctnjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 168 | </td> | 168 | </td> |
| 169 | <td colspan="2" align="center" >套内建筑面积(㎡)</td> | 169 | <td colspan="2" align="center" >套内建筑面积(㎡)</td> |
| 170 | <td colspan="2" align="center" > | 170 | <td colspan="2" align="center" > |
| 171 | <el-input v-model="form.sctnjzmj" :disabled="form.scyclx==='0'"></el-input> | 171 | <el-input v-model="form.sctnjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 172 | </td> | 172 | </td> |
| 173 | </tr> | 173 | </tr> |
| 174 | <tr height="30"> | 174 | <tr height="30"> |
| 175 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> | 175 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> |
| 176 | <td colspan="2" align="center" > | 176 | <td colspan="2" align="center" > |
| 177 | <el-input v-model="form.ycftjzmj" :disabled="form.scyclx==='1'"></el-input> | 177 | <el-input v-model="form.ycftjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 178 | </td> | 178 | </td> |
| 179 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> | 179 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> |
| 180 | <td colspan="2" align="center" > | 180 | <td colspan="2" align="center" > |
| 181 | <el-input v-model="form.scftjzmj" :disabled="form.scyclx==='0'"></el-input> | 181 | <el-input v-model="form.scftjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 182 | </td> | 182 | </td> |
| 183 | </tr> | 183 | </tr> |
| 184 | <tr height="30"> | 184 | <tr height="30"> |
| 185 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> | 185 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> |
| 186 | <td colspan="2" align="center" > | 186 | <td colspan="2" align="center" > |
| 187 | <el-input v-model="form.ycdxbfjzmj" :disabled="form.scyclx==='1'"></el-input> | 187 | <el-input v-model="form.ycdxbfjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 188 | </td> | 188 | </td> |
| 189 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> | 189 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> |
| 190 | <td colspan="2" align="center" > | 190 | <td colspan="2" align="center" > |
| 191 | <el-input v-model="form.scdxbfjzmj" :disabled="form.scyclx==='0'"></el-input> | 191 | <el-input v-model="form.scdxbfjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 192 | </td> | 192 | </td> |
| 193 | </tr> | 193 | </tr> |
| 194 | <tr height="30"> | 194 | <tr height="30"> |
| 195 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> | 195 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> |
| 196 | <td colspan="2" align="center" > | 196 | <td colspan="2" align="center" > |
| 197 | <el-input v-model="form.ycqtjzmj" :disabled="form.scyclx==='1'"></el-input> | 197 | <el-input v-model="form.ycqtjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 198 | </td> | 198 | </td> |
| 199 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> | 199 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> |
| 200 | <td colspan="2" align="center" > | 200 | <td colspan="2" align="center" > |
| 201 | <el-input v-model="form.scqtjzmj" :disabled="form.scyclx==='0'"></el-input> | 201 | <el-input v-model="form.scqtjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 202 | </td> | 202 | </td> |
| 203 | </tr> | 203 | </tr> |
| 204 | <tr height="30"> | 204 | <tr height="30"> |
| 205 | <td colspan="2" align="center" >分摊系数</td> | 205 | <td colspan="2" align="center" >分摊系数</td> |
| 206 | <td colspan="2" align="center" > | 206 | <td colspan="2" align="center" > |
| 207 | <el-input v-model="form.ycftxs" :disabled="form.scyclx==='1'"></el-input> | 207 | <el-input v-model="form.ycftxs" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 208 | </td> | 208 | </td> |
| 209 | <td colspan="2" align="center" >分摊系数</td> | 209 | <td colspan="2" align="center" >分摊系数</td> |
| 210 | <td colspan="2" align="center" > | 210 | <td colspan="2" align="center" > |
| 211 | <el-input v-model="form.scftxs" :disabled="form.scyclx==='0'"></el-input> | 211 | <el-input v-model="form.scftxs" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 212 | </td> | 212 | </td> |
| 213 | </tr> | 213 | </tr> |
| 214 | 214 | ||
| ... | @@ -240,7 +240,7 @@ | ... | @@ -240,7 +240,7 @@ |
| 240 | :default-expand-all="defaultExpandAll" | 240 | :default-expand-all="defaultExpandAll" |
| 241 | :multiple="multiple" | 241 | :multiple="multiple" |
| 242 | :placeholder="placeholder" | 242 | :placeholder="placeholder" |
| 243 | :disabled="disabled" | 243 | :disabled="disableFlag" |
| 244 | :data="$store.state.fwytList" | 244 | :data="$store.state.fwytList" |
| 245 | :props="treeProps" | 245 | :props="treeProps" |
| 246 | :check-strictly="checkStrictly" | 246 | :check-strictly="checkStrictly" |
| ... | @@ -255,7 +255,7 @@ | ... | @@ -255,7 +255,7 @@ |
| 255 | :default-expand-all="defaultExpandAll" | 255 | :default-expand-all="defaultExpandAll" |
| 256 | :multiple="multiple" | 256 | :multiple="multiple" |
| 257 | :placeholder="placeholder" | 257 | :placeholder="placeholder" |
| 258 | :disabled="disabled" | 258 | :disabled="disableFlag" |
| 259 | :data="$store.state.fwytList" | 259 | :data="$store.state.fwytList" |
| 260 | :props="treeProps" | 260 | :props="treeProps" |
| 261 | :check-strictly="checkStrictly" | 261 | :check-strictly="checkStrictly" |
| ... | @@ -281,7 +281,7 @@ | ... | @@ -281,7 +281,7 @@ |
| 281 | <span @click="deleteFwjgInfo(index)">删除</span> | 281 | <span @click="deleteFwjgInfo(index)">删除</span> |
| 282 | </td> | 282 | </td> |
| 283 | <td colspan="9" > | 283 | <td colspan="9" > |
| 284 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > | 284 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag"> |
| 285 | <el-option | 285 | <el-option |
| 286 | v-for="item in $store.state.fwjgList" | 286 | v-for="item in $store.state.fwjgList" |
| 287 | :key="item.bsm" | 287 | :key="item.bsm" |
| ... | @@ -295,15 +295,15 @@ | ... | @@ -295,15 +295,15 @@ |
| 295 | <tr height="30"> | 295 | <tr height="30"> |
| 296 | <td colspan="2" align="center" >共有土地面积(㎡)</td> | 296 | <td colspan="2" align="center" >共有土地面积(㎡)</td> |
| 297 | <td colspan="2" > | 297 | <td colspan="2" > |
| 298 | <el-input v-model="form.gytdmj"></el-input> | 298 | <el-input v-model="form.gytdmj" :disabled="disableFlag"></el-input> |
| 299 | </td> | 299 | </td> |
| 300 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> | 300 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> |
| 301 | <td colspan="2" > | 301 | <td colspan="2" > |
| 302 | <el-input v-model="form.fttdmj"></el-input> | 302 | <el-input v-model="form.fttdmj" :disabled="disableFlag"></el-input> |
| 303 | </td> | 303 | </td> |
| 304 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> | 304 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> |
| 305 | <td colspan="2" > | 305 | <td colspan="2" > |
| 306 | <el-input v-model="form.dytdmj"></el-input> | 306 | <el-input v-model="form.dytdmj" :disabled="disableFlag"></el-input> |
| 307 | </td> | 307 | </td> |
| 308 | </tr> | 308 | </tr> |
| 309 | 309 | ||
| ... | @@ -324,29 +324,29 @@ | ... | @@ -324,29 +324,29 @@ |
| 324 | <span>坐落<i class="requisite">*</i></span> | 324 | <span>坐落<i class="requisite">*</i></span> |
| 325 | </td> | 325 | </td> |
| 326 | <td colspan="10" > | 326 | <td colspan="10" > |
| 327 | <el-input v-model="form.zl"></el-input> | 327 | <el-input v-model="form.zl" :disabled="disableFlag"></el-input> |
| 328 | </td> | 328 | </td> |
| 329 | </tr> | 329 | </tr> |
| 330 | 330 | ||
| 331 | <tr height="30"> | 331 | <tr height="30"> |
| 332 | <td colspan="2" align="center" >东墙体归属</td> | 332 | <td colspan="2" align="center" >东墙体归属</td> |
| 333 | <td colspan="4" > | 333 | <td colspan="4" > |
| 334 | <el-input v-model="form.dqtgs"></el-input> | 334 | <el-input v-model="form.dqtgs" :disabled="disableFlag"></el-input> |
| 335 | </td> | 335 | </td> |
| 336 | <td colspan="2" align="center" >南墙体归属</td> | 336 | <td colspan="2" align="center" >南墙体归属</td> |
| 337 | <td colspan="4" > | 337 | <td colspan="4" > |
| 338 | <el-input v-model="form.nqtgs"></el-input> | 338 | <el-input v-model="form.nqtgs" :disabled="disableFlag"></el-input> |
| 339 | </td> | 339 | </td> |
| 340 | </tr> | 340 | </tr> |
| 341 | 341 | ||
| 342 | <tr height="30"> | 342 | <tr height="30"> |
| 343 | <td colspan="2" align="center" >西墙体归属</td> | 343 | <td colspan="2" align="center" >西墙体归属</td> |
| 344 | <td colspan="4" > | 344 | <td colspan="4" > |
| 345 | <el-input v-model="form.xqtgs"></el-input> | 345 | <el-input v-model="form.xqtgs" :disabled="disableFlag"></el-input> |
| 346 | </td> | 346 | </td> |
| 347 | <td colspan="2" align="center" >北墙体归属</td> | 347 | <td colspan="2" align="center" >北墙体归属</td> |
| 348 | <td colspan="4" > | 348 | <td colspan="4" > |
| 349 | <el-input v-model="form.bqtgs"></el-input> | 349 | <el-input v-model="form.bqtgs" :disabled="disableFlag"></el-input> |
| 350 | </td> | 350 | </td> |
| 351 | </tr> | 351 | </tr> |
| 352 | 352 | ||
| ... | @@ -355,7 +355,7 @@ | ... | @@ -355,7 +355,7 @@ |
| 355 | <span>附加说明</span> | 355 | <span>附加说明</span> |
| 356 | </td> | 356 | </td> |
| 357 | <td colspan="10" rowspan="2" > | 357 | <td colspan="10" rowspan="2" > |
| 358 | <el-input v-model="form.bz" type="textarea"></el-input> | 358 | <el-input v-model="form.bz" type="textarea" :disabled="disableFlag"></el-input> |
| 359 | </td> | 359 | </td> |
| 360 | </tr> | 360 | </tr> |
| 361 | <tr height="30"> | 361 | <tr height="30"> |
| ... | @@ -366,7 +366,7 @@ | ... | @@ -366,7 +366,7 @@ |
| 366 | <span>调查意见</span> | 366 | <span>调查意见</span> |
| 367 | </td> | 367 | </td> |
| 368 | <td colspan="10" > | 368 | <td colspan="10" > |
| 369 | <el-input v-model="form.name"></el-input> | 369 | <el-input v-model="form.name" :disabled="disableFlag"></el-input> |
| 370 | </td> | 370 | </td> |
| 371 | </tr> | 371 | </tr> |
| 372 | 372 | ||
| ... | @@ -375,7 +375,7 @@ | ... | @@ -375,7 +375,7 @@ |
| 375 | <span>审查员</span> | 375 | <span>审查员</span> |
| 376 | </td> | 376 | </td> |
| 377 | <td colspan="2" > | 377 | <td colspan="2" > |
| 378 | <el-input v-model="form.name"></el-input> | 378 | <el-input v-model="form.name" :disabled="disableFlag"></el-input> |
| 379 | </td> | 379 | </td> |
| 380 | <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> | 380 | <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> |
| 381 | <span>审查日期</span> | 381 | <span>审查日期</span> |
| ... | @@ -391,6 +391,11 @@ | ... | @@ -391,6 +391,11 @@ |
| 391 | </tbody> | 391 | </tbody> |
| 392 | </table> | 392 | </table> |
| 393 | </el-form> | 393 | </el-form> |
| 394 | <div class="btnGroup"> | ||
| 395 | <el-button type="primary" @click="onSave">保存</el-button> | ||
| 396 | <el-button type="primary" @click="onSubmit">提交</el-button> | ||
| 397 | <el-button type="primary" @click="registerCall">登记调用</el-button> | ||
| 398 | </div> | ||
| 394 | <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px"> | 399 | <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px"> |
| 395 | <el-button type="success" @click="onSave">保存</el-button> | 400 | <el-button type="success" @click="onSave">保存</el-button> |
| 396 | <el-button type="primary" @click="onSubmit">提交</el-button> | 401 | <el-button type="primary" @click="onSubmit">提交</el-button> |
| ... | @@ -404,7 +409,7 @@ | ... | @@ -404,7 +409,7 @@ |
| 404 | import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; | 409 | import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; |
| 405 | import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; | 410 | import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; |
| 406 | import {getBdcdyh} from "./../../../../../api/zrz"; | 411 | import {getBdcdyh} from "./../../../../../api/zrz"; |
| 407 | import {submit} from "./../../../../../api/common" | 412 | import {submit,registerCall} from "./../../../../../api/common" |
| 408 | export default { | 413 | export default { |
| 409 | name:'zrz', | 414 | name:'zrz', |
| 410 | components:{ | 415 | components:{ |
| ... | @@ -421,6 +426,8 @@ | ... | @@ -421,6 +426,8 @@ |
| 421 | data () { | 426 | data () { |
| 422 | return { | 427 | return { |
| 423 | 428 | ||
| 429 | disableFlag:false, | ||
| 430 | |||
| 424 | //树型结构 | 431 | //树型结构 |
| 425 | show:true, | 432 | show:true, |
| 426 | clearable: true, | 433 | clearable: true, |
| ... | @@ -524,6 +531,18 @@ | ... | @@ -524,6 +531,18 @@ |
| 524 | this.getHInfo(bsm); | 531 | this.getHInfo(bsm); |
| 525 | }, | 532 | }, |
| 526 | methods: { | 533 | methods: { |
| 534 | registerCall(){ | ||
| 535 | let data={ | ||
| 536 | type:'h', | ||
| 537 | bsm:this.$store.state.hbsm | ||
| 538 | } | ||
| 539 | registerCall(data).then(res=>{ | ||
| 540 | if (res.success) { | ||
| 541 | this.$message.success("登记成功") | ||
| 542 | this.getRightTree(this.$store.state.zdbsm) | ||
| 543 | } | ||
| 544 | }) | ||
| 545 | }, | ||
| 527 | addYtInfo(){ | 546 | addYtInfo(){ |
| 528 | this.form.fwytList.push({ | 547 | this.form.fwytList.push({ |
| 529 | glbsm:'', | 548 | glbsm:'', |
| ... | @@ -570,6 +589,9 @@ | ... | @@ -570,6 +589,9 @@ |
| 570 | getQjHDetailByBsm(hbsm).then((res)=>{ | 589 | getQjHDetailByBsm(hbsm).then((res)=>{ |
| 571 | if(res.code===200){ | 590 | if(res.code===200){ |
| 572 | this.form = res.result; | 591 | this.form = res.result; |
| 592 | if(res.result.qszt !== '0'){ | ||
| 593 | this.disableFlag = true; | ||
| 594 | } | ||
| 573 | if(this.form.scyclx==='0'){ | 595 | if(this.form.scyclx==='0'){ |
| 574 | this.$set(this.form,"ycjzmj", this.form.jzmj) | 596 | this.$set(this.form,"ycjzmj", this.form.jzmj) |
| 575 | this.$set(this.form,"yctnjzmj", this.form.tnjzmj) | 597 | this.$set(this.form,"yctnjzmj", this.form.tnjzmj) |
| ... | @@ -675,10 +697,8 @@ | ... | @@ -675,10 +697,8 @@ |
| 675 | }) | 697 | }) |
| 676 | }, | 698 | }, |
| 677 | //保存户信息 | 699 | //保存户信息 |
| 678 | onSave(bsm,yclx){ | 700 | onSave(){ |
| 679 | console.log(bsm); | 701 | this.form.bsm=this.$store.state.hbsm; |
| 680 | console.log(yclx) | ||
| 681 | this.form.bsm=bsm; | ||
| 682 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); | 702 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); |
| 683 | if(this.form.scyclx==='0'){ | 703 | if(this.form.scyclx==='0'){ |
| 684 | this.form.jzmj = this.form.ycjzmj; | 704 | this.form.jzmj = this.form.ycjzmj; |
| ... | @@ -703,9 +723,9 @@ | ... | @@ -703,9 +723,9 @@ |
| 703 | } | 723 | } |
| 704 | }) | 724 | }) |
| 705 | }, | 725 | }, |
| 706 | onSubmit(bsm,yclx){ | 726 | onSubmit(){ |
| 707 | let data={ | 727 | let data={ |
| 708 | glbsm:bsm, | 728 | glbsm:this.$store.state.hbsm, |
| 709 | status:1, | 729 | status:1, |
| 710 | type:"h" | 730 | type:"h" |
| 711 | } | 731 | } |
| ... | @@ -879,4 +899,8 @@ | ... | @@ -879,4 +899,8 @@ |
| 879 | height: 30px !important; | 899 | height: 30px !important; |
| 880 | } | 900 | } |
| 881 | } | 901 | } |
| 902 | .btnGroup{ | ||
| 903 | text-align: center; | ||
| 904 | margin-top: 20px; | ||
| 905 | } | ||
| 882 | </style> | 906 | </style> | ... | ... |
| ... | @@ -257,13 +257,6 @@ | ... | @@ -257,13 +257,6 @@ |
| 257 | <!-- 双击户的弹出框 --> | 257 | <!-- 双击户的弹出框 --> |
| 258 | <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> | 258 | <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> |
| 259 | <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> | 259 | <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> |
| 260 | <div class="btnGroup"> | ||
| 261 | <el-button type="primary" @click="hbjSaveInfo">保存</el-button> | ||
| 262 | <el-button type="primary" @click="hbjSubmitInfo">提交</el-button> | ||
| 263 | <el-button type="primary" @click="hbjResetInfo">重置</el-button> | ||
| 264 | <el-button type="primary" @click="hbjVisible = false">取消</el-button> | ||
| 265 | <el-button type="primary" @click="registerCall">登记调用</el-button> | ||
| 266 | </div> | ||
| 267 | </el-dialog> | 260 | </el-dialog> |
| 268 | </div> | 261 | </div> |
| 269 | </template> | 262 | </template> |
| ... | @@ -281,7 +274,6 @@ import addZdy from "./zdy/index"; | ... | @@ -281,7 +274,6 @@ import addZdy from "./zdy/index"; |
| 281 | import addCh from "./ch/index"; | 274 | import addCh from "./ch/index"; |
| 282 | import hbj from "./hbj/index"; | 275 | import hbj from "./hbj/index"; |
| 283 | import lpbContent from "./lpbContent/index"; | 276 | import lpbContent from "./lpbContent/index"; |
| 284 | import {registerCall} from "../../../../api/common"; | ||
| 285 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb"; | 277 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb"; |
| 286 | 278 | ||
| 287 | export default { | 279 | export default { |
| ... | @@ -406,18 +398,6 @@ export default { | ... | @@ -406,18 +398,6 @@ export default { |
| 406 | }, 100); | 398 | }, 100); |
| 407 | }, | 399 | }, |
| 408 | methods: { | 400 | methods: { |
| 409 | registerCall(){ | ||
| 410 | let data={ | ||
| 411 | type:'h', | ||
| 412 | bsm:this.hbsm | ||
| 413 | } | ||
| 414 | registerCall(data).then(res=>{ | ||
| 415 | if (res.success) { | ||
| 416 | this.$message.success("登记成功") | ||
| 417 | this.getRightTree(this.$store.state.zdbsm) | ||
| 418 | } | ||
| 419 | }) | ||
| 420 | }, | ||
| 421 | batchCommit(){ | 401 | batchCommit(){ |
| 422 | if (this.bsms.length <= 0) { | 402 | if (this.bsms.length <= 0) { |
| 423 | Message.warning("请选择操作户") | 403 | Message.warning("请选择操作户") |
| ... | @@ -604,18 +584,6 @@ export default { | ... | @@ -604,18 +584,6 @@ export default { |
| 604 | }); | 584 | }); |
| 605 | } | 585 | } |
| 606 | }, | 586 | }, |
| 607 | //户保存 | ||
| 608 | hbjSaveInfo() { | ||
| 609 | this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition); | ||
| 610 | }, | ||
| 611 | //户保存 | ||
| 612 | hbjSubmitInfo() { | ||
| 613 | this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition); | ||
| 614 | }, | ||
| 615 | //户编辑表单重置 | ||
| 616 | hbjResetInfo() { | ||
| 617 | this.$refs.hbj.onReset(); | ||
| 618 | }, | ||
| 619 | //调用楼盘表信息查询接口 | 587 | //调用楼盘表信息查询接口 |
| 620 | getlpbData() { | 588 | getlpbData() { |
| 621 | this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); | 589 | this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); | ... | ... |
-
Please register or sign in to post a comment