5c5a1a17 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8e185b48 8ae3aec1
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 15:51:58 4 * @LastEditTime: 2023-08-16 16:31:07
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
488 :tableData="ruleForm.qlrData" 488 :tableData="ruleForm.qlrData"
489 @upDateQlrxxList="upDateQlrxxList" 489 @upDateQlrxxList="upDateQlrxxList"
490 :key="key" 490 :key="key"
491 :ableOperation="ableOperation" 491 :disabled="ableOperation"
492 :gyfs="ruleForm.sldy.gyfs" /> 492 :gyfs="ruleForm.sldy.gyfs" />
493 493
494 <div v-if="ruleForm.ywrData"> 494 <div v-if="ruleForm.ywrData">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 16:05:07 4 * @LastEditTime: 2023-08-16 16:29:35
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-16 16:18:38 4 * @LastEditTime: 2023-08-16 16:32:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
11 ref="ruleForm" 11 ref="ruleForm"
12 :label-position="flag ? 'top' : ''" 12 :label-position="flag ? 'top' : ''"
13 :inline="flag" 13 :inline="flag"
14 label-width="120px" 14 label-width="120px">
15 >
16 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> 15 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
17 <div class="slxx_title title-block"> 16 <div class="slxx_title title-block">
18 受理信息 17 受理信息
...@@ -83,8 +82,7 @@ ...@@ -83,8 +82,7 @@
83 v-for="item in dictData['A7']" 82 v-for="item in dictData['A7']"
84 :key="item.dcode" 83 :key="item.dcode"
85 :label="item.dname" 84 :label="item.dname"
86 :value="item.dcode" 85 :value="item.dcode"></el-option>
87 ></el-option>
88 </el-select> 86 </el-select>
89 </div> 87 </div>
90 </el-form-item> 88 </el-form-item>
...@@ -118,15 +116,13 @@ ...@@ -118,15 +116,13 @@
118 <el-input 116 <el-input
119 v-model="ruleForm.fdcq1.fdcjyjg" 117 v-model="ruleForm.fdcq1.fdcjyjg"
120 style="width: 500%" 118 style="width: 500%"
121 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" 119 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
122 ></el-input>
123 <el-select v-model="ruleForm.fdcq1.jedw"> 120 <el-select v-model="ruleForm.fdcq1.jedw">
124 <el-option 121 <el-option
125 v-for="item in dictData['A57']" 122 v-for="item in dictData['A57']"
126 :key="item.dcode" 123 :key="item.dcode"
127 :label="item.dname" 124 :label="item.dname"
128 :value="item.dcode" 125 :value="item.dcode"></el-option>
129 ></el-option>
130 </el-select> 126 </el-select>
131 </div> 127 </div>
132 </el-form-item> 128 </el-form-item>
...@@ -145,8 +141,7 @@ ...@@ -145,8 +141,7 @@
145 <fdcqxmTable 141 <fdcqxmTable
146 :ableOperation="viewEdit" 142 :ableOperation="viewEdit"
147 :tableData="ruleForm.fdcqxm" 143 :tableData="ruleForm.fdcqxm"
148 @upDateTdytxxList="upDateTdytxxList" 144 @upDateTdytxxList="upDateTdytxxList" />
149 />
150 <div class="slxx_title title-block"> 145 <div class="slxx_title title-block">
151 土地用途 146 土地用途
152 <div class="triangle"></div> 147 <div class="triangle"></div>
...@@ -154,8 +149,7 @@ ...@@ -154,8 +149,7 @@
154 <tdytTable 149 <tdytTable
155 :ableOperation="viewEdit" 150 :ableOperation="viewEdit"
156 :tableData="ruleForm.tdytqxList" 151 :tableData="ruleForm.tdytqxList"
157 @upDateTdytxxList="upDateTdytxxList" 152 @upDateTdytxxList="upDateTdytxxList" />
158 />
159 <div class="slxx_title title-block"> 153 <div class="slxx_title title-block">
160 权利人信息 154 权利人信息
161 <div class="triangle"></div> 155 <div class="triangle"></div>
...@@ -166,8 +160,7 @@ ...@@ -166,8 +160,7 @@
166 <el-radio-group 160 <el-radio-group
167 :disabled="!viewEdit" 161 :disabled="!viewEdit"
168 @change="showCZInfo" 162 @change="showCZInfo"
169 v-model="ruleForm.sldy.gyfs" 163 v-model="ruleForm.sldy.gyfs">
170 >
171 <el-radio label="0">单独所有</el-radio> 164 <el-radio label="0">单独所有</el-radio>
172 <el-radio label="1">共同共有</el-radio> 165 <el-radio label="1">共同共有</el-radio>
173 <el-radio label="2">按份所有</el-radio> 166 <el-radio label="2">按份所有</el-radio>
...@@ -190,17 +183,16 @@ ...@@ -190,17 +183,16 @@
190 v-for="item in czrOptions" 183 v-for="item in czrOptions"
191 :key="item.zjh" 184 :key="item.zjh"
192 :label="item.sqrmc" 185 :label="item.sqrmc"
193 :value="item.zjh" 186 :value="item.zjh"></el-option>
194 ></el-option>
195 </el-select> 187 </el-select>
196 </el-form-item> 188 </el-form-item>
197 </el-col> 189 </el-col>
198 </el-row> 190 </el-row>
199 <qlrCommonTable 191 <qlrCommonTable
200 @upDateQlrxxList="upDateQlrxxList" 192 @upDateQlrxxList="upDateQlrxxList"
201 :tableData="ruleForm.qlrList" 193 :disabled="viewEdit"
202 :gyfs="ruleForm.sldy.gyfs" 194 :tableData="ruleForm.qlrList"
203 /> 195 :gyfs="ruleForm.sldy.gyfs" />
204 196
205 <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'"> 197 <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
206 <div class="slxx_title title-block"> 198 <div class="slxx_title title-block">
...@@ -209,10 +201,10 @@ ...@@ -209,10 +201,10 @@
209 </div> 201 </div>
210 <qlrCommonTable 202 <qlrCommonTable
211 v-if="ruleForm.qlxx" 203 v-if="ruleForm.qlxx"
204 :disabled="viewEdit"
212 @upDateQlrxxList="upDateYwrxxList" 205 @upDateQlrxxList="upDateYwrxxList"
213 :tableData="ruleForm.ywrList" 206 :tableData="ruleForm.ywrList"
214 :gyfs="ruleForm.qlxx.gyfs" 207 :gyfs="ruleForm.qlxx.gyfs" />
215 />
216 </div> 208 </div>
217 <div class="slxx_title title-block"> 209 <div class="slxx_title title-block">
218 登记原因 210 登记原因
...@@ -227,8 +219,7 @@ ...@@ -227,8 +219,7 @@
227 maxlength="500" 219 maxlength="500"
228 show-word-limit 220 show-word-limit
229 :disabled="!viewEdit" 221 :disabled="!viewEdit"
230 v-model="ruleForm.fdcq1.djyy" 222 v-model="ruleForm.fdcq1.djyy"></el-input>
231 ></el-input>
232 </el-form-item> 223 </el-form-item>
233 </el-col> 224 </el-col>
234 </el-row> 225 </el-row>
...@@ -243,212 +234,212 @@ ...@@ -243,212 +234,212 @@
243 </div> 234 </div>
244 </template> 235 </template>
245 <script> 236 <script>
246 import ywmix from "@/views/ywbl/mixin/index"; 237 import ywmix from "@/views/ywbl/mixin/index";
247 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 238 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
248 import fdcqxmTable from "@/views/workflow/components/fdcqxmTable"; 239 import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
249 import tdytTable from "@/views/workflow/components/tdytTable"; 240 import tdytTable from "@/views/workflow/components/tdytTable";
250 import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js"; 241 import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
251 import { mapGetters } from "vuex"; 242 import { mapGetters } from "vuex";
252 export default { 243 export default {
253 mixins: [ywmix], 244 mixins: [ywmix],
254 mounted() { 245 mounted () {
255 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 246 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
256 this.propsParam = this.$attrs; 247 this.propsParam = this.$attrs;
257 var formdata = new FormData(); 248 var formdata = new FormData();
258 formdata.append("bsmSldy", this.propsParam.bsmSldy); 249 formdata.append("bsmSldy", this.propsParam.bsmSldy);
259 formdata.append("djlx", this.propsParam.djlx); 250 formdata.append("djlx", this.propsParam.djlx);
260 formdata.append("isEdit", this.viewEdit); 251 formdata.append("isEdit", this.viewEdit);
261 Init(formdata).then((res) => { 252 Init(formdata).then((res) => {
262 if (res.code === 200 && res.result) { 253 if (res.code === 200 && res.result) {
263 this.ruleForm = { 254 this.ruleForm = {
264 ...res.result, 255 ...res.result,
265 ...res.result.qlxxdatas, 256 ...res.result.qlxxdatas,
266 }; 257 };
267 //初始化发证方式,1:小证,2:大正 258 //初始化发证方式,1:小证,2:大正
268 this.ruleForm.slsq.fzfs == null 259 this.ruleForm.slsq.fzfs == null
269 ? (this.ruleForm.slsq.fzfs = "1") 260 ? (this.ruleForm.slsq.fzfs = "1")
270 : this.ruleForm.slsq.fzfs; 261 : this.ruleForm.slsq.fzfs;
271 this.czrOptions = this.ruleForm.qlrList; 262 this.czrOptions = this.ruleForm.qlrList;
272 } 263 }
273 }); 264 });
274 },
275 components: { qlrCommonTable, tdytTable, fdcqxmTable },
276 computed: {
277 ...mapGetters(["dictData", "flag"]),
278 },
279 data() {
280 return {
281 disabled: true,
282 tdytOption: [],
283 czrOptions: [],
284 ruleForm: {
285 flow: {
286 ywh: "",
287 },
288 qlxx: {
289 mj: "",
290 },
291 sldy: {
292 gyfs: "",
293 },
294 slsq: {},
295 fdcq1: {
296 zyjzmj: "",
297 ftjzmj: "",
298 },
299 zdjbxx: {
300 ghytmc: "",
301 },
302 },
303 //传递参数
304 propsParam: this.$attrs,
305 //表单是否可操作
306 viewEdit: false,
307 rules: {},
308 };
309 },
310 methods: {
311 /**
312 * @description: 更新土地用途信息
313 * @param {*} val
314 * @author: renchao
315 */
316 upDateTdytxxList(val) {
317 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
318 this.key++;
319 },
320 /**
321 * @description: 更新权利人信息
322 * @param {*} val
323 * @author: renchao
324 */
325 upDateQlrxxList(val) {
326 this.ruleForm.qlrList = _.cloneDeep(val);
327 this.czrOptions = this.ruleForm.qlrList;
328 this.key++;
329 }, 265 },
330 /** 266 components: { qlrCommonTable, tdytTable, fdcqxmTable },
331 * @description: showCZInfo 267 computed: {
332 * @author: renchao 268 ...mapGetters(["dictData", "flag"]),
333 */
334 showCZInfo() {
335 console.log(this.ruleForm.slsq.gyfs);
336 }, 269 },
337 // 更新权利人信息 270 data () {
338 /** 271 return {
339 * @description: 更新权利人信息 272 disabled: true,
340 * @param {*} val 273 tdytOption: [],
341 * @author: renchao 274 czrOptions: [],
342 */ 275 ruleForm: {
343 upDateYwrxxList(val) { 276 flow: {
344 this.ruleForm.ywrList = _.cloneDeep(val); 277 ywh: "",
278 },
279 qlxx: {
280 mj: "",
281 },
282 sldy: {
283 gyfs: "",
284 },
285 slsq: {},
286 fdcq1: {
287 zyjzmj: "",
288 ftjzmj: "",
289 },
290 zdjbxx: {
291 ghytmc: "",
292 },
293 },
294 //传递参数
295 propsParam: this.$attrs,
296 //表单是否可操作
297 viewEdit: false,
298 rules: {},
299 };
345 }, 300 },
346 /** 301 methods: {
347 * @description: onSubmit 302 /**
348 * @author: renchao 303 * @description: 更新土地用途信息
349 */ 304 * @param {*} val
350 onSubmit() { 305 * @author: renchao
351 let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt); 306 */
352 if (arr.length > 0) { 307 upDateTdytxxList (val) {
353 this.$message({ 308 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
354 showClose: true, 309 this.key++;
355 message: "土地用途不能为空", 310 },
356 type: "error", 311 /**
357 }); 312 * @description: 更新权利人信息
358 return false; 313 * @param {*} val
359 } 314 * @author: renchao
360 saveData(this.ruleForm).then((res) => { 315 */
361 if (res.code === 200) { 316 upDateQlrxxList (val) {
362 this.$message({ 317 this.ruleForm.qlrList = _.cloneDeep(val);
363 showClose: true, 318 this.czrOptions = this.ruleForm.qlrList;
364 message: "保存成功!", 319 this.key++;
365 type: "success", 320 },
366 }); 321 /**
367 this.$store.dispatch("user/refreshPage", true); 322 * @description: showCZInfo
368 } else { 323 * @author: renchao
324 */
325 showCZInfo () {
326 console.log(this.ruleForm.slsq.gyfs);
327 },
328 // 更新权利人信息
329 /**
330 * @description: 更新权利人信息
331 * @param {*} val
332 * @author: renchao
333 */
334 upDateYwrxxList (val) {
335 this.ruleForm.ywrList = _.cloneDeep(val);
336 },
337 /**
338 * @description: onSubmit
339 * @author: renchao
340 */
341 onSubmit () {
342 let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
343 if (arr.length > 0) {
369 this.$message({ 344 this.$message({
370 showClose: true, 345 showClose: true,
371 message: res.message, 346 message: "土地用途不能为空",
372 type: "error", 347 type: "error",
373 }); 348 });
349 return false;
374 } 350 }
375 }); 351 saveData(this.ruleForm).then((res) => {
352 if (res.code === 200) {
353 this.$message({
354 showClose: true,
355 message: "保存成功!",
356 type: "success",
357 });
358 this.$store.dispatch("user/refreshPage", true);
359 } else {
360 this.$message({
361 showClose: true,
362 message: res.message,
363 type: "error",
364 });
365 }
366 });
367 },
376 }, 368 },
377 }, 369 };
378 };
379 </script> 370 </script>
380 <style scoped lang='scss'> 371 <style scoped lang='scss'>
381 @import "~@/styles/public.scss"; 372 @import "~@/styles/public.scss";
382 373
383 /deep/.el-form { 374 /deep/.el-form {
384 display: flex; 375 display: flex;
385 flex-direction: column; 376 flex-direction: column;
386 height: calc(100vh - 130px); 377 height: calc(100vh - 130px);
387 } 378 }
388 379
389 /deep/.el-form-item__label { 380 /deep/.el-form-item__label {
390 padding: 0; 381 padding: 0;
391 } 382 }
392 383
393 /deep/.el-radio { 384 /deep/.el-radio {
394 margin-right: 10px; 385 margin-right: 10px;
395 } 386 }
396 387
397 /deep/.el-select { 388 /deep/.el-select {
398 width: 100%; 389 width: 100%;
399 } 390 }
400 391
401 /deep/.el-form-item { 392 /deep/.el-form-item {
402 margin-bottom: 8px; 393 margin-bottom: 8px;
403 } 394 }
404 395
405 .marginBot0 { 396 .marginBot0 {
406 margin-bottom: 0 !important; 397 margin-bottom: 0 !important;
407 } 398 }
408 399
409 .slxx { 400 .slxx {
410 box-sizing: border-box; 401 box-sizing: border-box;
411 } 402 }
412 403
413 .slxx_con { 404 .slxx_con {
414 flex: 1; 405 flex: 1;
415 height: 100%; 406 height: 100%;
416 background-color: #ffffff; 407 background-color: #ffffff;
417 overflow-y: auto; 408 overflow-y: auto;
418 padding-right: 3px; 409 padding-right: 3px;
419 overflow-x: hidden; 410 overflow-x: hidden;
420 } 411 }
421 412
422 .submit_btn { 413 .submit_btn {
423 height: 50px; 414 height: 50px;
424 } 415 }
425 416
426 .slxx_title { 417 .slxx_title {
427 border-bottom: 1px solid $borderColor; 418 border-bottom: 1px solid $borderColor;
428 padding-left: 10px; 419 padding-left: 10px;
429 padding-bottom: 5px; 420 padding-bottom: 5px;
430 margin-bottom: 10px; 421 margin-bottom: 10px;
431 margin-top: 5px; 422 margin-top: 5px;
432 font-size: 16px; 423 font-size: 16px;
433 font-weight: 500; 424 font-weight: 500;
434 color: #4a4a4a; 425 color: #4a4a4a;
435 } 426 }
436 427
437 .btn { 428 .btn {
438 text-align: center; 429 text-align: center;
439 padding-top: 10px; 430 padding-top: 10px;
440 height: 36px; 431 height: 36px;
441 background-color: #ffffff; 432 background-color: #ffffff;
442 padding: 5px 0; 433 padding: 5px 0;
443 } 434 }
444 435
445 .textArea { 436 .textArea {
446 /deep/.el-textarea__inner { 437 /deep/.el-textarea__inner {
447 min-height: 90px !important; 438 min-height: 90px !important;
439 }
448 } 440 }
449 }
450 441
451 /deep/.el-form-item__label { 442 /deep/.el-form-item__label {
452 padding-bottom: 0px; 443 padding-bottom: 0px;
453 } 444 }
454 </style> 445 </style>
......