a3ab8480 by 杨威

Merge remote-tracking branch 'origin/master' into master

2 parents a17c7dd3 9dba7c9f
1 <template>
2 <div >
3 <table border="1">
4 <thead>
5 <tr rowspan="2">
6 <th colspan="4">
7 <h2> 集体土地所有权宗地分类面积调查表</h2><br/>
8 <div class="dw">
9 单位:
10 <el-radio-group v-model="flmjData.dw">
11 <el-radio :label="3">平方米</el-radio>
12 <el-radio :label="6">公顷</el-radio>
13 <el-radio :label="9"></el-radio>
14 </el-radio-group>
15 </div>
16 </th>
17 </tr>
18 </thead>
19 <tbody>
20 <tr>
21 <th>权利人</th>
22 <td colspan="3">
23 <el-input v-model="flmjData.qlr" disabled></el-input>
24 </td>
25 </tr>
26 <tr>
27 <th>宗地代码</th>
28 <td colspan="3">
29 <el-input v-model="flmjData.zddm" disabled></el-input>
30 </td>
31 </tr>
32 <tr>
33 <th>不动产单元号</th>
34 <td colspan="3">
35 <el-input v-model="flmjData.bdcdyh" disabled></el-input>
36 </td>
37 </tr>
38 <tr >
39 <th rowspan="7">
40 分类面积
41 </th>
42 <th colspan="2">农用地</th>
43 <td>
44 <el-input v-model="flmjData.lyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
45 </td>
46 </tr>
47 <tr>
48 <th rowspan="4">
49 其他
50 </th>
51 <th>
52 耕地
53 </th>
54 <th colspan="2">
55 <el-input v-model="flmjData.gd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
56 </th>
57 </tr>
58 <tr>
59 <th>林地</th>
60 <td colspan="2">
61 <el-input v-model="flmjData.ld" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
62 </td>
63 </tr>
64 <tr>
65 <th>
66 草地
67 </th>
68 <td colspan="2">
69 <el-input v-model="flmjData.cd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
70 </td>
71 </tr>
72 <tr>
73 <th>其他</th>
74 <td colspan="2">
75 <el-input v-model="flmjData.qt" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
76 </td>
77 </tr>
78 <tr>
79 <th>建设用地</th>
80 <td colspan="3">
81 <el-input v-model="flmjData.jsyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
82 </td>
83 </tr>
84 <tr>
85 <th>
86 未利用地
87 </th>
88 <td colspan="3">
89 <el-input v-model="flmjData.wlyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
90 </td>
91 </tr>
92 <tr>
93 <th rowspan="2">调查记事</th>
94 <td colspan="3">
95 <el-input type="textarea"
96 :autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.dcjs"></el-input>
97 </td>
98 </tr>
99 <tr>
100 <td colspan="3">
101
102 <el-form :inline="true" :model="flmjData" class="demo-form-inline">
103 <el-form-item label="调查员:">
104 <el-input v-model="flmjData.dcy" ></el-input>
105 </el-form-item>
106 <el-form-item label="日期:">
107 <el-input
108 placeholder="请选择日期"
109 title="调查日期"
110 type="date"
111 v-model="flmjData.dcrq">
112 </el-input>
113 </el-form-item>
114 </el-form>
115 </td>
116 </tr>
117 <tr>
118 <th rowspan="2">审核意见</th>
119 <td colspan="3">
120 <el-input type="textarea"
121 :autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.shyj"></el-input>
122 </td>
123 </tr>
124 <tr>
125 <td colspan="3">
126 <el-form :inline="true" :model="flmjData" class="demo-form-inline">
127 <el-form-item label="审核员:">
128 <el-input v-model="flmjData.shy" ></el-input>
129 </el-form-item>
130 <el-form-item label="日期:">
131 <el-input
132 placeholder="请选择日期"
133 title="调查日期"
134 type="date"
135 v-model="flmjData.shrq">
136 </el-input>
137 </el-form-item>
138 </el-form>
139 </td>
140 </tr>
141 <tr>
142 <td colspan="4" style="text-align: center">
143 <el-button>保存</el-button>
144 </td>
145 </tr>
146 </tbody>
147 </table>
148 </div>
149 </template>
150
151 <script>
152 export default {
153 name: "Fldcb",
154 data(){
155 return{
156 flmjData:{
157 dw:'', // 单位
158 qlr:'', // 权利人
159 zddm:'', // 宗地代码
160 bdcdyh:'', // 不动产单元号
161 lyd:'', // 农用地
162 gd:'', // 耕地
163 ld:'', // 林地
164 cd:'', // 草地
165 qt:'', //其他
166 jsyd:'', // 建设用地
167 wlyd:'', // 未利用地
168 dcjs:"", // 调查记事
169 dcy:'', // 调查员
170 dcrq:'', // 调查日期
171 shyj:'', // 审核意见
172 shy:'', // 审核员
173 shrq:'' // 审核日期
174 }
175 }
176 }
177 }
178 </script>
179
180 <style scoped lang="less">
181 table{
182 margin-top: 20px;
183 background-color: #fff;
184 font-size: 14px;
185 width: 100%;
186 cursor: pointer;
187 th{
188 height: 36px;
189 }
190 }
191 .dw{
192 float: right;
193 }
194 .demo-form-inline{
195 float: right;
196 }
197 </style>
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
315 315
316 export default { 316 export default {
317 name: "", 317 name: "",
318 inject: ['getTreeByS','getRightTree'], 318 inject: ['getTreeByS','getRightTree','getTreeByBsm'],
319 components: {zdQueryData,dzQueryData,hfghb}, 319 components: {zdQueryData,dzQueryData,hfghb},
320 props: {}, 320 props: {},
321 data() { 321 data() {
...@@ -646,14 +646,25 @@ ...@@ -646,14 +646,25 @@
646 saveDzFg(this.dzFghData).then(res => { 646 saveDzFg(this.dzFghData).then(res => {
647 vm.loadingHide() 647 vm.loadingHide()
648 if (res.success) { 648 if (res.success) {
649 this.getRightTree(res.result,'0,1,2'); 649 if(res.result.zrz!==''&&res.result.zrz!=null){
650 this.$router.push({ 650 this.getTreeByBsm(res.result.zrz,'zrz','0,1,2');
651 path: '/zd', 651 this.$router.push({
652 query: { 652 path: '/zrz',
653 bsm: res.result, 653 query: {
654 source: 3, //分割标识 654 bsm: res.result.zrz,
655 } 655 source: 3, //分割标识
656 }); 656 }
657 });
658 }else if(res.result.dz!==''&&res.result.dz!=null){
659 this.getTreeByBsm(res.result.dz,'dz','0,1,2');
660 this.$router.push({
661 path: '/dz',
662 query: {
663 bsm: res.result.dz,
664 source: 3, //分割标识
665 }
666 });
667 }
657 } else { 668 } else {
658 Message.error("保存失败") 669 Message.error("保存失败")
659 } 670 }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="分类调查表" name="fldcb"><fldcb v-if="fldbcVisible"></fldcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"> 7 <el-tab-pane label="界址点" name="jzd">
7 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd> 8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
...@@ -26,10 +27,11 @@ import djb from "./djb"; ...@@ -26,10 +27,11 @@ import djb from "./djb";
26 import lshs from "./lshs"; 27 import lshs from "./lshs";
27 import fjcl from "./fjcl/fjcl" 28 import fjcl from "./fjcl/fjcl"
28 import {queryStatus} from "@api/search" 29 import {queryStatus} from "@api/search"
30 import Fldcb from "@components/Fldcb/Fldcb"
29 export default { 31 export default {
30 name: "", 32 name: "",
31 components: { 33 components: {
32 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl 34 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb
33 }, 35 },
34 props: {}, 36 props: {},
35 data() { 37 data() {
...@@ -38,6 +40,7 @@ export default { ...@@ -38,6 +40,7 @@ export default {
38 activeName: "djdcb", 40 activeName: "djdcb",
39 mjftbVisible:false, 41 mjftbVisible:false,
40 jzdVisible:false, 42 jzdVisible:false,
43 fldbcVisible:false,
41 jzxVisible:false, 44 jzxVisible:false,
42 djbVisible:false, 45 djbVisible:false,
43 lshsVisible:false, 46 lshsVisible:false,
...@@ -67,6 +70,9 @@ export default { ...@@ -67,6 +70,9 @@ export default {
67 case 'mjftb': 70 case 'mjftb':
68 this.mjftbVisible = true; 71 this.mjftbVisible = true;
69 break; 72 break;
73 case 'fldcb':
74 this.fldbcVisible = true;
75 break;
70 case 'jzd': 76 case 'jzd':
71 this.jzdVisible = true; 77 this.jzdVisible = true;
72 break; 78 break;
......