83d5ddee by renchao@pashanhoo.com

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

2 parents c6aaed86 b79e8e27
......@@ -18,51 +18,54 @@
>
<el-table-column prop="index" width="50" :render-header="renderHeader">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.$index + 1 }}
</div>
<div style="text-align: center">{{ scope.$index + 1 }}</div>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" label="不动产单元号" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.row.bdcdyh }}
</div>
<div style="text-align: center">{{ scope.row.bdcdyh }}</div>
</template>
</el-table-column>
<el-table-column prop="xmmc" label="项目名称" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.row.xmmc }}
</div>
<div style="text-align: center">{{ scope.row.xmmc }}</div>
</template>
</el-table-column>
<el-table-column prop="zcs" label="总层数" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">{{ scope.row.zcs }}</div>
</template>
</el-table-column>
<el-table-column prop="ytmc" label="房屋用途" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">{{ scope.row.ytmc }}</div>
</template>
</el-table-column>
<el-table-column prop="fwjgmc" label="房屋结构" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">{{ scope.row.fwjgmc }}</div>
</template>
</el-table-column>
<el-table-column prop="jzmj" label="建筑面积" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.row.jzmj }}
</div>
<div style="text-align: center">{{ scope.row.jzmj }}</div>
</template>
</el-table-column>
<el-table-column prop="ytmc" label="用途名称" min-width="100">
<el-table-column prop="jgsj" label="竣工时间" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.row.ytmc }}
</div>
<div style="text-align: center">{{ scope.row.jgsj }}</div>
</template>
</el-table-column>
<el-table-column prop="fwjgmc" label="房屋结构名称" min-width="100">
<el-table-column prop="zts" label="总套数" min-width="100">
<template slot-scope="scope">
<div style="text-align: center">
{{ scope.row.fwjgmc }}
</div>
<div style="text-align: center">{{ scope.row.zts }}</div>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import {mapGetters} from "vuex";
import { mapGetters } from "vuex";
export default {
computed: {
......@@ -84,11 +87,10 @@ export default {
return {
// 键名转换,方法默认是label和children进行树状渲染
key: 0,
tableDataList: []
tableDataList: [],
};
},
mounted() {
},
mounted() {},
watch: {
tableData: {
handler: function (val, oldVal) {
......@@ -133,7 +135,7 @@ export default {
)}
</div>
);
}
},
},
};
</script>
......
......@@ -5,8 +5,14 @@
-->
<template>
<div class="slxx">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
label-width="120px">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
>
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
受理信息
......@@ -52,37 +58,84 @@
</div>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="原不动产权证号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-form-item label="宗地面积:">
<div class="flex">
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-select disabled v-model="ruleForm.zdjbxx.mjdw" style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地性质:">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人:">
<el-input disabled v-model="ruleForm.fdcq1.tdsyqr"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-form-item label="独用土地面积:">
<el-input disabled v-model="ruleForm.fdcq1.dytdmj"></el-input>
<el-input v-model="ruleForm.fdcq1.dytdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊土地面积:">
<el-input disabled v-model="ruleForm.fdcq1.fttdmj"></el-input>
<el-input v-model="ruleForm.fdcq1.fttdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格:">
<el-input disabled v-model="ruleForm.fdcq1.fdcjyjg"></el-input>
<div class="flex">
<el-input
v-model="ruleForm.fdcq1.fdcjyjg"
style="width: 500%"
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>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="附记:">
<el-input disabled v-model="ruleForm.fdcq1.fj"></el-input>
<el-input v-model="ruleForm.fdcq1.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -92,7 +145,8 @@
<fdcqxmTable
:ableOperation="viewEdit"
:tableData="ruleForm.fdcqxm"
@upDateTdytxxList="upDateTdytxxList" />
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
......@@ -100,7 +154,8 @@
<tdytTable
:ableOperation="viewEdit"
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList" />
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -108,8 +163,11 @@
<el-row :gutter="10">
<el-col :span="14" v-if="ruleForm.qlxx">
<el-form-item label="共有方式:">
<el-radio-group :disabled="!viewEdit" @change="showCZInfo"
v-model="ruleForm.sldy.gyfs">
<el-radio-group
:disabled="!viewEdit"
@change="showCZInfo"
v-model="ruleForm.sldy.gyfs"
>
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -119,43 +177,42 @@
</el-col>
<el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!viewEdit">
<el-radio-group v-model="ruleForm.sldy.sqfbcz" :disabled="!viewEdit">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="5"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-option
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" :tableData="ruleForm.qlrList" :disabled="!viewEdit"
:gyfs="ruleForm.slsq.gyfs" />
<qlrCommonTable
@upDateQlrxxList="upDateQlrxxList"
:tableData="ruleForm.qlrList"
:gyfs="ruleForm.slsq.gyfs"
/>
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
</div>
<qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateYwrxxList" :tableData="ruleForm.ywrList"
:gyfs="ruleForm.qlxx.gyfs" />
<qlrCommonTable
v-if="ruleForm.qlxx"
@upDateQlrxxList="upDateYwrxxList"
:tableData="ruleForm.ywrList"
:gyfs="ruleForm.qlxx.gyfs"
/>
</div>
<div class="slxx_title title-block">
登记原因
......@@ -164,9 +221,14 @@
<el-row :gutter="10">
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!viewEdit"
v-model="ruleForm.fdcq1.djyy">
</el-input>
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.djyy"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -181,212 +243,212 @@
</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 {
mixins: [ywmix],
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.qlxxdatas,
}
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
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() {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.qlxxdatas,
};
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
: this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
},
components: { qlrCommonTable, tdytTable, fdcqxmTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
data() {
return {
disabled: true,
tdytOption: [],
czrOptions: [],
ruleForm: {
flow: {
ywh: "",
},
qlxx: {
mj: "",
},
sldy: {
gyfs: "",
},
slsq: {},
fdcq1: {
zyjzmj: "",
ftjzmj: "",
},
zdjbxx: {
ghytmc: "",
},
},
//传递参数
propsParam: this.$attrs,
//表单是否可操作
viewEdit: false,
rules: {},
};
},
methods: {
/**
* @description: 更新土地用途信息
* @param {*} val
* @author: renchao
*/
upDateTdytxxList(val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
components: { qlrCommonTable, tdytTable, fdcqxmTable },
computed: {
...mapGetters(["dictData", "flag"]),
/**
* @description: 更新权利人信息
* @param {*} val
* @author: renchao
*/
upDateQlrxxList(val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
data () {
return {
disabled: true,
tdytOption: [],
czrOptions: [],
ruleForm: {
flow: {
ywh: ''
},
qlxx: {
mj: ''
},
sldy: {
gyfs: ''
},
slsq: {
},
fdcq1: {
zyjzmj: '',
ftjzmj: ''
},
zdjbxx: {
ghytmc: ''
}
},
//传递参数
propsParam: this.$attrs,
//表单是否可操作
viewEdit: false,
rules: {}
}
/**
* @description: showCZInfo
* @author: renchao
*/
showCZInfo() {
console.log(this.ruleForm.slsq.gyfs);
},
methods: {
/**
* @description: 更新土地用途信息
* @param {*} val
* @author: renchao
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
/**
* @description: 更新权利人信息
* @param {*} val
* @author: renchao
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
/**
* @description: showCZInfo
* @author: renchao
*/
showCZInfo () {
console.log(this.ruleForm.slsq.gyfs);
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
* @author: renchao
*/
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit () {
let arr = this.ruleForm.tdytqxList.filter(item => !item.yt)
if (arr.length > 0) {
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
* @author: renchao
*/
upDateYwrxxList(val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit() {
let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
if (arr.length > 0) {
this.$message({
showClose: true,
message: "土地用途不能为空",
type: "error",
});
return false;
}
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "土地用途不能为空",
message: "保存成功!",
type: "success",
});
this.$store.dispatch("user/refreshPage", true);
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
return false;
}
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
this.$store.dispatch('user/refreshPage', true);
} else {
this.$message({
showClose: true,
message: res.message,
type: "error"
})
}
})
}
}
}
});
},
},
};
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-form-item {
margin-bottom: 8px;
}
/deep/.el-form-item {
margin-bottom: 8px;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.slxx {
box-sizing: border-box;
}
.slxx {
box-sizing: border-box;
}
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
.submit_btn {
height: 50px;
}
.submit_btn {
height: 50px;
}
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
}
/deep/.el-form-item__label {
padding-bottom: 0px;
}
/deep/.el-form-item__label {
padding-bottom: 0px;
}
</style>
......
......@@ -102,7 +102,6 @@
:default-expand-level="1"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......