08543a78 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 90fd387b 8c030a19
1 .content_box { 1 .content_box {
2 padding: 18px; 2 padding: 18px;
3 padding-top: 0;
3 box-sizing: border-box; 4 box-sizing: border-box;
4 } 5 }
5 .el-table .success-row { 6 .el-table .success-row {
...@@ -8,6 +9,10 @@ ...@@ -8,6 +9,10 @@
8 .main{ 9 .main{
9 width: 100%; 10 width: 100%;
10 height: 100%; 11 height: 100%;
12 padding: 18px 18px 0!important;
13 }
14 .pagination {
15 padding: 18px;
11 } 16 }
12 .db{ 17 .db{
13 display: block; 18 display: block;
......
1 <template>
2 <div class="">重新落宗</div>
3 </template>
4
5 <script>
6 export default {
7 name:"",
8 components:{},
9 props:{},
10 data(){
11 return {
12 }
13 },
14 created(){},
15 mounted(){},
16 methods:{},
17 computed: {},
18 watch: {},
19 }
20 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div class="">分割</div>
3 </template>
4
5 <script>
6 export default {
7 name:"",
8 components:{},
9 props:{},
10 data(){
11 return {
12 }
13 },
14 created(){},
15 mounted(){},
16 methods:{},
17 computed: {},
18 watch: {},
19 }
20 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div class="main">
3 <SearchHead @getSearchCondition="geQuerytData"></SearchHead>
4 <div class="dataGrid" ref="dataGrid">
5 <el-table
6 :data="tableData"
7 :height="tableHeight"
8 :row-class-name="tableRowClassName"
9 >
10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button
17 >
18 <el-button type="text" size="small">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
24 </el-table-column>
25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
26 </el-table-column>
27 <el-table-column prop="dylx" align="left" width="120" label="类型">
28 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}}
30 </template>
31 </el-table-column>
32 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
33 </el-table-column>
34 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
35 <el-table-column prop="addtime" align="left" width="120" label="转入时间">
36 <template slot-scope="scope">
37 {{scope.row.addtime | timeFilter}}
38 </template>
39 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人">
41 </el-table-column>
42 </el-table>
43 <div class="pagination">
44 <el-pagination background layout="prev, pager, next" :total="total"
45 :current-page="pageNo" @current-change="handleCurrentChange">
46 </el-pagination>
47 </div>
48 </div>
49 </div>
50 </template>
51
52 <script>
53 import SearchHead from "../../../../components/searchHead/searchHead";
54 import {getSearchList} from "../../../../api/search";
55
56 export default {
57 name: "",
58 components: {SearchHead},
59 props: {},
60 data() {
61 return {
62 total: 0,
63 pageNo: 1,
64 pageSize: 10,
65 tableData: [],
66 tableHeight: "",
67 queryData: {}
68 };
69 },
70 created() {
71 },
72 mounted() {
73 this.getData({})
74 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
75 },
76 methods: {
77 onSubmit() {
78 },
79 tableRowClassName({row, rowIndex}) {
80 if (rowIndex % 2 !== 0) {
81 return "even-row";
82 } else {
83 return "";
84 }
85 },
86 handleCurrentChange(val) {
87 console.log(`当前页: ${val}`);
88 this.pageNo = val;
89 this.queryData.pageNo = val;
90 this.getData(this.queryData);
91 },
92 getData(data) {
93 getSearchList(data).then(res => {
94 this.tableData = res.result.records
95 this.total = res.result.total
96 })
97 },
98 //获取子组件点击查询触发的事件
99 geQuerytData(obj) {
100 this.queryData = obj
101 //将obj作为参数调用接口查询表格数据
102 this.queryData['pageSize'] = this.pageSize
103 this.pageNo = 1
104 this.queryData['pageNo'] = 1
105 this.getData(this.queryData)
106 },
107 //点击办理
108 handleClick(row) {
109 let path = "";
110 switch (row.dylx) {
111 case "zrz":
112 path = "/zrz";
113 break;
114 case "zd":
115 this.$store.state.zdbsm = row.glbsm;
116 path = "/zd";
117 break;
118 default:
119 break;
120 }
121 this.$router.push({
122 path: path,
123 query: {
124 bsm: row.glbsm,
125 source: 2
126 }
127 });
128 },
129 },
130 computed: {},
131 watch: {},
132 };
133 </script>
134 <style scoped lang="less">
135 .main {
136 width: 100%;
137 height: 100%;
138 box-sizing: border-box;
139 padding: 0 18px!important;
140 display: flex;
141 flex-direction: column;
142 background-color: #fcfdff;
143 .demo-form-inline {
144 margin-top: 18px;
145 .moreSearchBtn {
146 background-color: #1ad6e1;
147 border-color: #1ad6e1;
148 }
149 .moreSearchBtn:focus,
150 .moreSearchBtn:hover {
151 background-color: rgba(28, 200, 229, 0.6);
152 }
153 }
154 .dataGrid {
155 flex: 1;
156 .pagination {
157 padding: 18px 0;
158 }
159 }
160 }
161 </style>
1 <template>
2 <div class="">合并</div>
3 </template>
4
5 <script>
6 export default {
7 name:"",
8 components:{},
9 props:{},
10 data(){
11 return {
12 }
13 },
14 created(){},
15 mounted(){},
16 methods:{},
17 computed: {},
18 watch: {},
19 }
20 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <template> 1 <template>
2 <div class=""></div> 2 <div class="content_box">
3 <el-tabs v-model="activeName" @tab-click="handleClick">
4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
8 </el-tabs>
9 </div>
3 </template> 10 </template>
4 11
5 <script> 12 <script>
13 import fg from "./fg";
14 import hb from "./hb";
15 import fwsxbg from "./fwsxbg";
16 import cxlz from "./cxlz";
6 export default { 17 export default {
7 name:"", 18 name: "",
8 components:{}, 19 components: {
9 props:{}, 20 fg,hb,fwsxbg,cxlz
10 data(){ 21 },
11 return { 22 props: {},
12 } 23 data() {
13 }, 24 return {
14 created(){}, 25 activeName: "fg",
15 mounted(){}, 26 };
16 methods:{}, 27 },
17 computed: {}, 28 methods: {
18 watch: {}, 29 handleClick(tab, event) {
19 } 30 console.log(tab, event);
31 },
32 },
33 created() {},
34 mounted() {},
35 computed: {},
36 watch: {},
37 };
20 </script> 38 </script>
21 <style scoped lang="less">
22 </style>
...\ No newline at end of file ...\ No newline at end of file
39 <style scoped lang="less"></style>
......
...@@ -95,26 +95,19 @@ ...@@ -95,26 +95,19 @@
95 </el-tab-pane> 95 </el-tab-pane>
96 <el-tab-pane class="eltabspane" label="宗海" name="zh">宗海</el-tab-pane> 96 <el-tab-pane class="eltabspane" label="宗海" name="zh">宗海</el-tab-pane>
97 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 97 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
98 <el-form :inline="true" class="zrzProject"> 98 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
99 <el-form-item label="项目名称"> 99 <el-form-item label="项目名称" prop="xmmc">
100 <el-input 100 <el-input
101 v-model="zrzProjectName" 101 v-model="ruleForm1.xmmc"
102 placeholder="项目名称" 102 placeholder="项目名称"
103 style="width:400px;" 103 style="width:400px;"
104 ></el-input> 104 ></el-input>
105 </el-form-item> 105 </el-form-item>
106 106 <el-form-item class="handleBtn">
107 <div> 107 <el-button type="primary">导入图形</el-button>
108 <el-form-item style="margin-left:300px;"> 108 <el-button type="primary" @click="newZrz">创建</el-button>
109 <el-button type="primary">导入图形</el-button> 109 <el-button type="primary" @click="close">取消</el-button>
110 </el-form-item> 110 </el-form-item>
111 <el-form-item>
112 <el-button type="primary" @click="newZrz">创建</el-button>
113 </el-form-item>
114 <el-form-item>
115 <el-button type="primary" @click="close">取消</el-button>
116 </el-form-item>
117 </div>
118 </el-form> 111 </el-form>
119 </el-tab-pane> 112 </el-tab-pane>
120 <el-tab-pane class="eltabspane" label="多幢" name="dz">多幢</el-tab-pane> 113 <el-tab-pane class="eltabspane" label="多幢" name="dz">多幢</el-tab-pane>
...@@ -154,6 +147,11 @@ export default { ...@@ -154,6 +147,11 @@ export default {
154 "xzqbsm": "", 147 "xzqbsm": "",
155 "zdtzmbsm": "" 148 "zdtzmbsm": ""
156 }, 149 },
150 ruleForm1:{
151 zdbsm:'',
152 xmmc:'',
153 userbsm:''
154 },
157 rules: { 155 rules: {
158 xzqbsm: [ 156 xzqbsm: [
159 { required: true, message: '请选择行政区', trigger: 'change' } 157 { required: true, message: '请选择行政区', trigger: 'change' }
...@@ -174,6 +172,11 @@ export default { ...@@ -174,6 +172,11 @@ export default {
174 { required: true, message: '请选择宗地特征码', trigger: 'change' } 172 { required: true, message: '请选择宗地特征码', trigger: 'change' }
175 ] 173 ]
176 }, 174 },
175 rules1: {
176 xmmc: [
177 { required: true, message: '请输入项目名称', trigger: 'blur' },
178 ],
179 },
177 syqlx: [ 180 syqlx: [
178 { 181 {
179 label: "国家所有", 182 label: "国家所有",
...@@ -227,35 +230,37 @@ export default { ...@@ -227,35 +230,37 @@ export default {
227 }, 230 },
228 newZrz() { 231 newZrz() {
229 //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 232 //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
230 var data = { 233 this.$refs['ruleForm1'].validate((valid) => {
231 userbsm: "", 234 if (valid) {
232 xmmc: this.zrzProjectName, 235 insertZrzjbxx(this.ruleForm1)
233 zdbsm: "", 236 .then((res) => {
234 }; 237 if (res.code == "200") {
235 console.log(data); 238 this.$message({
236 insertZrzjbxx(data) 239 message: "创建成功!",
237 .then((res) => { 240 type: "success",
238 if (res.code == "200") { 241 });
239 this.$message({ 242 //todo 跳转到自然幢基本信息内容表页面 (预留)
240 message: "创建成功!", 243 this.close();
241 type: "success", 244 this.$store.state.zdbsm=res.result.zdbsm;
242 }); 245 this.$store.state.zrzbsm=res.result.bsm;
243 //todo 跳转到自然幢基本信息内容表页面 (预留) 246 this.$store.state.xmmc=res.result.xmmc;
244 this.close(); 247 this.$router.push({
245 this.$store.state.zdbsm=res.result.zdbsm; 248 path: '/zrz', query:{
246 this.$store.state.zrzbsm=res.result.bsm; 249 source: 1,
247 this.$store.state.xmmc=res.result.xmmc; 250 bsm:res.result.bsm
248 this.$router.push({ 251 }
249 path: '/zrz', query:{ 252 });
250 source: 1, 253 } else {
251 bsm:res.result.bsm 254 this.$message.error("创建失败!");
252 } 255 }
253 }); 256 })
254 } else { 257 .catch((error) => {});
255 this.$message.error("创建失败!"); 258 } else {
256 } 259 console.log('error submit!!');
257 }) 260 return false;
258 .catch((error) => {}); 261 }
262 });
263
259 }, 264 },
260 getXzqList() { 265 getXzqList() {
261 getAllList() 266 getAllList()
...@@ -319,6 +324,9 @@ export default { ...@@ -319,6 +324,9 @@ export default {
319 height: 100%; 324 height: 100%;
320 width: 100%; 325 width: 100%;
321 padding: 20px; 326 padding: 20px;
327 .el-form--inline .el-form-item__label{
328 width: 100px;
329 }
322 .el-form-item{ 330 .el-form-item{
323 margin-bottom: 20px; 331 margin-bottom: 20px;
324 } 332 }
...@@ -340,7 +348,4 @@ export default { ...@@ -340,7 +348,4 @@ export default {
340 .zrzProject { 348 .zrzProject {
341 margin-top: 80px; 349 margin-top: 80px;
342 } 350 }
343 .el-form--inline .el-form-item__label{
344 width: 100px;
345 }
346 </style> 351 </style>
......
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
136 <td colspan="4"> 136 <td colspan="4">
137 <input type="text" class="formInput" v-model="formData.zl" /> 137 <input type="text" class="formInput" v-model="formData.zl" />
138 </td> 138 </td>
139 <td colspan="2">土地权属来源证明材料</td> 139 <td colspan="2">项目名称</td>
140 <td colspan="4" class="psr"> 140 <td colspan="4" class="psr">
141 <input 141 <input
142 type="text" 142 type="text"
143 class="formInput " 143 class="formInput "
144 v-model="formData.tdqslyzmcl" 144 v-model="formData.xmmc"
145 /> 145 />
146 </td> 146 </td>
147 </tr> 147 </tr>
......