Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
64c4bb30 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 83522ac7 77b4c474
Expand all
Inline Side-by-side
Showing 11 changed files with 214 additions and 93 deletions
......@@ -10,6 +10,7 @@
"dependencies": {
"@antv/g2": "^4.2.8",
"@babel/polyfill": "^7.12.1",
"@riophae/vue-treeselect": "^0.4.0",
"axios": "^0.21.1",
"bpmn-js": "^7.4.0",
"bpmn-js-properties-panel": "^0.37.2",
......
{
"TITLE": "不动产登记系统",
"SERVERAPI": "/bdcdj",
"SERVERAPI": "/bdcdj-ssq",
"ip": "http://192.168.2.38",
"IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
}
\ No newline at end of file
}
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:39:47
-->
......@@ -33,7 +33,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="证件号" prop="zjh">
<el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
<el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:39:47
-->
<template>
<dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
@closeDialog="closeDialog" :isButton="showButton">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
<el-row>
<el-col :span="12">
<el-form-item label="土地用途" prop="tdyt">
<el-input v-model="ruleForm.tdyt"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="土地使用权限" prop="syqx">
<el-input v-model="ruleForm.syqx"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="土地使用结束时间" prop="jssj">
<el-date-picker
v-model="ruleForm.jssj"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="土地使用起止时间" prop="qzsj">
<el-date-picker
v-model="ruleForm.qzsj"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</dialogBox>
</template>z x addTdyt
<script>
import { mapGetters } from "vuex";
export default {
props: {
value: { type: Boolean, default: false },
details: { type: Object, default: {} },
showButton: { type: Boolean, default: false }
},
data () {
return {
myValue: this.value,
ruleForm: {
tdyt:"",
syqx:"",
jssj:"",
qzsj:""
},
rules: {
tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
},
};
},
watch: {
value (val) {
console.log("val",val);
this.myValue = _.cloneDeep(val);
},
details: {
handler: function (val, oldVal) {
console.log("val2",val);
this.ruleForm = val;
},
deep: true,
},
},
methods: {
closeDialog () {
this.$emit("input", false);
this.$refs["ruleForm"].resetFields();
},
submitForm () {
console.log("this.ruleForm",this.ruleForm);
this.$refs.ruleForm.validate((valid) => {
if (valid) {
this.$emit("input", false);
this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
} else {
return false;
}
});
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/dialogBoxheader.scss";
.submit-button {
text-align: center;
height: 52px;
padding-top: 10px;
background-color: #fff;
}
</style>
......@@ -5,19 +5,19 @@
-->
<template>
<div>
<lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
<lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
:data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
<addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { getIdCardInfo } from '@/utils/operation.js'
import addQlr from './dialog/addQlr.vue'
import addTdyt from './dialog/addTdyt.vue'
export default {
components: {
addQlr
addTdyt
},
computed: {
...mapGetters(["dictData"]),
......@@ -29,10 +29,6 @@
return []
}
},
gyfs: {
type: String,
default: '1'
}
},
data () {
return {
......@@ -63,41 +59,64 @@
)
}
},
{
{
label: '土地用途',
align: 'center',
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
}
},
render: (h, scope) => {
return (
<el-select value={scope.row.yt}
onChange={(val) => { scope.row.yt = val }} clearable>
{
this.dictData['tdyt'].map(option => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
</el-select>
)
}
},
{
prop: "sqrmc",
label: "土地使用起始时间",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return (
<el-date-picker
v-model={scope.row.qssj}
type="date"
placeholder="选择日期"
></el-date-picker>
);
}
},
{
prop: "zjzl",
label: "土地使用结束时间",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
render: (h, scope) => {
return (
<el-date-picker
v-model={scope.row.jssj}
type="date"
placeholder="选择日期"
></el-date-picker>
);
}
},
{
prop: "zjh",
label: "土地使用期限",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return <el-input v-model={scope.row.syqx} ></el-input>
}
}
],
column: []
}
},
watch: {
tableData: {
handler: function (val, oldVal) {
console.log("什么事件111",val);
let that = this
this.$nextTick(() => {
if (val.length == 0 || !val) {
......@@ -115,29 +134,28 @@
immediate: true,
deep: true
},
gyfs: {
handler (newVal, oldValue) {
let dataList = _.cloneDeep(this.InformationTable)
if (newVal == 0) {
// this.column = _.cloneDeep(dataList).slice(1, dataList.length)
this.column = _.cloneDeep(dataList)
// gyfs: {
// handler (newVal, oldValue) {
// console.log("什么事件222",newVal);
// let dataList = _.cloneDeep(this.InformationTable)
// let dataList = _.cloneDeep(this.InformationTable)
// if (newVal == 0) {
// // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
// this.column = _.cloneDeep(dataList)
} else if ((newVal == '1' || newVal == '3')) {
this.column = dataList
} else {
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
label: "份数"
})
}
},
immediate: true
}
// } else if ((newVal == '1' || newVal == '3')) {
// this.column = dataList
// } else {
// this.column = _.cloneDeep(dataList)
// }
// },
// immediate: true
// }
},
methods: {
// 新增提交事件
handleupdateDetail (value) {
console.log("什么事件33",this.tableData);
if (this.isaddupdate) {
if (!_.isEqual(value, this.tableData)) {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
......@@ -154,7 +172,7 @@
// 新增
addClick () {
if (this.gyfs == '0' && this.tableDataList.length > 0) {
this.$message.warning("当前共有方式为单独所有，无法添加多个权利人")
this.$message.warning("1")
} else {
this.dialog = true
this.isaddupdate = true
......@@ -172,36 +190,12 @@
}).catch(() => {
});
},
// 身份证读取
readClick (row) {
getIdCardInfo().then(res => {
if (res.data.code == 0) {
let data = res.data.IDCardInfo
row.sqrmc = data.name
row.zjzl = '1'
row.zjh = data.cardID
row.xb = data.sexCode
row.txdz = data.address
row.fzjg = data.issueOrgan
this.$message({
message: '读取成功！',
type: 'success'
})
} else {
this.$message({
message: res.data.message,
type: 'warning'
})
}
})
},
// 修改
editClick (index, row) {
// popupDialog("申请人信息", "workflow/components/addQlr", {
// showButton: this.$route.query.viewtype ? false : true,
// dataIndex :index,
// details :row,
// details :row,/[^\d]/g
// isaddupdate :false
// });
this.dataIndex = index
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:43:10
-->
......@@ -314,6 +314,7 @@ export default {
async created() {
this.propsParam = this.$attrs;
this.ableEdit = this.$parent.showBatch;
this.ableOperation = this.$parent.currentSelectTab.ableOperation
if (this.propsParam.djlx == "400") {
this.isJfOperation = true;
}
......@@ -364,4 +365,4 @@ export default {
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
\ No newline at end of file
</style>
......
......@@ -191,7 +191,7 @@
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因：" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
v-model="ruleForm.sldy.djyy">
v-model="ruleForm.fdcq2.djyy">
</el-input>
</el-form-item>
</el-col>
......
......@@ -75,7 +75,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="房屋结构：">
<el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
......@@ -102,8 +102,8 @@
<el-form-item label="总层数：">
<el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -111,7 +111,7 @@
<el-row :gutter="10">
<el-col :span="14" v-if="ruleForm.qlxx">
<el-form-item label="共有方式：">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -155,8 +155,9 @@
import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
import { mapGetters } from "vuex";
export default {
mounted () {
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
this.$startLoading();
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -164,8 +165,9 @@
formdata.append("isEdit", this.ableOperation);
Init(formdata).then(res => {
if (res.code === 200 && res.result) {
this.$endLoading();
console.log(res.result.ygdj.ygdjzlmc);
this.ruleForm = res.result;
this.$endLoading();
}
})
},
......@@ -180,7 +182,13 @@
disabled: true,
tdytOption: [],
czrOptions: [],
ruleForm: {},
ruleForm: {
qlxx:{}
,sldy:{}
,slsq:{}
,ygdj:{}
,zdjbxx:{}
},
//传递参数
propsParam: this.$attrs,
rules: {},
......
......@@ -78,7 +78,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="房屋结构：">
<el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
......@@ -105,8 +105,8 @@
<el-form-item label="总层数：">
<el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -114,7 +114,7 @@
<el-row :gutter="10">
<el-col :span="14" v-if="ruleForm.qlxx">
<el-form-item label="共有方式：">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......
......@@ -54,21 +54,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号：">
<el-input disabled v-model="ruleForm.qlxxold.bdcqzh"></el-input>
<el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号：">
<el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input>
<el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利人：">
<el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
</el-col>
<el-col :span="8">
<el-form-item label="证件种类：">
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
......@@ -79,8 +79,8 @@
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="房屋面积：">
<el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input>
......@@ -97,7 +97,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="房屋取得价格：">
<el-input disabled v-model="ruleForm.ssQlxx.qdjg"></el-input>
......@@ -132,10 +132,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-row :gutter="10">
<el-col :span="16">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
<el-input v-model="ruleForm.ygdj.dbfw"
<el-input v-model="ruleForm.ygdj.sfczjzhxz"
:disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
</el-form-item>
</el-col>
......@@ -145,7 +145,7 @@
:disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
......@@ -161,7 +161,7 @@
<el-row :gutter="10">
<el-col :span="14" v-if="ruleForm.qlxx">
<el-form-item label="共有方式：">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......