Merge branch 'dev'
Showing
3 changed files
with
125 additions
and
36 deletions
1 | /* | 1 | /* |
2 | * @Description: 互联共享数据 | 2 | * @Description: 互联共享数据 |
3 | * @Autor: | 3 | * @Autor: |
4 | * @LastEditTime: 2023-09-06 09:47:59 | 4 | * @LastEditTime: 2024-01-23 15:37:47 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | import request from "@/utils/request"; | 7 | import request from "@/utils/request"; |
... | @@ -16,7 +16,7 @@ let SERVER = window.config | ... | @@ -16,7 +16,7 @@ let SERVER = window.config |
16 | */ | 16 | */ |
17 | export function sfhc(data) { | 17 | export function sfhc(data) { |
18 | return request({ | 18 | return request({ |
19 | url: SERVER.SERVERAPI + "/v1/gab/sfhc", | 19 | url: SERVER.SERVERAPI + "/rest/bj/sfhc", |
20 | method: "post", | 20 | method: "post", |
21 | data, | 21 | data, |
22 | }); | 22 | }); |
... | @@ -28,7 +28,7 @@ export function sfhc(data) { | ... | @@ -28,7 +28,7 @@ export function sfhc(data) { |
28 | */ | 28 | */ |
29 | export function hy(data) { | 29 | export function hy(data) { |
30 | return request({ | 30 | return request({ |
31 | url: SERVER.SERVERAPI + "/v1/mzb/hy", | 31 | url: SERVER.SERVERAPI + "/rest/bj/hy", |
32 | method: "post", | 32 | method: "post", |
33 | data, | 33 | data, |
34 | }); | 34 | }); |
... | @@ -40,7 +40,7 @@ export function hy(data) { | ... | @@ -40,7 +40,7 @@ export function hy(data) { |
40 | */ | 40 | */ |
41 | export function jrxkz(data) { | 41 | export function jrxkz(data) { |
42 | return request({ | 42 | return request({ |
43 | url: SERVER.SERVERAPI + "/v1/ybj/jrxkz", | 43 | url: SERVER.SERVERAPI + "/rest/bj/jrxkz", |
44 | method: "post", | 44 | method: "post", |
45 | data, | 45 | data, |
46 | }); | 46 | }); |
... | @@ -52,7 +52,7 @@ export function jrxkz(data) { | ... | @@ -52,7 +52,7 @@ export function jrxkz(data) { |
52 | */ | 52 | */ |
53 | export function qyjbxx(data) { | 53 | export function qyjbxx(data) { |
54 | return request({ | 54 | return request({ |
55 | url: SERVER.SERVERAPI + "/v1/scjg/qyjbxx", | 55 | url: SERVER.SERVERAPI + "/rest/scjg/qyjbxx", |
56 | method: "post", | 56 | method: "post", |
57 | data, | 57 | data, |
58 | }); | 58 | }); |
... | @@ -64,7 +64,7 @@ export function qyjbxx(data) { | ... | @@ -64,7 +64,7 @@ export function qyjbxx(data) { |
64 | */ | 64 | */ |
65 | export function qyjbxxyz(data) { | 65 | export function qyjbxxyz(data) { |
66 | return request({ | 66 | return request({ |
67 | url: SERVER.SERVERAPI + "/v1/scjg/qyjbxxyz", | 67 | url: SERVER.SERVERAPI + "/rest/scjg/qyjbxxyz", |
68 | method: "post", | 68 | method: "post", |
69 | data, | 69 | data, |
70 | }); | 70 | }); |
... | @@ -76,7 +76,7 @@ export function qyjbxxyz(data) { | ... | @@ -76,7 +76,7 @@ export function qyjbxxyz(data) { |
76 | */ | 76 | */ |
77 | export function dm(data) { | 77 | export function dm(data) { |
78 | return request({ | 78 | return request({ |
79 | url: SERVER.SERVERAPI + "/v1/mzb/dm", | 79 | url: SERVER.SERVERAPI + "/rest/bj/dm", |
80 | method: "post", | 80 | method: "post", |
81 | data, | 81 | data, |
82 | }); | 82 | }); |
... | @@ -88,7 +88,7 @@ export function dm(data) { | ... | @@ -88,7 +88,7 @@ export function dm(data) { |
88 | */ | 88 | */ |
89 | export function gtgshjbxx(data) { | 89 | export function gtgshjbxx(data) { |
90 | return request({ | 90 | return request({ |
91 | url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxx", | 91 | url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxx", |
92 | method: "post", | 92 | method: "post", |
93 | data, | 93 | data, |
94 | }); | 94 | }); |
... | @@ -100,7 +100,7 @@ export function gtgshjbxx(data) { | ... | @@ -100,7 +100,7 @@ export function gtgshjbxx(data) { |
100 | */ | 100 | */ |
101 | export function gtgshjbxxyz(data) { | 101 | export function gtgshjbxxyz(data) { |
102 | return request({ | 102 | return request({ |
103 | url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxxyz", | 103 | url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxxyz", |
104 | method: "post", | 104 | method: "post", |
105 | data, | 105 | data, |
106 | }); | 106 | }); |
... | @@ -112,7 +112,7 @@ export function gtgshjbxxyz(data) { | ... | @@ -112,7 +112,7 @@ export function gtgshjbxxyz(data) { |
112 | */ | 112 | */ |
113 | export function xydm(data) { | 113 | export function xydm(data) { |
114 | return request({ | 114 | return request({ |
115 | url: SERVER.SERVERAPI + "/v1/zbb/xydm", | 115 | url: SERVER.SERVERAPI + "/rest/bj/xydm", |
116 | method: "post", | 116 | method: "post", |
117 | data, | 117 | data, |
118 | }); | 118 | }); |
... | @@ -124,7 +124,7 @@ export function xydm(data) { | ... | @@ -124,7 +124,7 @@ export function xydm(data) { |
124 | */ | 124 | */ |
125 | export function jgxxcx(data) { | 125 | export function jgxxcx(data) { |
126 | return request({ | 126 | return request({ |
127 | url: SERVER.SERVERAPI + "/v1/mzb/xydm", | 127 | url: SERVER.SERVERAPI + "/rest/bj/mzbxydm", |
128 | method: "post", | 128 | method: "post", |
129 | data, | 129 | data, |
130 | }); | 130 | }); |
... | @@ -136,7 +136,7 @@ export function jgxxcx(data) { | ... | @@ -136,7 +136,7 @@ export function jgxxcx(data) { |
136 | */ | 136 | */ |
137 | export function bdcdj(data) { | 137 | export function bdcdj(data) { |
138 | return request({ | 138 | return request({ |
139 | url: SERVER.SERVERAPI + "/v1/mzt/bdcdj", | 139 | url: SERVER.SERVERAPI + "/rest/mzsf/mzt/bdcdj", |
140 | method: "post", | 140 | method: "post", |
141 | data, | 141 | data, |
142 | }); | 142 | }); |
... | @@ -148,7 +148,7 @@ export function bdcdj(data) { | ... | @@ -148,7 +148,7 @@ export function bdcdj(data) { |
148 | */ | 148 | */ |
149 | export function dzyyzz(data) { | 149 | export function dzyyzz(data) { |
150 | return request({ | 150 | return request({ |
151 | url: SERVER.SERVERAPI + "/v1/sczj/dzyyzz", | 151 | url: SERVER.SERVERAPI + "/rest/scjg/dzyyzz", |
152 | method: "post", | 152 | method: "post", |
153 | data, | 153 | data, |
154 | }); | 154 | }); |
... | @@ -158,11 +158,11 @@ export function dzyyzz(data) { | ... | @@ -158,11 +158,11 @@ export function dzyyzz(data) { |
158 | * @param {*} data | 158 | * @param {*} data |
159 | * @author: | 159 | * @author: |
160 | */ | 160 | */ |
161 | export function gzsxx(data) { | 161 | export function gzsxx(params) { |
162 | return request({ | 162 | return request({ |
163 | url: SERVER.SERVERAPI + "/v1/sft/gzsxx", | 163 | url: SERVER.SERVERAPI + "/rest/mzsf/sft/gzsxx", |
164 | method: "post", | 164 | method: "get", |
165 | data, | 165 | params, |
166 | }); | 166 | }); |
167 | } | 167 | } |
168 | /** | 168 | /** |
... | @@ -172,7 +172,7 @@ export function gzsxx(data) { | ... | @@ -172,7 +172,7 @@ export function gzsxx(data) { |
172 | */ | 172 | */ |
173 | export function pjws(data) { | 173 | export function pjws(data) { |
174 | return request({ | 174 | return request({ |
175 | url: SERVER.SERVERAPI + "/v1/zgf/pjws", | 175 | url: SERVER.SERVERAPI + "/rest/bj/pjws", |
176 | method: "post", | 176 | method: "post", |
177 | data, | 177 | data, |
178 | }); | 178 | }); |
... | @@ -184,9 +184,8 @@ export function pjws(data) { | ... | @@ -184,9 +184,8 @@ export function pjws(data) { |
184 | */ | 184 | */ |
185 | export function pjwsDetail(data) { | 185 | export function pjwsDetail(data) { |
186 | return request({ | 186 | return request({ |
187 | url: SERVER.SERVERAPI + "/v1/zgf/pjwsDetail", | 187 | url: SERVER.SERVERAPI + "/rest/bj/pjwsDetail", |
188 | method: "post", | 188 | method: "post", |
189 | data, | 189 | data, |
190 | }); | 190 | }); |
191 | } | 191 | } |
192 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Author: yangwei | 2 | * @Author: yangwei |
3 | * @Date: 2023-09-06 09:00:34 | 3 | * @Date: 2023-09-06 09:00:34 |
4 | * @LastEditors: yangwei | 4 | * @LastEditors: vers |
5 | * @LastEditTime: 2023-09-07 11:11:32 | 5 | * @LastEditTime: 2024-01-23 15:36:59 |
6 | * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\components\gzsxxcx.vue | 6 | * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\components\gzsxxcx.vue |
7 | * @Description: | 7 | * @Description: |
8 | * | 8 | * |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | label-width="80px" | 19 | label-width="80px" |
20 | > | 20 | > |
21 | <el-row> | 21 | <el-row> |
22 | <el-col :span="9"> | 22 | <!-- <el-col :span="9"> |
23 | <el-form-item label="业务号"> | 23 | <el-form-item label="业务号"> |
24 | <el-input | 24 | <el-input |
25 | placeholder="业务号" | 25 | placeholder="业务号" |
... | @@ -29,12 +29,12 @@ | ... | @@ -29,12 +29,12 @@ |
29 | > | 29 | > |
30 | </el-input> | 30 | </el-input> |
31 | </el-form-item> | 31 | </el-form-item> |
32 | </el-col> | 32 | </el-col> --> |
33 | <el-col :span="9"> | 33 | <el-col :span="9"> |
34 | <el-form-item label="证件号码"> | 34 | <el-form-item label="证件号码"> |
35 | <el-input | 35 | <el-input |
36 | placeholder="证件号码" | 36 | placeholder="证件号码" |
37 | v-model="queryForm.certCode" | 37 | v-model="queryForm.zjhm" |
38 | clearable | 38 | clearable |
39 | class="width100" | 39 | class="width100" |
40 | > | 40 | > |
... | @@ -74,7 +74,8 @@ | ... | @@ -74,7 +74,8 @@ |
74 | </el-table-column> | 74 | </el-table-column> |
75 | <el-table-column prop="notary_name" label="公证员" width="120"> | 75 | <el-table-column prop="notary_name" label="公证员" width="120"> |
76 | </el-table-column> | 76 | </el-table-column> |
77 | <el-table-column prop="accept_date" label="公证日期" width="120"> </el-table-column> | 77 | <el-table-column prop="accept_date" label="公证日期" width="120"> |
78 | </el-table-column> | ||
78 | <el-table-column prop="fwbh" label="房屋编号" width="120"> | 79 | <el-table-column prop="fwbh" label="房屋编号" width="120"> |
79 | </el-table-column> | 80 | </el-table-column> |
80 | <el-table-column prop="mj" label="面积" width="120"> | 81 | <el-table-column prop="mj" label="面积" width="120"> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-01-23 15:36:15 | 4 | * @LastEditTime: 2024-01-23 16:05:38 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
... | @@ -123,12 +123,28 @@ | ... | @@ -123,12 +123,28 @@ |
123 | <el-row :gutter="10"> | 123 | <el-row :gutter="10"> |
124 | <el-col :span="8"> | 124 | <el-col :span="8"> |
125 | <el-form-item label="承包起始时间:"> | 125 | <el-form-item label="承包起始时间:"> |
126 | <el-input v-model="ruleForm.tdcbjyq.cbqssj" :disabled="!viewEdit"></el-input> | 126 | <el-date-picker |
127 | v-model="ruleForm.tdcbjyq.cbqssj" | ||
128 | class="width100" | ||
129 | type="date" | ||
130 | :disabled="!viewEdit" | ||
131 | :picker-options="pickerOptionsStart" | ||
132 | placeholder="选择日期" | ||
133 | value-format="yyyy-MM-dd HH:mm:ss" | ||
134 | format="yyyy-MM-dd"></el-date-picker> | ||
127 | </el-form-item> | 135 | </el-form-item> |
128 | </el-col> | 136 | </el-col> |
129 | <el-col :span="8"> | 137 | <el-col :span="8"> |
130 | <el-form-item label="承包结束时间:"> | 138 | <el-form-item label="承包结束时间:"> |
131 | <el-input v-model="ruleForm.tdcbjyq.cbjssj" :disabled="!viewEdit"></el-input> | 139 | <el-date-picker |
140 | v-model="ruleForm.tdcbjyq.cbjssj" | ||
141 | :disabled="!viewEdit" | ||
142 | class="width100" | ||
143 | type="date" | ||
144 | placeholder="选择日期" | ||
145 | :picker-options="pickerOptionsEnd" | ||
146 | value-format="yyyy-MM-dd HH:mm:ss" | ||
147 | format="yyyy-MM-dd"></el-date-picker> | ||
132 | </el-form-item> | 148 | </el-form-item> |
133 | </el-col> | 149 | </el-col> |
134 | <el-col :span="8"> | 150 | <el-col :span="8"> |
... | @@ -139,6 +155,65 @@ | ... | @@ -139,6 +155,65 @@ |
139 | </el-row> | 155 | </el-row> |
140 | <el-row :gutter="10"> | 156 | <el-row :gutter="10"> |
141 | <el-col :span="8"> | 157 | <el-col :span="8"> |
158 | <el-form-item label="用途:"> | ||
159 | <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.yt"></el-input> | ||
160 | </el-form-item> | ||
161 | </el-col> | ||
162 | <el-col :span="8"> | ||
163 | <el-form-item label="确权面积:"> | ||
164 | <div class="flex"> | ||
165 | <el-input | ||
166 | :disabled="!viewEdit" | ||
167 | v-model="ruleForm.tdcbjyq.qqmj" | ||
168 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
169 | <el-select :disabled="!viewEdit" v-model="mjdw" style="width: 68px"> | ||
170 | <el-option | ||
171 | v-for="item in dictData['A7']" | ||
172 | :key="item.dcode" | ||
173 | :label="item.dname" | ||
174 | :value="item.dcode"> | ||
175 | </el-option> | ||
176 | </el-select> | ||
177 | </div> | ||
178 | </el-form-item> | ||
179 | </el-col> | ||
180 | <el-col :span="8"> | ||
181 | <el-form-item label="土地所有权性质:"> | ||
182 | <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.tdsyqxz"></el-input> | ||
183 | </el-form-item> | ||
184 | </el-col> | ||
185 | </el-row> | ||
186 | |||
187 | <el-row :gutter="10"> | ||
188 | <el-col :span="8"> | ||
189 | <el-form-item label="是否永久基本农田:"> | ||
190 | <el-radio-group | ||
191 | v-model="ruleForm.tdcbjyq.sfyjjbnt" | ||
192 | :disabled="!viewEdit"> | ||
193 | <el-radio label="1">是</el-radio> | ||
194 | <el-radio label="0">否</el-radio> | ||
195 | </el-radio-group> | ||
196 | </el-form-item> | ||
197 | </el-col> | ||
198 | <el-col :span="8"> | ||
199 | <el-form-item label="是否自留地:"> | ||
200 | <el-radio-group | ||
201 | v-model="ruleForm.tdcbjyq.sfzld" | ||
202 | :disabled="!viewEdit"> | ||
203 | <el-radio label="1">是</el-radio> | ||
204 | <el-radio label="0">否</el-radio> | ||
205 | </el-radio-group> | ||
206 | </el-form-item> | ||
207 | </el-col> | ||
208 | <el-col :span="8"> | ||
209 | <el-form-item label="用地用海分类:"> | ||
210 | <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.ydyhfl"></el-input> | ||
211 | </el-form-item> | ||
212 | </el-col> | ||
213 | </el-row> | ||
214 | |||
215 | <el-row :gutter="10"> | ||
216 | <el-col :span="8"> | ||
142 | <el-form-item label="承包经营权取得方式:"> | 217 | <el-form-item label="承包经营权取得方式:"> |
143 | <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.cbjyqqdfs"></el-input> | 218 | <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.cbjyqqdfs"></el-input> |
144 | </el-form-item> | 219 | </el-form-item> |
... | @@ -149,13 +224,7 @@ | ... | @@ -149,13 +224,7 @@ |
149 | </el-form-item> | 224 | </el-form-item> |
150 | </el-col> | 225 | </el-col> |
151 | </el-row> | 226 | </el-row> |
152 | <el-row :gutter="10"> | 227 | |
153 | <el-col :span="24"> | ||
154 | <el-form-item label="用途:"> | ||
155 | <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.yt"></el-input> | ||
156 | </el-form-item> | ||
157 | </el-col> | ||
158 | </el-row> | ||
159 | <div class="slxx_title title-block"> | 228 | <div class="slxx_title title-block"> |
160 | 权利人信息 | 229 | 权利人信息 |
161 | <div class="triangle"></div> | 230 | <div class="triangle"></div> |
... | @@ -289,6 +358,26 @@ | ... | @@ -289,6 +358,26 @@ |
289 | }, | 358 | }, |
290 | data () { | 359 | data () { |
291 | return { | 360 | return { |
361 | // 开始结束日期限制 | ||
362 | pickerOptionsStart: { | ||
363 | disabledDate: (time) => { | ||
364 | if (this.ruleForm.tdcbjyq.cbjssj) { | ||
365 | return ( | ||
366 | time.getTime() >= new Date(this.ruleForm.tdcbjyq.cbjssj).getTime() | ||
367 | ); | ||
368 | } | ||
369 | } | ||
370 | }, | ||
371 | // 结束日期限制 | ||
372 | pickerOptionsEnd: { | ||
373 | disabledDate: (time) => { | ||
374 | if (this.ruleForm.tdcbjyq.cbqssj) { | ||
375 | return ( | ||
376 | time.getTime() <= new Date(this.ruleForm.tdcbjyq.cbqssj).getTime() | ||
377 | ); | ||
378 | } | ||
379 | } | ||
380 | }, | ||
292 | isSave: true, | 381 | isSave: true, |
293 | // 键名转换,方法默认是label和children进行树状渲染 | 382 | // 键名转换,方法默认是label和children进行树状渲染 |
294 | normalizer (node) { | 383 | normalizer (node) { | ... | ... |
-
Please register or sign in to post a comment