1b2b5c68 by tianhaohao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents e972a40f 87d653a9
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
34 34
35 <script> 35 <script>
36 import config from "./tableSelect"; 36 import config from "./tableSelect";
37
38 export default { 37 export default {
39 props: { 38 props: {
40 modelValue: null, 39 modelValue: null,
......
...@@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
56 await store.dispatch('user/getUserInfo') 56 await store.dispatch('user/getUserInfo')
57 router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }]) 57 router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
58 const routeTo = Cookies.get('routerTo') 58 const routeTo = Cookies.get('routerTo')
59 if (routeTo && routeTo !== '/') { 59 if (to.fullPath||routeTo && routeTo !== '/') {
60 next({ ...to, replace: true }) 60 next({ ...to, replace: true })
61 } else { 61 } else {
62 next('/home') 62 next('/home')
......
...@@ -77,12 +77,10 @@ export function getNode(qllx, qlxx, bdcdylx) { ...@@ -77,12 +77,10 @@ export function getNode(qllx, qlxx, bdcdylx) {
77 } else { 77 } else {
78 78
79 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label}; 79 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
80 console.log("node",node);
81 } 80 }
82 } else { 81 } else {
83 console.log("jin1111"); 82 console.log("jin1111");
84 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label}; 83 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
85 console.log("nodenodenodenode",node);
86 } 84 }
87 break; 85 break;
88 } 86 }
......
...@@ -63,6 +63,11 @@ ...@@ -63,6 +63,11 @@
63 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 63 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="8">
67 <el-form-item label="登记原因:">
68 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
69 </el-form-item>
70 </el-col>
66 <el-col :span="8"> 71 <el-col :span="8">
67 <el-form-item label="登记类型:"> 72 <el-form-item label="登记类型:">
68 <el-select v-model="ruleForm.qlxx.djlx"> 73 <el-select v-model="ruleForm.qlxx.djlx">
...@@ -101,6 +106,119 @@ ...@@ -101,6 +106,119 @@
101 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 106 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
102 </el-form-item> 107 </el-form-item>
103 </el-col> 108 </el-col>
109 <el-col :span="8">
110 <el-form-item label="权属状态:">
111 <el-select v-model="ruleForm.qlxx.qszt">
112 <el-option
113 v-for="item in qsztlist"
114 :key="item.dcode"
115 :label="item.dname"
116 :value="item.dcode"
117 >
118 </el-option>
119 </el-select>
120 </el-form-item>
121 </el-col>
122
123
124 <el-col :span="8">
125 <el-form-item label="供地役不动产单元号:">
126 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
127 </el-form-item>
128 </el-col> <el-col :span="8">
129 <el-form-item label="供役地权利人:">
130 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
131 </el-form-item>
132 </el-col> <el-col :span="8">
133 <el-form-item label="供役地权利人证件种类">
134 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
135 </el-form-item>
136 </el-col> <el-col :span="8">
137 <el-form-item label="供役地权利人证件号">
138 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
139 </el-form-item>
140 </el-col> <el-col :span="8">
141 <el-form-item label="需役地不动产单元号">
142 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
143 </el-form-item>
144 </el-col> <el-col :span="8">
145 <el-form-item label="需役地坐落">
146 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
147 </el-form-item>
148 </el-col> <el-col :span="8">
149 <el-form-item label="需役地权利人">
150 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
151 </el-form-item>
152 </el-col> <el-col :span="8">
153 <el-form-item label="需役地权利人证件种类:">
154 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
155 </el-form-item>
156 </el-col> <el-col :span="8">
157 <el-form-item label="需役地权利人证件号:">
158 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
159 </el-form-item>
160 </el-col> <el-col :span="8">
161 <el-form-item label="地役权内容:">
162 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
163 </el-form-item>
164 </el-col> <el-col :span="8">
165 <el-form-item label="不动产登记证明号:">
166 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
167 </el-form-item>
168 </el-col> <el-col :span="8">
169 <el-form-item label="权利起始时间">
170 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
171 </el-form-item>
172 </el-col> <el-col :span="8">
173 <el-form-item label="权利结束时间">
174 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
175 </el-form-item>
176 </el-col> <el-col :span="8">
177 <el-form-item label="权利期限">
178 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
179 </el-form-item>
180 </el-col> <el-col :span="8">
181 <el-form-item label="登记时间:">
182 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
183 </el-form-item>
184 </el-col> <el-col :span="8">
185 <el-form-item label="登记时间:">
186 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
187 </el-form-item>
188 </el-col> <el-col :span="8">
189 <el-form-item label="登记时间:">
190 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
191 </el-form-item>
192 </el-col> <el-col :span="8">
193 <el-form-item label="登记时间:">
194 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
195 </el-form-item>
196 </el-col> <el-col :span="8">
197 <el-form-item label="登记时间:">
198 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
199 </el-form-item>
200 </el-col> <el-col :span="8">
201 <el-form-item label="登记时间:">
202 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
203 </el-form-item>
204 </el-col> <el-col :span="8">
205 <el-form-item label="登记时间:">
206 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
207 </el-form-item>
208 </el-col> <el-col :span="8">
209 <el-form-item label="登记时间:">
210 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
211 </el-form-item>
212 </el-col> <el-col :span="8">
213 <el-form-item label="登记时间:">
214 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
215 </el-form-item>
216 </el-col>
217 <el-col :span="24">
218 <el-form-item label="附记:">
219 <el-input v-model="ruleForm.qlxx.fj"></el-input>
220 </el-form-item>
221 </el-col>
104 </el-row> 222 </el-row>
105 <div class="slxx_title title-block"> 223 <div class="slxx_title title-block">
106 权利人信息 224 权利人信息
...@@ -165,6 +283,17 @@ export default { ...@@ -165,6 +283,17 @@ export default {
165 disabled: true, 283 disabled: true,
166 czrOptions: [], 284 czrOptions: [],
167 ruleForm: {}, 285 ruleForm: {},
286 // 权属状态
287 qsztlist: [
288 {
289 dcode: "1",
290 dname: "现势",
291 },
292 {
293 dcode: "2",
294 dname: "历史",
295 },
296 ],
168 //传递参数\ 297 //传递参数\
169 rules: {}, 298 rules: {},
170 }; 299 };
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="127px"> 16 label-width="127px"
17 >
17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
19 补录信息 20 补录信息
...@@ -64,9 +65,19 @@ ...@@ -64,9 +65,19 @@
64 </el-form-item> 65 </el-form-item>
65 </el-col> 66 </el-col>
66 <el-col :span="8"> 67 <el-col :span="8">
68 <el-form-item label="登记原因:">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
70 </el-form-item>
71 </el-col>
72 <el-col :span="8">
67 <el-form-item label="登记类型:"> 73 <el-form-item label="登记类型:">
68 <el-select v-model="ruleForm.qlxx.djlx"> 74 <el-select v-model="ruleForm.qlxx.djlx">
69 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 75 <el-option
76 v-for="item in dictData['A21']"
77 :key="item.dcode"
78 :label="item.dname"
79 :value="item.dcode"
80 >
70 </el-option> 81 </el-option>
71 </el-select> 82 </el-select>
72 </el-form-item> 83 </el-form-item>
...@@ -101,7 +112,147 @@ ...@@ -101,7 +112,147 @@
101 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 112 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
102 </el-form-item> 113 </el-form-item>
103 </el-col> 114 </el-col>
115 <el-col :span="8">
116 <el-form-item label="权属状态:">
117 <el-select v-model="ruleForm.qlxx.qszt">
118 <el-option
119 v-for="item in qsztlist"
120 :key="item.dcode"
121 :label="item.dname"
122 :value="item.dcode"
123 >
124 </el-option>
125 </el-select>
126 </el-form-item>
127 </el-col>
104 128
129 <el-col :span="8">
130 <el-form-item label="预告登记种类">
131 <el-select v-model="ruleForm.qlxx.djlx">
132 <el-option
133 v-for="item in dictData['A29']"
134 :key="item.dcode"
135 :label="item.dname"
136 :value="item.dcode"
137 >
138 </el-option>
139 </el-select>
140 </el-form-item>
141 </el-col>
142 <el-col :span="8">
143 <el-form-item label="土地使用权人">
144 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
145 </el-form-item>
146 </el-col>
147 <el-col :span="8">
148 <el-form-item label="规划用途">
149 <el-select v-model="ruleForm.qlxx.djlx">
150 <el-option
151 v-for="item in dictData['A17']"
152 :key="item.dcode"
153 :label="item.dname"
154 :value="item.dcode"
155 >
156 </el-option>
157 </el-select>
158 </el-form-item>
159 </el-col>
160 <el-col :span="8">
161 <el-form-item label="用途名称">
162 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
163 </el-form-item>
164 </el-col>
165 <el-col :span="8">
166 <el-form-item label="房屋性质">
167 <el-select v-model="ruleForm.qlxx.djlx">
168 <el-option
169 v-for="item in dictData['A19']"
170 :key="item.dcode"
171 :label="item.dname"
172 :value="item.dcode"
173 >
174 </el-option>
175 </el-select>
176 </el-form-item>
177 </el-col>
178 <el-col :span="8">
179 <el-form-item label="房屋性质名称">
180 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
181 </el-form-item>
182 </el-col>
183 <el-col :span="8">
184 <el-form-item label="房屋结构">
185 <el-select v-model="ruleForm.qlxx.djlx">
186 <el-option
187 v-for="item in dictData['A46']"
188 :key="item.dcode"
189 :label="item.dname"
190 :value="item.dcode"
191 >
192 </el-option>
193 </el-select>
194 </el-form-item>
195 </el-col>
196 <el-col :span="8">
197 <el-form-item label="所在层">
198 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
199 </el-form-item>
200 </el-col>
201 <el-col :span="8">
202 <el-form-item label="总层数">
203 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
204 </el-form-item>
205 </el-col>
206 <el-col :span="8">
207 <el-form-item label="建筑面积">
208 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
209 </el-form-item>
210 </el-col>
211 <el-col :span="8">
212 <el-form-item label="注销预告业务号">
213 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
214 </el-form-item>
215 </el-col>
216 <el-col :span="8">
217 <el-form-item label="注销预告原因">
218 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
219 </el-form-item>
220 </el-col>
221 <el-col :span="8">
222 <el-form-item label="注销时间">
223 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
224 </el-form-item>
225 </el-col>
226 <el-col :span="8">
227 <el-form-item label="取得价格/被担保主债权数额">
228 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
229 </el-form-item>
230 </el-col>
231 <el-col :span="8">
232 <el-form-item label="金额单位">
233 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
234 </el-form-item>
235 </el-col>
236 <el-col :span="8">
237 <el-form-item label="担保范围">
238 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
239 </el-form-item>
240 </el-col>
241 <el-col :span="8">
242 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
243 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
244 </el-form-item>
245 </el-col>
246 <el-col :span="8">
247 <el-form-item label="不动产登记证明号">
248 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
249 </el-form-item>
250 </el-col>
251 <el-col :span="24">
252 <el-form-item label="附记:">
253 <el-input v-model="ruleForm.qlxx.fj"></el-input>
254 </el-form-item>
255 </el-col>
105 </el-row> 256 </el-row>
106 <div class="slxx_title title-block"> 257 <div class="slxx_title title-block">
107 权利人信息 258 权利人信息
...@@ -110,8 +261,7 @@ ...@@ -110,8 +261,7 @@
110 <el-row :gutter="10"> 261 <el-row :gutter="10">
111 <el-col :span="12"> 262 <el-col :span="12">
112 <el-form-item label="共有方式:"> 263 <el-form-item label="共有方式:">
113 <el-radio-group 264 <el-radio-group v-model="ruleForm.qlxx.gyqk">
114 v-model="ruleForm.qlxx.gyqk">
115 <el-radio label="0">单独所有</el-radio> 265 <el-radio label="0">单独所有</el-radio>
116 <el-radio label="1">共同共有</el-radio> 266 <el-radio label="1">共同共有</el-radio>
117 <el-radio label="2">按份所有</el-radio> 267 <el-radio label="2">按份所有</el-radio>
...@@ -124,7 +274,8 @@ ...@@ -124,7 +274,8 @@
124 :tableData="ruleForm.qlrData" 274 :tableData="ruleForm.qlrData"
125 @upDateQlrxxList="upDateQlrxxList" 275 @upDateQlrxxList="upDateQlrxxList"
126 :key="key" 276 :key="key"
127 :gyfs="ruleForm.qlxx.gyfs" /> 277 :gyfs="ruleForm.qlxx.gyfs"
278 />
128 279
129 <div> 280 <div>
130 <div class="slxx_title title-block"> 281 <div class="slxx_title title-block">
...@@ -135,7 +286,8 @@ ...@@ -135,7 +286,8 @@
135 v-if="ruleForm.ywrData" 286 v-if="ruleForm.ywrData"
136 :tableData="ruleForm.ywrData" 287 :tableData="ruleForm.ywrData"
137 :key="key" 288 :key="key"
138 @upDateQlrxxList="upDateYwrxxList" /> 289 @upDateQlrxxList="upDateYwrxxList"
290 />
139 </div> 291 </div>
140 </div> 292 </div>
141 <el-row class="btn"> 293 <el-row class="btn">
...@@ -148,13 +300,12 @@ ...@@ -148,13 +300,12 @@
148 </template> 300 </template>
149 <script> 301 <script>
150 import { mapGetters } from "vuex"; 302 import { mapGetters } from "vuex";
151 import { init,save } from "@/api/djbbl.js"; 303 import { init, save } from "@/api/djbbl.js";
152 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 304 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
153 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 305 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
154
155 import tdytTable from "@/views/workflow/components/tdytTable"; 306 import tdytTable from "@/views/workflow/components/tdytTable";
156 export default { 307 export default {
157 components: { qlrCommonTable,tdytTable }, 308 components: { qlrCommonTable, ywrCommonTable, tdytTable },
158 computed: { 309 computed: {
159 ...mapGetters(["dictData", "flag"]), 310 ...mapGetters(["dictData", "flag"]),
160 }, 311 },
...@@ -167,6 +318,17 @@ export default { ...@@ -167,6 +318,17 @@ export default {
167 disabled: true, 318 disabled: true,
168 czrOptions: [], 319 czrOptions: [],
169 ruleForm: {}, 320 ruleForm: {},
321 // 权属状态
322 qsztlist: [
323 {
324 dcode: "1",
325 dname: "现势",
326 },
327 {
328 dcode: "2",
329 dname: "历史",
330 },
331 ],
170 //传递参数\ 332 //传递参数\
171 rules: {}, 333 rules: {},
172 }; 334 };
...@@ -177,26 +339,26 @@ export default { ...@@ -177,26 +339,26 @@ export default {
177 mounted() {}, 339 mounted() {},
178 methods: { 340 methods: {
179 loadData() { 341 loadData() {
180 console.log("预告登记",this.propsParam); 342 console.log("预告登记", this.propsParam);
181 init(this.propsParam.bsmRepair).then((res) => { 343 init(this.propsParam.bsmRepair).then((res) => {
182 if (res.code == 200) { 344 if (res.code == 200) {
183 this.ruleForm = res.result; 345 this.ruleForm = res.result;
184 console.log("this.ruleForm",this.ruleForm); 346 console.log("this.ruleForm", this.ruleForm);
185 this.isShow = true; 347 this.isShow = true;
186 } 348 }
187 }); 349 });
188 }, 350 },
189 // 更新土地用途信息 351 // 更新土地用途信息
190 upDateTdytxxList(val) { 352 upDateTdytxxList(val) {
191 console.log("VAL",val); 353 console.log("VAL", val);
192 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 354 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
193 this.key++; 355 this.key++;
194 }, 356 },
195 // 更新权利人信息 357 // 更新权利人信息
196 upDateQlrxxList(val) { 358 upDateQlrxxList(val) {
197 console.log("val",val); 359 console.log("val", val);
198 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 360 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
199 console.log("this.ruleForm.qlrData",this.ruleForm.qlrData); 361 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
200 this.czrOptions = this.ruleForm.qlrData; 362 this.czrOptions = this.ruleForm.qlrData;
201 this.key++; 363 this.key++;
202 }, 364 },
...@@ -206,7 +368,7 @@ export default { ...@@ -206,7 +368,7 @@ export default {
206 this.key++; 368 this.key++;
207 }, 369 },
208 onSubmit() { 370 onSubmit() {
209 console.log("this.ruleForm大信息",this.ruleForm); 371 console.log("this.ruleForm大信息", this.ruleForm);
210 if (this.ruleForm.qlrData.length == 0) { 372 if (this.ruleForm.qlrData.length == 0) {
211 this.$message({ 373 this.$message({
212 showClose: true, 374 showClose: true,
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="127px"> 16 label-width="127px"
17 >
17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
19 补录信息 20 补录信息
...@@ -64,9 +65,19 @@ ...@@ -64,9 +65,19 @@
64 </el-form-item> 65 </el-form-item>
65 </el-col> 66 </el-col>
66 <el-col :span="8"> 67 <el-col :span="8">
68 <el-form-item label="登记原因:">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
70 </el-form-item>
71 </el-col>
72 <el-col :span="8">
67 <el-form-item label="登记类型:"> 73 <el-form-item label="登记类型:">
68 <el-select v-model="ruleForm.qlxx.djlx"> 74 <el-select v-model="ruleForm.qlxx.djlx">
69 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 75 <el-option
76 v-for="item in dictData['A21']"
77 :key="item.dcode"
78 :label="item.dname"
79 :value="item.dcode"
80 >
70 </el-option> 81 </el-option>
71 </el-select> 82 </el-select>
72 </el-form-item> 83 </el-form-item>
...@@ -101,6 +112,60 @@ ...@@ -101,6 +112,60 @@
101 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 112 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
102 </el-form-item> 113 </el-form-item>
103 </el-col> 114 </el-col>
115 <el-col :span="8">
116 <el-form-item label="权属状态:">
117 <el-select v-model="ruleForm.qlxx.qszt">
118 <el-option
119 v-for="item in qsztlist"
120 :key="item.dcode"
121 :label="item.dname"
122 :value="item.dcode"
123 >
124 </el-option>
125 </el-select>
126 </el-form-item>
127 </el-col>
128
129 <el-col :span="8">
130 <el-form-item label="异议事项">
131 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
132 </el-form-item>
133 </el-col>
134 <el-col :span="8">
135 <el-form-item label="不动产登记证明号">
136 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
137 </el-form-item>
138 </el-col>
139 <el-col :span="8">
140 <el-form-item label="登记时间:">
141 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
142 </el-form-item>
143 </el-col>
144 <el-col :span="8">
145 <el-form-item label="登记时间:">
146 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
147 </el-form-item>
148 </el-col>
149 <el-col :span="8">
150 <el-form-item label="登记时间:">
151 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
152 </el-form-item>
153 </el-col>
154 <el-col :span="8">
155 <el-form-item label="登记时间:">
156 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
157 </el-form-item>
158 </el-col>
159 <el-col :span="8">
160 <el-form-item label="登记时间:">
161 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
162 </el-form-item>
163 </el-col>
164 <el-col :span="24">
165 <el-form-item label="附记:">
166 <el-input v-model="ruleForm.qlxx.fj"></el-input>
167 </el-form-item>
168 </el-col>
104 </el-row> 169 </el-row>
105 <div class="slxx_title title-block"> 170 <div class="slxx_title title-block">
106 权利人信息 171 权利人信息
...@@ -109,8 +174,7 @@ ...@@ -109,8 +174,7 @@
109 <el-row :gutter="10"> 174 <el-row :gutter="10">
110 <el-col :span="12"> 175 <el-col :span="12">
111 <el-form-item label="共有方式:"> 176 <el-form-item label="共有方式:">
112 <el-radio-group 177 <el-radio-group v-model="ruleForm.qlxx.gyqk">
113 v-model="ruleForm.qlxx.gyqk">
114 <el-radio label="0">单独所有</el-radio> 178 <el-radio label="0">单独所有</el-radio>
115 <el-radio label="1">共同共有</el-radio> 179 <el-radio label="1">共同共有</el-radio>
116 <el-radio label="2">按份所有</el-radio> 180 <el-radio label="2">按份所有</el-radio>
...@@ -123,7 +187,8 @@ ...@@ -123,7 +187,8 @@
123 :tableData="ruleForm.qlrData" 187 :tableData="ruleForm.qlrData"
124 @upDateQlrxxList="upDateQlrxxList" 188 @upDateQlrxxList="upDateQlrxxList"
125 :key="key" 189 :key="key"
126 :gyfs="ruleForm.qlxx.gyfs" /> 190 :gyfs="ruleForm.qlxx.gyfs"
191 />
127 192
128 <div> 193 <div>
129 <div class="slxx_title title-block"> 194 <div class="slxx_title title-block">
...@@ -134,7 +199,8 @@ ...@@ -134,7 +199,8 @@
134 v-if="ruleForm.ywrData" 199 v-if="ruleForm.ywrData"
135 :tableData="ruleForm.ywrData" 200 :tableData="ruleForm.ywrData"
136 :key="key" 201 :key="key"
137 @upDateQlrxxList="upDateYwrxxList" /> 202 @upDateQlrxxList="upDateYwrxxList"
203 />
138 </div> 204 </div>
139 </div> 205 </div>
140 <el-row class="btn"> 206 <el-row class="btn">
...@@ -147,12 +213,12 @@ ...@@ -147,12 +213,12 @@
147 </template> 213 </template>
148 <script> 214 <script>
149 import { mapGetters } from "vuex"; 215 import { mapGetters } from "vuex";
150 import { init,save } from "@/api/djbbl.js"; 216 import { init, save } from "@/api/djbbl.js";
151 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 217 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
152 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 218 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
153 import tdytTable from "@/views/workflow/components/tdytTable"; 219 import tdytTable from "@/views/workflow/components/tdytTable";
154 export default { 220 export default {
155 components: { qlrCommonTable,ywrCommonTable,tdytTable }, 221 components: { qlrCommonTable, ywrCommonTable, tdytTable },
156 computed: { 222 computed: {
157 ...mapGetters(["dictData", "flag"]), 223 ...mapGetters(["dictData", "flag"]),
158 }, 224 },
...@@ -165,6 +231,17 @@ export default { ...@@ -165,6 +231,17 @@ export default {
165 disabled: true, 231 disabled: true,
166 czrOptions: [], 232 czrOptions: [],
167 ruleForm: {}, 233 ruleForm: {},
234 // 权属状态
235 qsztlist: [
236 {
237 dcode: "1",
238 dname: "现势",
239 },
240 {
241 dcode: "2",
242 dname: "历史",
243 },
244 ],
168 //传递参数\ 245 //传递参数\
169 rules: {}, 246 rules: {},
170 }; 247 };
...@@ -175,26 +252,26 @@ export default { ...@@ -175,26 +252,26 @@ export default {
175 mounted() {}, 252 mounted() {},
176 methods: { 253 methods: {
177 loadData() { 254 loadData() {
178 console.log("预告登记",this.propsParam); 255 console.log("预告登记", this.propsParam);
179 init(this.propsParam.bsmRepair).then((res) => { 256 init(this.propsParam.bsmRepair).then((res) => {
180 if (res.code == 200) { 257 if (res.code == 200) {
181 this.ruleForm = res.result; 258 this.ruleForm = res.result;
182 console.log("this.ruleForm",this.ruleForm); 259 console.log("this.ruleForm", this.ruleForm);
183 this.isShow = true; 260 this.isShow = true;
184 } 261 }
185 }); 262 });
186 }, 263 },
187 // 更新土地用途信息 264 // 更新土地用途信息
188 upDateTdytxxList(val) { 265 upDateTdytxxList(val) {
189 console.log("VAL",val); 266 console.log("VAL", val);
190 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 267 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
191 this.key++; 268 this.key++;
192 }, 269 },
193 // 更新权利人信息 270 // 更新权利人信息
194 upDateQlrxxList(val) { 271 upDateQlrxxList(val) {
195 console.log("val",val); 272 console.log("val", val);
196 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 273 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
197 console.log("this.ruleForm.qlrData",this.ruleForm.qlrData); 274 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
198 this.czrOptions = this.ruleForm.qlrData; 275 this.czrOptions = this.ruleForm.qlrData;
199 this.key++; 276 this.key++;
200 }, 277 },
...@@ -204,7 +281,7 @@ export default { ...@@ -204,7 +281,7 @@ export default {
204 this.key++; 281 this.key++;
205 }, 282 },
206 onSubmit() { 283 onSubmit() {
207 console.log("this.ruleForm大信息",this.ruleForm); 284 console.log("this.ruleForm大信息", this.ruleForm);
208 if (this.ruleForm.qlrData.length == 0) { 285 if (this.ruleForm.qlrData.length == 0) {
209 this.$message({ 286 this.$message({
210 showClose: true, 287 showClose: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-25 10:33:16 4 * @LastEditTime: 2023-06-29 16:31:57
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
8 <!-- 表单部分 --> 8 <!-- 表单部分 -->
9 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1"> 9 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1">
10 <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bdcqzlx" 10 <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz"
11 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane> 11 v-for="(item, index) in headTabBdcqz" :key="index">
12 </el-tab-pane>
12 </el-tabs> 13 </el-tabs>
13 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div> 14 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
14 <canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas> 15 <canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
49 ruleForm: { 50 ruleForm: {
50 bsmBdcqz: '', 51 bsmBdcqz: '',
51 szmc: '不动产权证书', 52 szmc: '不动产权证书',
52 bdcqzlx: '', 53 bsmBdcqz: '',
53 szzh: '', 54 szzh: '',
54 ysxlh: '', 55 ysxlh: '',
55 }, 56 },
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
77 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => { 78 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
78 if (res.code == 200) { 79 if (res.code == 200) {
79 if (res.result && res.result.length > 0) { 80 if (res.result && res.result.length > 0) {
80 this.activeName = res.result[0].bdcqzlx 81 this.activeName = res.result[0].bsmBdcqz
81 this.bdcqz = res.result[0] 82 this.bdcqz = res.result[0]
82 this.headTabBdcqz = res.result 83 this.headTabBdcqz = res.result
83 if (this.activeName == 1) { 84 if (this.activeName == 1) {
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
93 //tab表头切换方法 94 //tab表头切换方法
94 handleClick (e) { 95 handleClick (e) {
95 this.bdcqz = this.headTabBdcqz[e.index - 0] 96 this.bdcqz = this.headTabBdcqz[e.index - 0]
96 this.activeName = this.headTabBdcqz.bdcqzlx 97 this.activeName = this.headTabBdcqz.bsmBdcqz
97 if (this.activeName == '1') { 98 if (this.activeName == '1') {
98 this.drawTextOnImage() 99 this.drawTextOnImage()
99 } else { 100 } else {
......
...@@ -192,7 +192,20 @@ ...@@ -192,7 +192,20 @@
192 this.queryClick(); 192 this.queryClick();
193 }, 193 },
194 ywhClick (item) { 194 ywhClick (item) {
195 const { href } = this.$router.resolve( 195 //有任务权限
196 if(item.sjlx=="3"){
197 const { href } = this.$router.resolve(
198 "/djbworkFrame?bsmSlsq=" +
199 item.bsmSlsq +
200 "&bestepid=" +
201 item.bestepid +
202 "&bsmBusiness=" +
203 "&sqywbm=" +
204 item.djywbm
205 );
206 window.open(href, `urlname${item.bsmSlsq}`);
207 }else{
208 const { href } = this.$router.resolve(
196 "/workFrameView?bsmSlsq=" + 209 "/workFrameView?bsmSlsq=" +
197 item.bsmSlsq + 210 item.bsmSlsq +
198 "&bestepid=" + 211 "&bestepid=" +
...@@ -201,6 +214,9 @@ ...@@ -201,6 +214,9 @@
201 "&viewtype=1" 214 "&viewtype=1"
202 ); 215 );
203 window.open(href, `urlname${item.bsmSlsq}`); 216 window.open(href, `urlname${item.bsmSlsq}`);
217 }
218
219
204 }, 220 },
205 }, 221 },
206 }; 222 };
......