977c587e by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents e24c0be4 d9d9744f
1 import request from '@/plugin/axios' 1 import request from '@/plugin/axios'
2 /** 2 /**
3 * 查询所有行政区 3 * 综合查询
4 */ 4 */
5 export function getSearchList(data) { 5 export function getSearchList(data) {
6 return request({ 6 return request({
...@@ -8,4 +8,4 @@ export function getSearchList(data) { ...@@ -8,4 +8,4 @@ export function getSearchList(data) {
8 method: 'post', 8 method: 'post',
9 data : data, 9 data : data,
10 }) 10 })
11 }
...\ No newline at end of file ...\ No newline at end of file
11 }
......
1 <template> 1 <template>
2 <div class="">分割</div> 2 <div class="main">
3 <div class="button">
4 <el-button type="primary" @click="newAdd">新增</el-button>
5 </div>
6 <div class="table">
7 <table border="1">
8 <tr>
9 <td>序号</td>
10 <td>宗地代码</td>
11 <td>不动产单元号</td>
12 <td>项目名称</td>
13 <td>不动产权证号</td>
14 <td>权利人</td>
15 <td>坐落</td>
16 </tr>
17 <tr v-if="bgqData.length==0">
18 <td colspan="7">
19 <span class="noData">暂无数据</span>
20 </td>
21 </tr>
22 <tr v-else v-for="(item,index) in bgqData" :key="index">
23 <td>{{index+1}}</td>
24 <td><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
25 <td><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
26 <td><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
27 <td><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
28 <td><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
29 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
30 </tr>
31 </table>
32 </div>
33 <div>
34 <el-dialog
35 title="新增"
36 :visible.sync="centerDialogVisible"
37 width="50%"
38 center>
39 <div class="search">
40 <el-button type="primary" @click="search">查询</el-button>
41 <el-button type="primary" @click="result">重置</el-button>
42 <el-row :gutter="10" class="shop">
43 <el-col :span="4" class="inputtitle">
44 宗地编码:
45 </el-col>
46 <el-col :span="8" class="">
47 <el-input v-model="queryData.zddm"></el-input>
48 </el-col>
49 <el-col :span="4" class="inputtitle">
50 不动产权证号:
51 </el-col>
52 <el-col :span="8" class="">
53 <el-input v-model="queryData.bdcqzh"></el-input>
54 </el-col>
55 </el-row>
56 <el-row :gutter="10">
57 <el-col :span="4" class="inputtitle">
58 不动产权单元号:
59 </el-col>
60 <el-col :span="8">
61 <el-input v-model="queryData.bdcdyh"></el-input>
62 </el-col>
63 <el-col :span="4" class="inputtitle">
64 权利人:
65 </el-col>
66 <el-col :span="8">
67 <el-input v-model="queryData.qlrmc"></el-input>
68 </el-col>
69 </el-row>
70 <el-row :gutter="10">
71 <el-col :span="4" class="inputtitle">
72 坐落:
73 </el-col>
74 <el-col :span="8">
75 <el-input v-model="queryData.zl"></el-input>
76 </el-col>
77 </el-row>
78 <table border="1">
79 <tr>
80 <td>序号</td>
81 <td>操作</td>
82 <td>宗地代码</td>
83 <td>不动产单元号</td>
84 <td>项目名称</td>
85 <td>不动产权证号</td>
86 <td>权利人</td>
87 <td>坐落</td>
88 </tr>
89 <tr v-if="Data.length==0">
90 <td colspan="8">
91 <span class="noData">暂无数据</span>
92 </td>
93 </tr>
94 <tr v-else v-for="(item,index) in Data" :key="index">
95 <td>{{index+1}}</td>
96 <td @click="addData(item)" class="xz">
97 <span>选择</span>
98 </td>
99 <td>{{item.zddm}}</td>
100 <td>{{item.bdcdyh}}</td>
101 <td>{{item.xmmc}}</td>
102 <td>{{item.bdcqzh}}</td>
103 <td>{{item.qlr}}</td>
104 <td>{{item.zl}}</td>
105 </tr>
106
107 </table>
108 </div>
109 <span slot="footer" class="dialog-footer">
110 </span>
111 </el-dialog>
112 </div>
113 </div>
3 </template> 114 </template>
4 115
5 <script> 116 <script>
6 export default { 117 import {getSearchList} from './../../../../api/search'
7 name:"", 118
8 components:{}, 119 export default {
9 props:{}, 120 name: "",
10 data(){ 121 components: {},
11 return { 122 props: {},
123 data() {
124 return {
125 centerDialogVisible: false,
126 Data: [],
127 queryData: {
128 bdcdyh: "",
129 bdcqzh: "",
130 dylxs: ['zd'],
131 qlrmc: "",
132 qszt: "2",
133 xmmc: "",
134 zddm: "",
135 zl: ""
136 },
137 bgqData: []
138 }
139 },
140 created() {
141 },
142 mounted() {
143 },
144 methods: {
145 newAdd: function () {
146 this.centerDialogVisible = true;
147 this.getData(
148 {dylxs: ['zd']}
149 )
150 },
151 addData: function (val) {
152 this.centerDialogVisible = false;
153 this.bgqData.push(val)
154 },
155 getData: function (data) {
156 getSearchList(data).then(res => {
157 this.Data = res.result.records
158 })
159 },
160 search: function () {
161 this.getData(this.queryData)
162 },
163 result: function () {
164 this.queryData = {
165 bdcdyh: "",
166 bdcqzh: "",
167 dylxs: ['zd'],
168 qlrmc: "",
169 qszt: "2",
170 xmmc: "",
171 zddm: "",
172 zl: ""
173 }
174 }
175 },
176 computed: {},
177 watch: {},
12 } 178 }
13 },
14 created(){},
15 mounted(){},
16 methods:{},
17 computed: {},
18 watch: {},
19 }
20 </script> 179 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
180 <style scoped lang="less">
181 .main {
182 box-sizing: border-box;
183 padding: 18px;
184 height: auto;
185 width: 80%;
186 table {
187 margin-top: 10px;
188 background-color: #fff;
189 font-size: 14px;
190 width: 100%;
191
192 .formInput {
193 margin: 0;
194 height: 36px;
195 outline: none;
196 border: none;
197 color: #606764;
198 overflow: visible;
199 text-align: center;
200 cursor: text;
201 }
202
203 }
204
205 td {
206 text-align: center;
207 height: 36px;
208 min-width: 50px;
209 }
210
211 table:hover {
212 cursor: pointer;
213 }
214
215 .inputtitle {
216 line-height: 40px;
217 }
218 .shop {
219 margin-top: 20px;
220 }
221 .xz {
222 color: blue;
223 }
224 .noData{
225 color: #b2b2b2;
226 }
227 }
228 </style>
......
1 <template> 1 <template>
2 <div class="">合并</div> 2 <div class="main">
3 <div class="header">
4 <span>合并后项目名称:</span>
5 <el-input></el-input>
6
7 <el-button type="primary" @click="newAdd">新增</el-button>
8
9 <el-button type="primary">保存</el-button>
10 </div>
11
12 <table border="1">
13 <tr>
14 <td>序号</td>
15 <td>宗地代码</td>
16 <td>不动产单元号</td>
17 <td>项目名称</td>
18 <td>不动产权证号</td>
19 <td>权利人</td>
20 <td>坐落</td>
21 </tr>
22 <tr v-if="bgqData.length==0">
23 <td colspan="7">
24 <span class="noData">暂无数据</span>
25 </td>
26 </tr>
27 <tr v-else v-for="(item,index) in bgqData" :key="index">
28 <td>{{index+1}}</td>
29 <td><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
30 <td><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
31 <td><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
32 <td><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
33 <td><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
34 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
35 </tr>
36 </table>
37 <div>
38 <el-dialog
39 title="新增"
40 :visible.sync="centerDialogVisible"
41 width="50%"
42 center>
43 <div class="search">
44 <el-button type="primary" @click="search">查询</el-button>
45 <el-button type="primary" @click="result">重置</el-button>
46 <el-row :gutter="10" class="shop">
47 <el-col :span="4" class="inputtitle">
48 宗地编码:
49 </el-col>
50 <el-col :span="8" class="">
51 <el-input v-model="queryData.zddm"></el-input>
52 </el-col>
53 <el-col :span="4" class="inputtitle">
54 不动产权证号:
55 </el-col>
56 <el-col :span="8" class="">
57 <el-input v-model="queryData.bdcqzh"></el-input>
58 </el-col>
59 </el-row>
60 <el-row :gutter="10">
61 <el-col :span="4" class="inputtitle">
62 不动产权单元号:
63 </el-col>
64 <el-col :span="8">
65 <el-input v-model="queryData.bdcdyh"></el-input>
66 </el-col>
67 <el-col :span="4" class="inputtitle">
68 权利人:
69 </el-col>
70 <el-col :span="8">
71 <el-input v-model="queryData.qlrmc"></el-input>
72 </el-col>
73 </el-row>
74 <el-row :gutter="10">
75 <el-col :span="4" class="inputtitle">
76 坐落:
77 </el-col>
78 <el-col :span="8">
79 <el-input v-model="queryData.zl"></el-input>
80 </el-col>
81 </el-row>
82 <table border="1">
83 <tr>
84 <td>序号</td>
85 <td>操作</td>
86 <td>宗地代码</td>
87 <td>不动产单元号</td>
88 <td>项目名称</td>
89 <td>不动产权证号</td>
90 <td>权利人</td>
91 <td>坐落</td>
92 </tr>
93 <tr v-if="Data.length==0">
94 <td colspan="8">
95 <span class="noData">暂无数据</span>
96 </td>
97 </tr>
98 <tr v-else v-for="(item,index) in Data" :key="index">
99 <td>{{index+1}}</td>
100 <td @click="addData(item)" class="xz">
101 <span>选择</span>
102 </td>
103 <td>{{item.zddm}}</td>
104 <td>{{item.bdcdyh}}</td>
105 <td>{{item.xmmc}}</td>
106 <td>{{item.bdcqzh}}</td>
107 <td>{{item.qlr}}</td>
108 <td>{{item.zl}}</td>
109 </tr>
110
111 </table>
112 </div>
113 <span slot="footer" class="dialog-footer">
114 </span>
115 </el-dialog>
116
117 </div>
118 </div>
3 </template> 119 </template>
4 120
5 <script> 121 <script>
6 export default { 122 import {getSearchList} from './../../../../api/search'
7 name:"", 123
8 components:{}, 124 export default {
9 props:{}, 125 name: "",
10 data(){ 126 components: {},
11 return { 127 props: {},
128 data() {
129 return {
130 centerDialogVisible: false,
131 Data: [],
132 queryData: {
133 bdcdyh: "",
134 bdcqzh: "",
135 dylxs: ['zd'],
136 qlrmc: "",
137 qszt: "2",
138 xmmc: "",
139 zddm: "",
140 zl: ""
141 },
142 bgqData: []
143 }
144 },
145 created() {
146 },
147 mounted() {
148 },
149 methods: {
150 newAdd: function () {
151 this.centerDialogVisible = true;
152 this.getData(
153 {dylxs: ['zd']}
154 )
155 },
156 addData: function (val) {
157 this.centerDialogVisible = false;
158 this.bgqData.push(val)
159 },
160 search: function () {
161 this.getData(this.queryData)
162 },
163 getData: function (data) {
164 getSearchList(data).then(res => {
165 this.Data = res.result.records
166 })
167 },
168 result: function () {
169 this.queryData = {
170 bdcdyh: "",
171 bdcqzh: "",
172 dylxs: ['zd'],
173 qlrmc: "",
174 qszt: "2",
175 xmmc: "",
176 zddm: "",
177 zl: ""
178 }
179 }
180 },
181 computed: {},
182 watch: {},
12 } 183 }
13 },
14 created(){},
15 mounted(){},
16 methods:{},
17 computed: {},
18 watch: {},
19 }
20 </script> 184 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
185 <style scoped lang="less">
186 .main {
187 box-sizing: border-box;
188 padding: 18px;
189 height: auto;
190 width: 80%;
191 .header {
192 display: flex;
193 justify-items: left;
194 span {
195 width: 130px;
196 line-height: 40px;
197 }
198 .el-input{
199 width: 200px;
200 margin-right: 20px;
201 }
202 }
203
204 table {
205 margin-top: 10px;
206 background-color: #fff;
207 font-size: 14px;
208 width: 100%;
209
210 .formInput {
211 margin: 0;
212 height: 36px;
213 outline: none;
214 border: none;
215 color: #606764;
216 overflow: visible;
217 text-align: center;
218 cursor: text;
219 }
220 }
221
222 td {
223 text-align: center;
224 height: 36px;
225 min-width: 50px;
226 }
227
228 table:hover {
229 cursor: pointer;
230 }
231
232 .inputtitle {
233 line-height: 40px;
234 }
235 .shop {
236 margin-top: 20px;
237 }
238 .xz {
239 color: blue;
240 }
241 .noData {
242 color: #b2b2b2;
243 }
244 }
245 </style>
......
...@@ -182,7 +182,6 @@ ...@@ -182,7 +182,6 @@
182 }, 182 },
183 save() { 183 save() {
184 jzdsingleModify(this.jzdlist).then(res => { 184 jzdsingleModify(this.jzdlist).then(res => {
185 console.log(res)
186 if (res.success) { 185 if (res.success) {
187 Message.success("保存成功") 186 Message.success("保存成功")
188 this.getData(this.bsm) 187 this.getData(this.bsm)
......
...@@ -247,9 +247,7 @@ ...@@ -247,9 +247,7 @@
247 }) 247 })
248 }, 248 },
249 save() { 249 save() {
250 console.log("保存....");
251 jzxsingleModify(this.jzxlist).then(res => { 250 jzxsingleModify(this.jzxlist).then(res => {
252 console.log(res)
253 if (res.success) { 251 if (res.success) {
254 Message.success("保存成功") 252 Message.success("保存成功")
255 this.getData(this.bsm) 253 this.getData(this.bsm)
......
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
89 }) 89 })
90 }, 90 },
91 save() { 91 save() {
92 console.log(this.mjftData);
93 for (let val of this.mjftData.list) { 92 for (let val of this.mjftData.list) {
94 if (val.dzwdm == '') { 93 if (val.dzwdm == '') {
95 Message.error("定着物代码不能为空") 94 Message.error("定着物代码不能为空")
...@@ -98,7 +97,6 @@ ...@@ -98,7 +97,6 @@
98 } 97 }
99 this.mjftData['zdbsm'] = this.$store.state.zdbsm 98 this.mjftData['zdbsm'] = this.$store.state.zdbsm
100 savemjft(this.mjftData).then(res => { 99 savemjft(this.mjftData).then(res => {
101 console.log(res)
102 if (res.success) { 100 if (res.success) {
103 Message.success("保存成功") 101 Message.success("保存成功")
104 this.getData(this.mjftData.zdbsm) 102 this.getData(this.mjftData.zdbsm)
...@@ -180,8 +178,12 @@ ...@@ -180,8 +178,12 @@
180 }, 178 },
181 mounted() { 179 mounted() {
182 console.log("mounted init...") 180 console.log("mounted init...")
181 this.mjftData.zdbsm=this.$store.state.zdbsm
182 this.zdmj=this.$store.state.zdmj
183 this.tdzl=this.$store.state.zdzl
184 this.zddm=this.$store.state.zddm
183 if (this.mjftData.zdbsm) { 185 if (this.mjftData.zdbsm) {
184 this.getData() 186 this.getData(this.mjftData.zdbsm)
185 } 187 }
186 }, 188 },
187 watch: { 189 watch: {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td> 28 <td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td>
29 <td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td> 29 <td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td>
30 <td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td> 30 <td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td>
31 <td><input type="text" class="formInput" v-model="item.fj" @keydown="oninput"/></td> 31 <td><input type="text" class="formInput" v-model="item.fj"/></td>
32 </tr> 32 </tr>
33 <!-- <tr> 33 <!-- <tr>
34 <td>统计</td> 34 <td>统计</td>
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
88 console.log(res) 88 console.log(res)
89 if (res.success) { 89 if (res.success) {
90 Message.success("新增成功") 90 Message.success("新增成功")
91 this.getData(this.$store.state.zrzbsm)
91 } else { 92 } else {
92 Message.error(res.message) 93 Message.error(res.message)
93 } 94 }
......