Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
08119aa7 by 杨威
Options

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

2 parents 9a828b6d cae5820f
Inline Side-by-side
Showing 3 changed files with 84 additions and 43 deletions
...@@ -80,9 +80,9 @@ export function getLpbTj (data) { ...@@ -80,9 +80,9 @@ export function getLpbTj (data) {
80 } 80 }
81 81
82 /** 82 /**
83 * 楼盘表 批量实预测转换 83 * 楼盘表 批量不动产单元号生成
84 * zrzbsm 自然幢标识码 , 84 * zrzbsm 自然幢标识码 ,
85 * scyclx 实测预测类型 0预测，1实测 85 * dpdm 自然幢号 ,
86 */ 86 */
87 export function batchGeneratorBdcdyh (dpdm,zrzbsm) { 87 export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
88 return request({ 88 return request({
......
...@@ -8,51 +8,65 @@ ...@@ -8,51 +8,65 @@
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div class="content"> 10 <div class="content">
11 <el-form :label-position="right"> 11 <table>
12 <el-form-item label="宗地:"> 12 <tr>
13 <el-input 13 <td class="label">宗地:</td>
14 placeholder="请选择宗地" v-model="zdxx" :disabled="true" 14 <td class="input">
15 /> 15 <el-input
16 <div @click="xzzdVisible = true">选择宗地</div> 16 placeholder="请选择宗地" v-model="zdxx" :disabled="true"
17 <!-- <el-button type="primary" @click="xzzdVisible = true">选择宗地</el-button>--> 17 ></el-input>
18 </el-form-item> 18 </td>
19 <el-form-item label="自然幢:"> 19 <td>
20 <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange"> 20 <el-button type="primary" @click="xzzdVisible = true">选择宗地</el-button>
21 <el-option 21 </td>
22 v-for="item in zrzList" 22 </tr>
23 :key="item.xmmc" 23 <tr>
24 :label="item.label" 24 <td class="label">自然幢:</td>
25 :value="item.bsm"> 25 <td class="input">
26 </el-option> 26 <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange">
27 </el-select> 27 <el-option
28 </el-form-item> 28 v-for="item in zrzList"
29 <el-form-item label="逻辑幢:"> 29 :key="item.xmmc"
30 <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange"> 30 :label="item.label"
31 <el-option 31 :value="item.bsm">
32 v-for="item in ljzList" 32 </el-option>
33 :key="item.bsm" 33 </el-select>
34 :label="item.ljzmc" 34 </td>
35 :value="item.bsm"> 35 </tr>
36 </el-option> 36 <tr>
37 </el-select> 37 <td class="label">逻辑幢:</td>
38 </el-form-item> 38 <td class="input">
39 <el-form-item label="幢单元:"> 39 <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange">
40 <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择"> 40 <el-option
41 <el-option 41 v-for="item in ljzList"
42 v-for="item in zdyList" 42 :key="item.bsm"
43 :key="item.bsm" 43 :label="item.ljzmc"
44 :label="item.zdymc" 44 :value="item.bsm">
45 :value="item.bsm"> 45 </el-option>
46 </el-option> 46 </el-select>
47 </el-select> 47 </td>
48 </el-form-item> 48 </tr>
49 </el-form> 49 <tr>
50 <td class="lable">幢单元:</td>
51 <td class="input">
52 <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
53 <el-option
54 v-for="item in zdyList"
55 :key="item.bsm"
56 :label="item.zdymc"
57 :value="item.bsm">
58 </el-option>
59 </el-select>
60 </td>
61 </tr>
62 </table>
50 </div> 63 </div>
51 <div class="footer"> 64 <div class="footer">
52 <el-button type="primary" @click="save">保存</el-button> 65 <el-button type="primary" @click="save">保存</el-button>
53 <el-button type="primary" @click="cancel">取消</el-button> 66 <el-button type="primary" @click="cancel">取消</el-button>
54 </div> 67 </div>
55 <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"></query-data> 68 <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
69 isZdClose="true"></query-data>
56 </el-dialog> 70 </el-dialog>
57 </div> 71 </div>
58 </template> 72 </template>
...@@ -125,7 +139,11 @@ ...@@ -125,7 +139,11 @@
125 }, 139 },
126 getZrz: function (bsm) { 140 getZrz: function (bsm) {
127 zdXlcd(bsm).then(res => { 141 zdXlcd(bsm).then(res => {
128 this.zrzList = res.result; 142 if (res.success){
143 this.zrzList = res.result;
144 } else {
145 Message.error(res.message)
146 }
129 }) 147 })
130 }, 148 },
131 getZdxx: function (val) { 149 getZdxx: function (val) {
...@@ -195,6 +213,22 @@ ...@@ -195,6 +213,22 @@
195 text-align: center; 213 text-align: center;
196 } 214 }
197 215
216 table {
217 border-collapse: separate;
218 border-spacing: 10px;
219 display: inline-block;
220 text-align: center;
221 .label {
222 width: 80px;
223 }
224 .input {
225 width: 300px;
226 .el-select {
227 width: 300px;
228 }
229 }
230 }
231
198 .footer { 232 .footer {
199 margin-top: 20px; 233 margin-top: 20px;
200 text-align: center; 234 text-align: center;
......
...@@ -130,6 +130,10 @@ ...@@ -130,6 +130,10 @@
130 default: function () { 130 default: function () {
131 return ['zd'] 131 return ['zd']
132 } 132 }
133 },
134 isZdClose:{
135 type:Boolean,
136 default:false
133 } 137 }
134 }, 138 },
135 mounted() { 139 mounted() {
...@@ -168,6 +172,9 @@ ...@@ -168,6 +172,9 @@
168 }, 172 },
169 addData: function (val) { 173 addData: function (val) {
170 this.$emit("getData", val) 174 this.$emit("getData", val)
175 if (this.isZdClose) {
176 this.close();
177 }
171 }, 178 },
172 close: function () { 179 close: function () {
173 this.$emit('close') 180 this.$emit('close')
......