6abea490 by zhaoqian

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents 75380635 394d00d3
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
48 </el-row> 48 </el-row>
49 <table border="1"> 49 <table border="1">
50 <tr> 50 <tr>
51 <td>序号</td> 51 <td class="xh">序号</td>
52 <td>操作</td> 52 <td class="zddm">宗地代码</td>
53 <td>宗地代码</td> 53 <td class="bdcdyh">不动产单元号</td>
54 <td>不动产单元号</td> 54 <td class="xmmc">项目名称</td>
55 <td>项目名称</td> 55 <td class="bdcqzh">不动产权证号</td>
56 <td>不动产权证号</td> 56 <td class="qlr">权利人</td>
57 <td>权利人</td> 57 <td class="zl">坐落</td>
58 <td>坐落</td> 58 <td class="cz">操作</td>
59 </tr> 59 </tr>
60 <tr v-if="Data.length==0"> 60 <tr v-if="Data.length==0">
61 <td colspan="8"> 61 <td colspan="8">
...@@ -63,16 +63,16 @@ ...@@ -63,16 +63,16 @@
63 </td> 63 </td>
64 </tr> 64 </tr>
65 <tr v-else v-for="(item,index) in Data" :key="index"> 65 <tr v-else v-for="(item,index) in Data" :key="index">
66 <td>{{index+1}}</td> 66 <td class="xh">{{index+1}}</td>
67 <td @click="select(item)" class="xz"> 67 <td class="zddm" :title="item.zddm">{{item.zddm}}</td>
68 <span>选择</span> 68 <td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
69 <td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
70 <td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
71 <td class="qlr" :title="item.qlr">{{item.qlr}}</td>
72 <td class="zl" :title="item.zl">{{item.zl}}</td>
73 <td @click="saveNotarize(item)" class="cz">
74 <span>落宗</span>
69 </td> 75 </td>
70 <td>{{item.zddm}}</td>
71 <td>{{item.bdcdyh}}</td>
72 <td>{{item.xmmc}}</td>
73 <td>{{item.bdcqzh}}</td>
74 <td>{{item.qlr}}</td>
75 <td>{{item.zl}}</td>
76 </tr> 76 </tr>
77 </table> 77 </table>
78 </div> 78 </div>
...@@ -86,10 +86,6 @@ ...@@ -86,10 +86,6 @@
86 > 86 >
87 </el-pagination> 87 </el-pagination>
88 </div> 88 </div>
89 <div class="footer-button">
90 <el-button type="primary" @click="save">确认</el-button>
91 <el-button type="primary" @click="close">取消</el-button>
92 </div>
93 </el-dialog> 89 </el-dialog>
94 </div> 90 </div>
95 </template> 91 </template>
...@@ -144,13 +140,25 @@ ...@@ -144,13 +140,25 @@
144 created() { 140 created() {
145 }, 141 },
146 methods: { 142 methods: {
143 saveNotarize: function (val) {
144 this.zdbsm = val.glbsm;
145 this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
146 confirmButtonText: '确定',
147 cancelButtonText: '取消',
148 type: 'warning'
149 }).then(() => {
150 this.save();
151 }).catch(() => {
152 this.$message({
153 type: 'info',
154 message: '已取消'
155 });
156 });
157 },
147 currentChange: function (val) { 158 currentChange: function (val) {
148 this.queryData.pageNo = val; 159 this.queryData.pageNo = val;
149 this.getData(this.queryData); 160 this.getData(this.queryData);
150 }, 161 },
151 select: function (val) {
152 this.zdbsm = val.glbsm
153 },
154 save: function () { 162 save: function () {
155 zrzcxlz({ 163 zrzcxlz({
156 zdBsm: this.zdbsm, 164 zdBsm: this.zdbsm,
...@@ -216,6 +224,9 @@ ...@@ -216,6 +224,9 @@
216 background-color: #fff; 224 background-color: #fff;
217 font-size: 14px; 225 font-size: 14px;
218 width: 100%; 226 width: 100%;
227 tr:hover{
228 background-color: #F5F7FA;
229 }
219 } 230 }
220 231
221 td { 232 td {
...@@ -248,8 +259,38 @@ ...@@ -248,8 +259,38 @@
248 height: 650px; 259 height: 650px;
249 } 260 }
250 261
251 .footer-button { 262 .xh {
252 text-align: center; 263 width: 50px;
253 margin-top: 20px; 264 }
265
266 .zddm {
267 width: 120px;
268 }
269
270 .bdcdyh {
271 width: 180px;
272 }
273
274 .xmmc {
275 width: 100px;
276 }
277
278 .bdcqzh {
279 width: 100px;
280 }
281
282 .qlr {
283 width: 100px;
284 }
285
286 .zl {
287 width: 100px;
288 }
289
290 .cz {
291 width: 50px;
292 span {
293 color: blue;
294 }
254 } 295 }
255 </style> 296 </style>
......
1 <template>
2 <div class="main">
3 <div class='input' contenteditable placeholder='请输入文字'>
4 <div @mouseover="mouseover($event)" @mouseleave="mouseLeave($event)" v-for="(item,index) in datas"
5 :key="index" style="float: left;"
6 class="item">
7 {{item}};
8 <div style="float: right;display: none" @click="itemClick(index)">X</div>
9 </div>
10
11 </div>
12 </div>
13 </template>
14
15 <script>
16 export default {
17 name: "emailInput",
18 data() {
19 return {
20 datas: ['111', '222', '333', '444', '555', '666', '777', '888', '999'],
21 }
22 },
23 props: {},
24 methods: {
25 mouseover(e) {
26 // e.target 是你当前点击的元素
27 // 是你绑定事件的元素
28 let dom = e.currentTarget.firstElementChild
29 dom.style = "float: right;display: block";
30 // 获得点击元素的前一个元素
31 /* e.currentTarget.previousElementSibling.innerHTML
32 // 获得点击元素的第一个子元素
33 e.currentTarget.firstElementChild
34 // 获得点击元素的下一个元素
35 e.currentTarget.nextElementSibling
36 // 获得点击元素中id为string的元素
37 e.currentTarget.getElementById("string")
38 // 获得点击元素的string属性
39 e.currentTarget.getAttributeNode('string')
40 //获得点击元素的父级元素
41 e.currentTarget.parentElement
42 // 获得点击元素的前一个元素的第一个子元素的HTML值
43 e.currentTarget.previousElementSibling.firstElementChild.innerHTML*/
44
45 },
46 mouseLeave(e) {
47 let dom = e.currentTarget.firstElementChild
48 dom.style = "float: right;display: none"
49 },
50 itemClick(index){
51 this.datas.splice(index,1)
52 }
53 },
54 computed: {
55 text: function () {
56 let text = "";
57 for (let item of this.datas) {
58 text += item + ";";
59 }
60
61 return text;
62 }
63 }
64 }
65 </script>
66
67 <style scoped lang="less">
68 .main {
69 .input {
70 width: auto;
71 height: 24px;
72 line-height: 24px;
73 font-size: 14px;
74 padding: 5px 8px;
75 border: 1px solid #ddd;
76 }
77 .input:empty::before {
78 content: attr(placeholder);
79 }
80 .item{
81 cursor: pointer;
82 }
83 .item:hover {
84 border: 1px solid #BBF;
85 }
86 }
87 </style>
1 <template>
2 <div class="main">
3 <el-dialog
4 title="户重新落宗"
5 :visible.sync="isVisible"
6 width="50%"
7 @close="close"
8 :modal-append-to-body="false"
9 >
10 <div class="content">
11 <div class="input-suffix">
12 宗 地:
13 <input
14 placeholder="请选择宗地" v-model="hcxlzData.zdbsm" readonly="readonly"
15 />
16 <el-button type="primary" @click="drawer = true">选择宗地</el-button>
17 </div>
18 <div class="input-suffix">
19 自然幢:
20 <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择">
21 <el-option
22 v-for="item in zrzList"
23 :key="item.value"
24 :label="item.label"
25 :value="item.value">
26 </el-option>
27 </el-select>
28 </div>
29 <div class="input-suffix">
30 逻辑幢:
31 <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择">
32 <el-option
33 v-for="item in ljzList"
34 :key="item.value"
35 :label="item.label"
36 :value="item.value">
37 </el-option>
38 </el-select>
39 </div>
40 <div class="input-suffix">
41 幢单元:
42 <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
43 <el-option
44 v-for="item in zdyList"
45 :key="item.value"
46 :label="item.label"
47 :value="item.value">
48 </el-option>
49 </el-select>
50 </div>
51 </div>
52 <div class="footer">
53 <el-button type="primary" @click="save">保存</el-button>
54 <el-button type="primary" @click="cancel">取消</el-button>
55 </div>
56 <el-drawer
57 title="选择宗地"
58 :visible.sync="drawer"
59 direction="rtl"
60 size="25%"
61 :before-close="drawerClose">
62 <div>
63 <div class="search">
64 <el-button type="primary" @click="search">查询</el-button>
65 <el-button type="primary" @click="result">重置</el-button>
66 <el-row :gutter="10" class="shop">
67 <el-col :span="4" class="inputtitle">
68 宗地编码:
69 </el-col>
70 <el-col :span="8" class="">
71 <el-input v-model="queryData.zddm"></el-input>
72 </el-col>
73 <el-col :span="4" class="inputtitle">
74 不动产权证号:
75 </el-col>
76 <el-col :span="8" class="">
77 <el-input v-model="queryData.bdcqzh"></el-input>
78 </el-col>
79 </el-row>
80 <el-row :gutter="10">
81 <el-col :span="4" class="inputtitle">
82 不动产权单元号:
83 </el-col>
84 <el-col :span="8">
85 <el-input v-model="queryData.bdcdyh"></el-input>
86 </el-col>
87 <el-col :span="4" class="inputtitle">
88 权利人:
89 </el-col>
90 <el-col :span="8">
91 <el-input v-model="queryData.qlrmc"></el-input>
92 </el-col>
93 </el-row>
94 <el-row :gutter="10">
95 <el-col :span="4" class="inputtitle">
96 坐落:
97 </el-col>
98 <el-col :span="8">
99 <el-input v-model="queryData.zl"></el-input>
100 </el-col>
101 </el-row>
102 <table border="1">
103 <tr>
104 <td class="xh">序号</td>
105 <td class="zddm">宗地代码</td>
106 <td class="bdcdyh">不动产单元号</td>
107 <td class="xmmc">项目名称</td>
108 <td class="bdcqzh">不动产权证号</td>
109 <td class="qlr">权利人</td>
110 <td class="zl">坐落</td>
111 <td class="cz">操作</td>
112 </tr>
113 <tr v-if="Data.length==0">
114 <td colspan="8">
115 <span class="noData">暂无数据</span>
116 </td>
117 </tr>
118 <tr v-else v-for="(item,index) in Data" :key="index">
119 <td class="xh">{{index+1}}</td>
120 <td class="zddm" :title="item.zddm">{{item.zddm}}</td>
121 <td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
122 <td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
123 <td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
124 <td class="qlr" :title="item.qlr">{{item.qlr}}</td>
125 <td class="zl" :title="item.zl">{{item.zl}}</td>
126 <td @click="saveNotarize(item)" class="cz">
127 <span>落宗</span>
128 </td>
129 </tr>
130 </table>
131 </div>
132 <div class="page">
133 <el-pagination
134 background
135 layout="prev, pager, next,total"
136 :page-size="queryData.pageSize"
137 :total="total"
138 @current-change="currentChange"
139 >
140 </el-pagination>
141 </div>
142 </div>
143 </el-drawer>
144 </el-dialog>
145 </div>
146 </template>
147
148 <script>
149 export default {
150 name: "hCxlz",
151 data() {
152 return {
153 drawer: false,
154 isVisible: false,
155 hcxlzData: {
156 bsms: [],
157 zdbsm: '',
158 zrzbsm: '',
159 ljzbsm: '',
160 zdybsm: ''
161 },
162 total: 1,
163 queryData: {
164 bdcdyh: "",
165 bdcqzh: "",
166 dylxs: ['zd'],
167 qlrmc: "",
168 qszt: "2",
169 xmmc: "",
170 zddm: "",
171 zl: "",
172 pageNo: 1,
173 pageSize: 10,
174 },
175 Data: [],
176 zrzList: [],
177 ljzList: [],
178 zdyList: []
179 }
180 },
181 props: {
182 hCxlzVisble: {
183 type: Boolean,
184 default: false
185 },
186 bsms: {
187 type: Array
188 }
189 },
190 mounted() {
191 },
192 methods: {
193 result: function () {
194 this.queryData = {
195 bdcdyh: "",
196 bdcqzh: "",
197 qlrmc: "",
198 qszt: "2",
199 xmmc: "",
200 zddm: "",
201 zl: "",
202 pageNo: 1,
203 pageSize: 10,
204 };
205 this.getData(this.queryData)
206 },
207 getData: function (data) {
208 data['dylxs'] = this.dylxs;
209 getSearchList(data).then(res => {
210 this.Data = res.result.records
211 this.total = res.result.total;
212 })
213 },
214 search: function () {
215 this.getData(this.queryData)
216 },
217 drawerClose(done) {
218 this.$confirm('确认关闭?')
219 .then(_ => {
220 done();
221 })
222 .catch(_ => {
223 });
224 },
225 cancel() {
226 console.log("cancel......")
227 },
228 save() {
229 console.log("save.......")
230 },
231 close() {
232 this.$emit('close', false);
233 this.isVisible = false;
234 },
235 },
236 watch: {
237 hCxlzVisble: function (val) {
238 this.isVisible = val
239 }
240 }
241 }
242 </script>
243
244 <style scoped lang="less">
245 .input-suffix {
246 input {
247 width: 210px;
248 height: 30px;
249 border-radius: 3px;
250 border-color: #BBB;
251 }
252 }
253
254 .content {
255 text-align: center;
256 }
257
258 .footer {
259 margin-top: 20px;
260 text-align: center;
261 }
262 </style>
263
264
265
266
...@@ -176,6 +176,9 @@ ...@@ -176,6 +176,9 @@
176 background-color: #fff; 176 background-color: #fff;
177 font-size: 14px; 177 font-size: 14px;
178 width: 100%; 178 width: 100%;
179 tr:hover{
180 background-color: #F5F7FA;
181 }
179 } 182 }
180 183
181 td { 184 td {
......
...@@ -44,7 +44,8 @@ const store = new Vuex.Store({ ...@@ -44,7 +44,8 @@ const store = new Vuex.Store({
44 zjlxList: [], 44 zjlxList: [],
45 gyfsList: [], 45 gyfsList: [],
46 hbsm:'', 46 hbsm:'',
47 contentWidth:'' //内容区域宽度 47 contentWidth:'', //内容区域宽度
48 zrzh:'' //自然幢号
48 }, 49 },
49 modules: { 50 modules: {
50 user, 51 user,
......
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
41 </el-row> 41 </el-row>
42 <table border="1"> 42 <table border="1">
43 <tr> 43 <tr>
44 <td>序号</td> 44 <td class="xh">序号</td>
45 <td>操作</td> 45 <td class="cz">操作</td>
46 <td>宗地代码</td> 46 <td class="zddm">宗地代码</td>
47 <td>不动产单元号</td> 47 <td class="bdcdyh">不动产单元号</td>
48 <td>项目名称</td> 48 <td class="xmmc">项目名称</td>
49 <td>不动产权证号</td> 49 <td class="bdcqzh">不动产权证号</td>
50 <td>权利人</td> 50 <td class="qlr">权利人</td>
51 <td>坐落</td> 51 <td class="zl">坐落</td>
52 </tr> 52 </tr>
53 <tr v-if="Data.length == 0"> 53 <tr v-if="Data.length == 0">
54 <td colspan="8"> 54 <td colspan="8">
...@@ -56,16 +56,16 @@ ...@@ -56,16 +56,16 @@
56 </td> 56 </td>
57 </tr> 57 </tr>
58 <tr v-else v-for="(item, index) in Data" :key="index"> 58 <tr v-else v-for="(item, index) in Data" :key="index">
59 <td>{{ index + 1 }}</td> 59 <td class="xh">{{ index + 1 }}</td>
60 <td @click="xzzrz(item)" class="xz"> 60 <td @click="xzzrz(item)" class="cz">
61 <span>选择</span> 61 <span>选择</span>
62 </td> 62 </td>
63 <td>{{ item.zddm }}</td> 63 <td class="zddm" :title="item.zddm">{{ item.zddm }}</td>
64 <td>{{ item.bdcdyh }}</td> 64 <td class="bdcdyh" :title="item.bdcdyh">{{ item.bdcdyh }}</td>
65 <td>{{ item.xmmc }}</td> 65 <td class="xmmc" :title="item.xmmc">{{ item.xmmc }}</td>
66 <td>{{ item.bdcqzh }}</td> 66 <td class="bdcqzh" :title="item.bdcqzh ">{{ item.bdcqzh }}</td>
67 <td>{{ item.qlr }}</td> 67 <td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
68 <td>{{ item.zl }}</td> 68 <td class="zl">{{ item.zl }}</td>
69 </tr> 69 </tr>
70 </table> 70 </table>
71 </div> 71 </div>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 bdcqzh: "", 107 bdcqzh: "",
108 dylxs: ["zrz"], 108 dylxs: ["zrz"],
109 qlrmc: "", 109 qlrmc: "",
110 qszt: "", 110 qszt: "2",
111 xmmc: "", 111 xmmc: "",
112 zddm: "", 112 zddm: "",
113 zl: "", 113 zl: "",
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 bdcqzh: "", 142 bdcqzh: "",
143 dylxs: ["zrz"], 143 dylxs: ["zrz"],
144 qlrmc: "", 144 qlrmc: "",
145 qszt: "", 145 qszt: "2",
146 xmmc: "", 146 xmmc: "",
147 zddm: "", 147 zddm: "",
148 zl: "", 148 zl: "",
...@@ -178,12 +178,19 @@ ...@@ -178,12 +178,19 @@
178 background-color: #fff; 178 background-color: #fff;
179 font-size: 14px; 179 font-size: 14px;
180 width: 100%; 180 width: 100%;
181 table-layout: fixed;
182 tr:hover{
183 background-color: #F5F7FA;
181 } 184 }
182 185 td, th {
183 td {
184 text-align: center; 186 text-align: center;
185 height: 36px; 187 height: 36px;
186 min-width: 50px; 188 min-width: 50px;
189 overflow: hidden;
190 white-space: nowrap;
191 -ms-text-overflow: ellipsis;
192 text-overflow: ellipsis;
193 }
187 } 194 }
188 195
189 table:hover { 196 table:hover {
...@@ -198,9 +205,40 @@ ...@@ -198,9 +205,40 @@
198 margin-top: 20px; 205 margin-top: 20px;
199 } 206 }
200 207
201 .xz { 208 .xh {
209 width: 50px;
210 }
211
212 .zddm {
213 width: 120px;
214 }
215
216 .bdcdyh {
217 width: 180px;
218 }
219
220 .xmmc {
221 width: 100px;
222 }
223
224 .bdcqzh {
225 width: 100px;
226 }
227
228 .qlr {
229 width: 100px;
230 }
231
232 .zl {
233 width: 100px;
234 }
235
236 .cz {
237 width: 50px;
238 span {
202 color: blue; 239 color: blue;
203 } 240 }
241 }
204 242
205 .noData { 243 .noData {
206 color: #b2b2b2; 244 color: #b2b2b2;
......
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
144 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl> 144 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl>
145 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> 145 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
146 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh> 146 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
147 <h-cxlz :h-cxlz-visble="hcxlzVisible" :bsms="bsms" @close="hcxlzClose"></h-cxlz>
147 <!-- 双击户的弹出框 --> 148 <!-- 双击户的弹出框 -->
148 <el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center> 149 <el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center>
149 <hbj ref="hbj" :bsm='hbsm'></hbj> 150 <hbj ref="hbj" :bsm='hbsm'></hbj>
...@@ -157,34 +158,36 @@ ...@@ -157,34 +158,36 @@
157 </template> 158 </template>
158 159
159 <script> 160 <script>
160 import PlC from "./../../../../components/plc/plC" 161 import HCxlz from "./../../../../components/hCxlz/hCxlz"
161 import PlSh from "./../../../../components/plsh/plSh" 162 import PlC from "./../../../../components/plc/plC"
162 import PlH from "./../../../../components/plh/plH" 163 import PlSh from "./../../../../components/plsh/plSh"
163 import PlZl from "./../../../../components/plzl/plZl" 164 import PlH from "./../../../../components/plh/plH"
164 import LineTree from "../../../../components/lineTree/lineTree"; 165 import PlZl from "./../../../../components/plzl/plZl"
165 import addLjz from "./ljz/index"; 166 import LineTree from "../../../../components/lineTree/lineTree";
166 import addZdy from "./zdy/index"; 167 import addLjz from "./ljz/index";
167 import addCh from "./ch/index"; 168 import addZdy from "./zdy/index";
168 import hbj from "./hbj/index" 169 import addCh from "./ch/index";
169 import lpbContent from "./lpbContent/index"; 170 import hbj from "./hbj/index"
170 import {getLpbMenuTree,batchScYcChange,batchGeneratorBdcdyh} from "../../../../api/lpb"; 171 import lpbContent from "./lpbContent/index";
172 import {getLpbMenuTree, batchScYcChange} from "../../../../api/lpb";
171 173
172 174
173 export default { 175 export default {
174 name: "", 176 name: "",
175 components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh,PlH ,PlZl,hbj}, 177 components: {LineTree, addLjz, addZdy, addCh, lpbContent, PlC, PlSh, PlH, PlZl, hbj, HCxlz},
176 props: {}, 178 props: {},
177 data() { 179 data() {
178 return { 180 return {
179 bsms:["123","321","231"], 181 bsms: ["123", "321", "231"],
180 hbsm:'', 182 hbsm: '',
183 hcxlzVisible: false,
181 dialogVisible: false, 184 dialogVisible: false,
182 plcVisible:false, 185 plcVisible: false,
183 plhVisible:false, 186 plhVisible: false,
184 plShVisible:false, 187 plShVisible: false,
185 plzlVisible:false, 188 plzlVisible: false,
186 hbjVisible:false, 189 hbjVisible: false,
187 tabPosition:"1", //1是实测 0是预测 190 tabPosition: "1", //1是实测 0是预测
188 radio1: "", 191 radio1: "",
189 radio2: "", 192 radio2: "",
190 createFlag: false, 193 createFlag: false,
...@@ -193,8 +196,8 @@ export default { ...@@ -193,8 +196,8 @@ export default {
193 pd: [], //创建楼盘的树结构数据 196 pd: [], //创建楼盘的树结构数据
194 menuType: "", 197 menuType: "",
195 treeData: {}, 198 treeData: {},
196 inputWidth:74, 199 inputWidth: 74,
197 selectedZt:'dyzt', //图例选中项,默认选中单元状态 200 selectedZt: 'dyzt', //图例选中项,默认选中单元状态
198 legendList: [ 201 legendList: [
199 { 202 {
200 name: "未确权", 203 name: "未确权",
...@@ -260,7 +263,7 @@ export default { ...@@ -260,7 +263,7 @@ export default {
260 legendToggleFlag: false, 263 legendToggleFlag: false,
261 lpbContentHight: "", 264 lpbContentHight: "",
262 lpbContentwidth: "", 265 lpbContentwidth: "",
263 time:'' 266 time: ''
264 }; 267 };
265 }, 268 },
266 created() { 269 created() {
...@@ -276,17 +279,20 @@ export default { ...@@ -276,17 +279,20 @@ export default {
276 }, 100); 279 }, 100);
277 }, 280 },
278 methods: { 281 methods: {
279 plZlClose(){ 282 hcxlzClose() {
280 this.plzlVisible=false 283 this.hcxlzVisible = false;
281 }, 284 },
282 plcClose(){ 285 plZlClose() {
283 this.plcVisible=false; 286 this.plzlVisible = false
284 }, 287 },
285 plhClose(){ 288 plcClose() {
286 this.plhVisible=false; 289 this.plcVisible = false;
287 }, 290 },
288 plshClose(){ 291 plhClose() {
289 this.plShVisible=false 292 this.plhVisible = false;
293 },
294 plshClose() {
295 this.plShVisible = false
290 }, 296 },
291 //获取高度计算lpb内容区高度 297 //获取高度计算lpb内容区高度
292 getHeight() { 298 getHeight() {
...@@ -302,7 +308,8 @@ export default { ...@@ -302,7 +308,8 @@ export default {
302 .then((res) => { 308 .then((res) => {
303 this.pd = res.result; 309 this.pd = res.result;
304 }) 310 })
305 .catch((error) => {}); 311 .catch((error) => {
312 });
306 }, 313 },
307 //打开新建楼盘树结构右键菜单唤起的弹框 314 //打开新建楼盘树结构右键菜单唤起的弹框
308 openLpbDialog(data, type) { 315 openLpbDialog(data, type) {
...@@ -352,16 +359,16 @@ export default { ...@@ -352,16 +359,16 @@ export default {
352 this.legendToggleFlag = !this.legendToggleFlag; 359 this.legendToggleFlag = !this.legendToggleFlag;
353 }, 360 },
354 //获取选中户bsm 361 //获取选中户bsm
355 getHbsm(data,type){ 362 getHbsm(data, type) {
356 this.bsms = data; 363 this.bsms = data;
357 if(type){ 364 if (type) {
358 // 双击 365 // 双击
359 this.hbsm = this.bsms[this.bsms.length-1]; 366 this.hbsm = this.bsms[this.bsms.length - 1];
360 this.hbjVisible = true; 367 this.hbjVisible = true;
361 this.$nextTick(function () { 368 this.$nextTick(function () {
362 this.$refs.hbj.getHInfo(this.hbsm); 369 this.$refs.hbj.getHInfo(this.hbsm);
363 }) 370 })
364 }else{ 371 } else {
365 //单击 TO DO 372 //单击 TO DO
366 373
367 } 374 }
...@@ -420,15 +427,8 @@ export default { ...@@ -420,15 +427,8 @@ export default {
420 }, 427 },
421 //批量添加不动产单元号 428 //批量添加不动产单元号
422 addBdcdyh(){ 429 addBdcdyh(){
430 // this.pd[0].bsm //自然幢标识码
423 console.log(this.$store.state.zrzh,'this.$store.state.zrzh'); 431 console.log(this.$store.state.zrzh,'this.$store.state.zrzh');
424 console.log(this.pd[0].bsm,'this.pd[0].bsm');
425 batchGeneratorBdcdyh(this.$store.state.zrzh,this.pd[0].bsm).then((res)=>{
426 if(res.code===200){
427 this.$message.success("生成完成!")
428 }else {
429 this.$message.warning("生成失败!")
430 }
431 })
432 } 432 }
433 }, 433 },
434 computed: { 434 computed: {
......
...@@ -10,25 +10,25 @@ ...@@ -10,25 +10,25 @@
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码</td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <el-input v-model="form.zddm" disabled></el-input> 13 <input v-model="form.zddm" class="formInput" disabled>
14 <el-input v-show="false" v-model="form.zdbsm"></el-input> 14 <input v-show="false" class="formInput" v-model="form.zdbsm">
15 </td> 15 </td>
16 <td colspan="2" align="center" >自然幢号</td> 16 <td colspan="2" align="center" >自然幢号</td>
17 <td colspan="4" > 17 <td colspan="4" >
18 <el-input v-model="form.zrzh" style="width: 70%"></el-input> 18 <input class="formInput" v-model="form.zrzh" style="width: 70%">
19 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 19 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
20 </td> 20 </td>
21 </tr> 21 </tr>
22 <tr height="30"> 22 <tr height="30">
23 <td colspan="2" align="center" >项目名称</td> 23 <td colspan="2" align="center" >项目名称</td>
24 <td colspan="4" > 24 <td colspan="4" >
25 <el-input v-model="form.xmmc"></el-input> 25 <input class="formInput" v-model="form.xmmc">
26 </td> 26 </td>
27 <td colspan="2" align="center" >不动产单元号</td> 27 <td colspan="2" align="center" >不动产单元号</td>
28 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> 28 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
29 <td colspan="4" > 29 <td colspan="4" >
30 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> 30 <input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%">
31 <el-input v-show="false" v-model="form.dyhbsm" style="width: 70%"></el-input> 31 <input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%">
32 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 32 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
33 </td> 33 </td>
34 </tr> 34 </tr>
...@@ -36,18 +36,18 @@ ...@@ -36,18 +36,18 @@
36 <tr height="30"> 36 <tr height="30">
37 <td colspan="2" align="center" >建筑物名称</td> 37 <td colspan="2" align="center" >建筑物名称</td>
38 <td colspan="4" > 38 <td colspan="4" >
39 <el-input v-model="form.jzwmc"></el-input> 39 <input class="formInput" v-model="form.jzwmc">
40 </td> 40 </td>
41 <td colspan="2" align="center" >建筑物基本用途</td> 41 <td colspan="2" align="center" >建筑物基本用途</td>
42 <td colspan="4" > 42 <td colspan="4" >
43 <el-input v-model="form.jzwjbyt"></el-input> 43 <input class="formInput" v-model="form.jzwjbyt">
44 </td> 44 </td>
45 </tr> 45 </tr>
46 46
47 <tr height="30"> 47 <tr height="30">
48 <td colspan="2" align="center" >房屋性质</td> 48 <td colspan="2" align="center" >房屋性质</td>
49 <td colspan="4" > 49 <td colspan="4" >
50 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 50 <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
51 <el-option 51 <el-option
52 v-for="item in $store.state.fwxzOptions" 52 v-for="item in $store.state.fwxzOptions"
53 :key="item.bsm" 53 :key="item.bsm"
...@@ -69,62 +69,62 @@ ...@@ -69,62 +69,62 @@
69 <tr height="30"> 69 <tr height="30">
70 <td colspan="2" align="center" >建筑物高度(m)</td> 70 <td colspan="2" align="center" >建筑物高度(m)</td>
71 <td colspan="4" > 71 <td colspan="4" >
72 <el-input v-model="form.jzwgd"></el-input> 72 <input class="formInput" v-model="form.jzwgd">
73 </td> 73 </td>
74 <td colspan="2" align="center" >总套数</td> 74 <td colspan="2" align="center" >总套数</td>
75 <td colspan="4" > 75 <td colspan="4" >
76 <el-input v-model="form.zts"></el-input> 76 <input class="formInput" v-model="form.zts">
77 </td> 77 </td>
78 </tr> 78 </tr>
79 79
80 <tr height="30"> 80 <tr height="30">
81 <td colspan="2" align="center" >幢用地面积(㎡)</td> 81 <td colspan="2" align="center" >幢用地面积(㎡)</td>
82 <td colspan="4" > 82 <td colspan="4" >
83 <el-input v-model="form.zydmj"></el-input> 83 <input class="formInput" v-model="form.zydmj">
84 </td> 84 </td>
85 <td colspan="2" align="center" >幢占用地面积(㎡)</td> 85 <td colspan="2" align="center" >幢占用地面积(㎡)</td>
86 <td colspan="4" > 86 <td colspan="4" >
87 <el-input v-model="form.zzdmj"></el-input> 87 <input class="formInput" v-model="form.zzdmj">
88 </td> 88 </td>
89 </tr> 89 </tr>
90 90
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.ycjzmj"></el-input> 94 <input class="formInput" v-model="form.ycjzmj">
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.scjzmj"></el-input> 98 <input class="formInput" v-model="form.scjzmj">
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-input v-model="form.dxcs"></el-input> 105 <input class="formInput" v-model="form.dxcs">
106 </td> 106 </td>
107 <td colspan="2" align="center" >地上层数</td> 107 <td colspan="2" align="center" >地上层数</td>
108 <td colspan="4" > 108 <td colspan="4" >
109 <el-input v-model="form.dscs"></el-input> 109 <input class="formInput" v-model="form.dscs">
110 </td> 110 </td>
111 </tr> 111 </tr>
112 112
113 <tr height="30"> 113 <tr height="30">
114 <td colspan="2" align="center" >总层数</td> 114 <td colspan="2" align="center" >总层数</td>
115 <td colspan="4" > 115 <td colspan="4" >
116 <el-input v-model="form.zcs"></el-input> 116 <input class="formInput" v-model="form.zcs">
117 </td> 117 </td>
118 <td colspan="2" align="center" >地下深度(m)</td> 118 <td colspan="2" align="center" >地下深度(m)</td>
119 <td colspan="4" > 119 <td colspan="4" >
120 <el-input v-model="form.dxsd"></el-input> 120 <input class="formInput" v-model="form.dxsd">
121 </td> 121 </td>
122 </tr> 122 </tr>
123 123
124 <tr height="30"> 124 <tr height="30">
125 <td colspan="2" align="center" >产别</td> 125 <td colspan="2" align="center" >产别</td>
126 <td colspan="4" > 126 <td colspan="4" >
127 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 127 <el-select class="formInput" v-model="form.fwcbbsm" placeholder="请选择" >
128 <el-option 128 <el-option
129 v-for="item in $store.state.cbOptions" 129 v-for="item in $store.state.cbOptions"
130 :key="item.bsm" 130 :key="item.bsm"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 </td> 135 </td>
136 <td colspan="2" align="center" >产权来源</td> 136 <td colspan="2" align="center" >产权来源</td>
137 <td colspan="4" > 137 <td colspan="4" >
138 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 138 <el-select class="formInput" v-model="form.fwcqlybsm" placeholder="请选择" >
139 <el-option 139 <el-option
140 v-for="item in $store.state.cqlyOptions" 140 v-for="item in $store.state.cqlyOptions"
141 :key="item.bsm" 141 :key="item.bsm"
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
157 规划用途 157 规划用途
158 </td> 158 </td>
159 <td width="30" colspan="4" align="center" > 159 <td width="30" colspan="4" align="center" >
160 <el-select-tree 160 <el-select-tree class="formInput"
161 v-if="show" 161 v-if="show"
162 :default-expand-all="defaultExpandAll" 162 :default-expand-all="defaultExpandAll"
163 :multiple="multiple" 163 :multiple="multiple"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
172 </td> 172 </td>
173 <td width="30" colspan="1" align="center" >用途</td> 173 <td width="30" colspan="1" align="center" >用途</td>
174 <td width="30" colspan="4" align="center" > 174 <td width="30" colspan="4" align="center" >
175 <el-select-tree 175 <el-select-tree class="formInput"
176 v-if="show" 176 v-if="show"
177 :default-expand-all="defaultExpandAll" 177 :default-expand-all="defaultExpandAll"
178 :multiple="multiple" 178 :multiple="multiple"
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
196 <span @click="deleteFwjgInfo(index)">删除</span> 196 <span @click="deleteFwjgInfo(index)">删除</span>
197 </td> 197 </td>
198 <td colspan="9" > 198 <td colspan="9" >
199 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 199 <el-select class="persent78" v-model="item1.fwjgzdbsm" placeholder="请选择" >
200 <el-option 200 <el-option
201 v-for="item in $store.state.jgOptions" 201 v-for="item in $store.state.jgOptions"
202 :key="item.bsm" 202 :key="item.bsm"
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
221 <span>坐落</span> 221 <span>坐落</span>
222 </td> 222 </td>
223 <td colspan="10" > 223 <td colspan="10" >
224 <el-input v-model="form.zl"></el-input> 224 <input class="formInput" v-model="form.zl">
225 </td> 225 </td>
226 </tr> 226 </tr>
227 227
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
230 <span>附加说明</span> 230 <span>附加说明</span>
231 </td> 231 </td>
232 <td colspan="10" rowspan="2" > 232 <td colspan="10" rowspan="2" >
233 <el-input v-model="form.bz" type="textarea"></el-input> 233 <input class="formInput" v-model="form.bz" type="textarea">
234 </td> 234 </td>
235 </tr> 235 </tr>
236 <tr height="30"> 236 <tr height="30">
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
241 <span>调查意见</span> 241 <span>调查意见</span>
242 </td> 242 </td>
243 <td colspan="10" > 243 <td colspan="10" >
244 <el-input v-model="form.dcyj"></el-input> 244 <input class="formInput" v-model="form.dcyj">
245 </td> 245 </td>
246 </tr> 246 </tr>
247 247
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
250 <span>审查员</span> 250 <span>审查员</span>
251 </td> 251 </td>
252 <td colspan="2" > 252 <td colspan="2" >
253 <el-input v-model="form.scy"></el-input> 253 <input class="formInput" v-model="form.scy">
254 </td> 254 </td>
255 <td colspan="2" align="right" style="width:8.33%;padding-right:10px"> 255 <td colspan="2" align="right" style="width:8.33%;padding-right:10px">
256 <span>审查日期</span> 256 <span>审查日期</span>
...@@ -590,6 +590,10 @@ ...@@ -590,6 +590,10 @@
590 590
591 .zrzTable{ 591 .zrzTable{
592 margin-top: 10px; 592 margin-top: 10px;
593 td{
594 text-align: center;
595 height: 36px;
596 }
593 } 597 }
594 } 598 }
595 </style> 599 </style>
...\ No newline at end of file ...\ No newline at end of file
......