d499b0ca by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2282194a ff0c5ac9
{
"TITLE": "不动产登记系统",
"SERVERAPI": "/bdcdj-th",
"SERVERAPI": "/bdcdj",
"IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
}
\ No newline at end of file
......
......@@ -180,6 +180,10 @@ div:focus {
}
}
.flex {
display: flex;
}
aside {
background: #eef1f6;
padding: 8px 24px;
......
<!--
功能:初始化功能描述
作者:calliope
-->
<template>
<div class='ywdialog'>
<el-link type="danger">{{formData.message}}</el-link>
<el-table
v-if="formData.result"
:data="formData.result"
height="200">
<el-table-column
prop="bdcdyh"
label="不动产单元号">
</el-table-column>
<el-table-column
prop="verifyErrorMessage"
label="状态">
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props: {
formData: {
type: Object,
default: {}
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
</style>
\ No newline at end of file
......@@ -9,16 +9,16 @@
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="义务人类型1" prop="sqrlx">
<el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
<el-form-item label="义务人类型" prop="ywrlx">
<el-select clearable v-model="ruleForm.ywrlx" class="width100" placeholder="请选择">
<el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名/名称" prop="sqrmc">
<el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input>
<el-form-item label="姓名/名称" prop="ywrmc">
<el-input v-model="ruleForm.ywrmc" maxlegth="15"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -157,8 +157,8 @@
return {
myValue: this.value,
ruleForm: {
sqrlx: "",
sqrmc: "",
ywrlx: "",
ywrmc: "",
zjzl: "",
zjh: "",
dh: "",
......@@ -178,8 +178,8 @@
dlrzjh: "",
},
rules: {
sqrlx: [{ required: true, message: "义务人类型", trigger: "change" }],
sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
ywrlx: [{ required: true, message: "义务人类型", trigger: "change" }],
ywrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
zjh: [{ required: true, message: "证件号", trigger: "blur" }],
},
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:41:20
-->
......@@ -70,7 +70,7 @@
}
},
{
prop: "sqrmc",
prop: "qlrmc",
label: "姓名/名称"
},
{
......@@ -121,7 +121,7 @@
this.$nextTick(() => {
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
qlrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
......
......@@ -42,7 +42,7 @@
<div>请选择查封不动产信息,请选择上手权利信息</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人:">
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
......@@ -59,7 +59,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利类型:">
<el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
......@@ -76,7 +76,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
......@@ -115,7 +115,7 @@
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="权利类型:">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
......@@ -141,6 +141,53 @@
<el-form-item label="不动产权证号:">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="登记机构:">
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封机关">
<el-input v-model="ruleForm.cfdj.cfjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封类型">
<el-select v-model="ruleForm.cfdj.cflx">
<el-option
v-for="item in dictData['A32']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封文号">
<el-input v-model="ruleForm.cfdj.cfwh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封起始时间">
<el-input v-model="ruleForm.cfdj.cfqssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封结束时间">
<el-input v-model="ruleForm.cfdj.cfjssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封期限">
<el-input v-model="ruleForm.cfdj.cfqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封范围">
<el-input v-model="ruleForm.cfdj.cffw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="区县代码:">
......@@ -152,6 +199,36 @@
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封业务号">
<el-input v-model="ruleForm.cfdj.jfywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封机关">
<el-input v-model="ruleForm.cfdj.jfjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封文件">
<el-input v-model="ruleForm.cfdj.jfwj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封文号">
<el-input v-model="ruleForm.cfdj.jfwh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封登簿人">
<el-input v-model="ruleForm.cfdj.jfdbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解封登记时间">
<el-input v-model="ruleForm.cfdj.jfdjsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登簿人:">
<el-input v-model="ruleForm.qlxx.dbr"></el-input>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-05 10:05:46
* @LastEditTime: 2023-07-05 16:15:28
-->
<template>
<!-- 受理信息 -->
......@@ -36,8 +36,8 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
抵押不动产情况
<div class="slxx_title title-block flex">
抵押不动产情况 <el-divider direction="vertical"></el-divider>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="抵押不动产信息:">
......
......@@ -203,7 +203,7 @@
/>
</div>
</div>
<el-row class="btn">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-04 15:04:59
* @LastEditTime: 2023-07-05 16:57:08
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -20,7 +20,6 @@
<script>
import { datas } from "../../javascript/zsyl.js";
import { getSlsqBdcqzList } from "@/api/bdcqz.js"
import { log } from 'bpmn-js-token-simulation';
export default {
name: "zsyl",
props: {
......
......@@ -5,15 +5,78 @@
-->
<template>
<div>
<lb-table
:column="InformationTable"
<el-table
:data="tableDataList"
border
:pagination="false"
:key="key"
:header-cell-style="{'text-align':'center'}"
:heightNumSetting="true"
:minHeight="150"
:data="tableDataList"
height="150"
style="width: 100%"
>
</lb-table>
<el-table-column
prop="index"
width="50"
:render-header="renderHeader"
>
<template slot-scope="scope">
<i
class="el-icon-minus pointer"
@click="deleClick(scope.$index, scope.row)"
></i>
</template>
</el-table-column>
<el-table-column prop="yt" label="土地用途" min-width="100">
<template slot-scope="scope">
<treeselect
v-model="tdyt"
noOptionsText="暂无数据"
placeholder=""
:show-count="true"
:options="dictData['tdyt']"
:normalizer="normalizer"
:appendToBody="true" z-index="9999"
@input="addrow(scope.row)"
/>
</template>
</el-table-column>
<el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
<template slot-scope="scope">
<el-date-picker
v-model='scope.row.qssj'
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
@blur="addrow(scope.row)">
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="jssj" label="土地使用结束时间" min-width="100">
<template slot-scope="scope">
<el-date-picker
v-model='scope.row.jssj'
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
@blur="addrow(scope.row)">
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="syqx" label="土地使用期限" min-width="100">
<template slot-scope="scope">
<el-input
class="item"
v-model="scope.row.syqx"
placeholder="请输入内容"
@blur="addrow(scope.row)">
></el-input>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
......@@ -32,6 +95,8 @@ export default {
},
data() {
return {
// 键名转换,方法默认是label和children进行树状渲染
tdyt:null,
key: 0,
newdata: {
yt: "",
......@@ -40,118 +105,15 @@ export default {
syqx: "",
},
tableDataList: [],
InformationTable: [
{
width: "50",
renderHeader: (h, scope) => {
return (
<div>
{" "}
{this.$route.query.viewtype == 1 ? (
"序号"
) : (
<i
class="el-icon-plus pointer"
onClick={() => {
this.addClick();
}}
></i>
)}
</div>
);
},
render: (h, scope) => {
return (
<div>
{this.$route.query.viewtype == 1 ? (
<span>{scope.$index + 1}</span>
) : (
<i
class="el-icon-minus pointer"
onClick={() => {
this.deleClick(scope.$index, scope.row);
}}
></i>
)}
</div>
);
},
},
{
label: "土地用途",
align: "center",
render: (h, scope) => {
return (
<el-select
value={scope.row.yt}
onChange={(val) => {
scope.row.yt = val;
}}
clearable
onblur={() => {
this.addrow(scope);
}}
>
{this.dictData["tdyt"].map((option) => {
return (
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
);
},
},
{
label: "土地使用起始时间",
render: (h, scope) => {
return (
<el-date-picker
v-model={scope.row.qssj}
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
onblur={() => {
this.addrow(scope.row);
}}
></el-date-picker>
);
},
},
{
label: "土地使用结束时间",
render: (h, scope) => {
return (
<el-date-picker
v-model={scope.row.jssj}
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
onblur={() => {
this.addrow(scope.row);
}}
></el-date-picker>
);
},
},
{
label: "土地使用期限",
render: (h, scope) => {
return (
<el-input
v-model={scope.row.syqx}
onblur={() => {
this.addrow(scope.row);
}}
></el-input>
);
},
},
],
normalizer(node) {
if (node.children == null || node.children == "null") {
delete node.children;
}
return {
id: node.dcode,
label: node.dname,
};
},
};
},
watch: {
......@@ -168,8 +130,18 @@ export default {
syqx: "",
},
]);
if( that.tableDataList.length>0){
this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
}else{
this.tdyt=null
}
} else {
that.tableDataList = _.cloneDeep(val);
if( that.tableDataList.length>0){
this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
}else{
this.tdyt=null
}
}
});
},
......@@ -178,21 +150,42 @@ export default {
},
},
methods: {
renderHeader() {
return (
<div>
{" "}
{this.$route.query.viewtype == 1 ? (
"序号"
) : (
<i
class="el-icon-plus pointer"
onClick={() => {
this.addClick();
}}
></i>
)}
</div>
);
},
// 修改事件
addrow() {
console.log("this.$parent.bsmqlxx",this.$parent.$parent.bsmqlxx);
this.tableDataList = this.tableDataList.map((item) => {
return{
...item,
yt:this.tdyt
}
})
this.$emit("upDateTdytxxList", this.tableDataList);
},
// 新增
addClick() {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
this.$emit("upDateTdytxxList", this.tableDataList);
},
// 删除
deleClick(index, row) {
console.log("删除");
this.$confirm("确定要删除吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -210,4 +203,8 @@ export default {
.el-input {
border: none !important;
}
/deep/.el-table__row{
border: none !important;
}
</style>
......
......@@ -15,7 +15,7 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="业务号:">
<el-form-item label="业务号111:">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
......@@ -131,14 +131,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="下拉表格测试:">
<select-table v-model="value2" :table-width="600" :props="props" @change="change">
<el-table-column prop="id" label="ID" width="180"></el-table-column>
<el-table-column prop="user" label="姓名"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<div class="slxx_title title-block">
......
......@@ -47,12 +47,13 @@
</template>
<script>
//首次登记
import jump from "./mixin/jump";
import store from '@/store/index.js'
import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
import jump from "./mixin/jump";
import { popupDialog, popupCacel } from "@/utils/popup.js";
import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
export default {
mixins: [table, jump],
props: {
......@@ -115,9 +116,8 @@
}
this.$popupCacel()
} else {
this.$message.error(res.message)
popupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
})
},
handleSelectionChange (val) {
......