5c5a1a17 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8e185b48 8ae3aec1
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 15:51:58
* @LastEditTime: 2023-08-16 16:31:07
-->
<template>
<!-- 受理信息 -->
......@@ -488,7 +488,7 @@
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:ableOperation="ableOperation"
:disabled="ableOperation"
:gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrData">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 16:05:07
* @LastEditTime: 2023-08-16 16:29:35
-->
<template>
<div>
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-16 16:18:38
* @LastEditTime: 2023-08-16 16:32:15
-->
<template>
<div class="slxx">
......@@ -11,8 +11,7 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
>
label-width="120px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
受理信息
......@@ -83,8 +82,7 @@
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
:value="item.dcode"></el-option>
</el-select>
</div>
</el-form-item>
......@@ -118,15 +116,13 @@
<el-input
v-model="ruleForm.fdcq1.fdcjyjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.fdcq1.jedw">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
:value="item.dcode"></el-option>
</el-select>
</div>
</el-form-item>
......@@ -145,8 +141,7 @@
<fdcqxmTable
:ableOperation="viewEdit"
:tableData="ruleForm.fdcqxm"
@upDateTdytxxList="upDateTdytxxList"
/>
@upDateTdytxxList="upDateTdytxxList" />
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
......@@ -154,8 +149,7 @@
<tdytTable
:ableOperation="viewEdit"
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
@upDateTdytxxList="upDateTdytxxList" />
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -166,8 +160,7 @@
<el-radio-group
:disabled="!viewEdit"
@change="showCZInfo"
v-model="ruleForm.sldy.gyfs"
>
v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -190,17 +183,16 @@
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh"
></el-option>
:value="item.zjh"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable
@upDateQlrxxList="upDateQlrxxList"
:disabled="viewEdit"
:tableData="ruleForm.qlrList"
:gyfs="ruleForm.sldy.gyfs"
/>
:gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
......@@ -209,10 +201,10 @@
</div>
<qlrCommonTable
v-if="ruleForm.qlxx"
:disabled="viewEdit"
@upDateQlrxxList="upDateYwrxxList"
:tableData="ruleForm.ywrList"
:gyfs="ruleForm.qlxx.gyfs"
/>
:gyfs="ruleForm.qlxx.gyfs" />
</div>
<div class="slxx_title title-block">
登记原因
......@@ -227,8 +219,7 @@
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.djyy"
></el-input>
v-model="ruleForm.fdcq1.djyy"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -243,15 +234,15 @@
</div>
</template>
<script>
import ywmix from "@/views/ywbl/mixin/index";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
import { mapGetters } from "vuex";
export default {
import ywmix from "@/views/ywbl/mixin/index";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
import { mapGetters } from "vuex";
export default {
mixins: [ywmix],
mounted() {
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -276,7 +267,7 @@ export default {
computed: {
...mapGetters(["dictData", "flag"]),
},
data() {
data () {
return {
disabled: true,
tdytOption: [],
......@@ -313,7 +304,7 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateTdytxxList(val) {
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
......@@ -322,7 +313,7 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateQlrxxList(val) {
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
......@@ -331,7 +322,7 @@ export default {
* @description: showCZInfo
* @author: renchao
*/
showCZInfo() {
showCZInfo () {
console.log(this.ruleForm.slsq.gyfs);
},
// 更新权利人信息
......@@ -340,14 +331,14 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateYwrxxList(val) {
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit() {
onSubmit () {
let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
if (arr.length > 0) {
this.$message({
......@@ -375,55 +366,55 @@ export default {
});
},
},
};
};
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
/deep/.el-form {
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
}
/deep/.el-form-item__label {
/deep/.el-form-item__label {
padding: 0;
}
}
/deep/.el-radio {
/deep/.el-radio {
margin-right: 10px;
}
}
/deep/.el-select {
/deep/.el-select {
width: 100%;
}
}
/deep/.el-form-item {
/deep/.el-form-item {
margin-bottom: 8px;
}
}
.marginBot0 {
.marginBot0 {
margin-bottom: 0 !important;
}
}
.slxx {
.slxx {
box-sizing: border-box;
}
}
.slxx_con {
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
}
.submit_btn {
.submit_btn {
height: 50px;
}
}
.slxx_title {
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
......@@ -432,23 +423,23 @@ export default {
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
}
.btn {
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
}
.textArea {
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
}
}
/deep/.el-form-item__label {
/deep/.el-form-item__label {
padding-bottom: 0px;
}
}
</style>
......