Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
e0224a99 by tianhaohao@pashanhoo.com
Options

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

2 parents a6f47dc3 94734d5e
Expand all
Inline Side-by-side
Showing 11 changed files with 254 additions and 124 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",
......
......@@ -72,6 +72,19 @@ export function getBdcqljqtsx (data) {
}
/**
* @description: 获取土地所有权
* @param {*} data
* @author: renchao
*/
export function getTdsyqList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/djbDetail/getTdsyqList',
method: 'post',
data
})
}
/**
* @description: 获取建设用地使用权
* @param {*} data
* @author: renchao
......
/*
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:31:23
*/
......@@ -11,7 +11,7 @@ export function Init (data) {
let apiUrl = "";
switch (data.get("djlx")) {
case "100":
apiUrl = "/rest/ywbl/tdsyq/fristInit";
apiUrl = "/rest/ywbl/tdsyq/firstInit";
break;
case "200":
apiUrl = "/rest/ywbl/tdsyq/transferInit";
......
......@@ -7,12 +7,14 @@ import dialogBox from '@/components/DialogBox/dialogBox.vue'
import LbTable from '@/components/LbTable/lb-table.vue'
import Theme from '@/components/Theme/theme.vue'
import Popup from '@/components/Popup/index'
import Treeselect from '@riophae/vue-treeselect' //树形下拉框组件
import MessageBox from '@/components/MessageBox/index.js'
export default {
install: (Vue) => {
Vue.component('dialogBox', dialogBox);
Vue.component('lbTable', LbTable);
Vue.component('Theme', Theme);
Vue.component('Treeselect', Treeselect);
Vue.prototype.$popup = Popup.install;
Vue.prototype.$alertMes = MessageBox.alert;
}
......
......@@ -6,16 +6,18 @@
import Vue from 'vue'
import App from './App'
import 'normalize.css/normalize.css' // a modern alternative to CSS resets
import Element from 'element-ui'
import Element, { install } from 'element-ui'
import axios from 'axios'
import '@/styles/element-variables.scss'
import '@/styles/index.scss'
import Base from '@/components/Base/base' // 全局组件引入
import mixin from '@/utils/mixin/theme.js'
import Loading from '@/components/Loading/index.js';
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
Vue.mixin(mixin);
Vue.use(Loading.directive);
// 引入xml
import x2js from 'x2js'
Vue.prototype.$x2js = new x2js()
......
......@@ -71,6 +71,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权属状态：">
<el-select v-model="ruleForm.qlxx.qszt">
<el-option v-for="item in qsztlist" :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.qlxx.zl"></el-input>
......@@ -80,99 +88,21 @@
<el-form-item label="使用权面积：">
<el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
</el-form-item>
</el-col> <!--
<el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
<el-form-item label="独用土地面积：">
<el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
<el-form-item label="分摊土地面积：">
<el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
<el-form-item label="土地性质：" style="margin-bottom:3px">
<treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
:normalizer="normalizer"
:show-count="true" :options="dictData['A45']" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
<el-form-item label="房地产交易价格：">
<el-col :span="8">
<el-form-item label="取得价格：">
<div style="display:flex">
<el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
<el-select v-model="ruleForm.fdcq2.jedw">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%"></el-input>
<el-select v-model="ruleForm.jsydsyq.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-col :span="8">
<el-form-item label="规划用途：">
<el-select v-model="ruleForm.fdcq2.ghyt">
<el-option v-for="item in dictData['A17']" :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.fdcq2.pzyt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际用途：">
<el-input v-model="ruleForm.fdcq2.sjyt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质：">
<el-select v-model="ruleForm.fdcq2.fwxz">
<el-option v-for="item in dictData['A19']" :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-select v-model="ruleForm.fdcq2.fwjg">
<el-option v-for="item in dictData['A46']" :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.fdcq2.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数：">
<el-input v-model="ruleForm.fdcq2.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.fdcq2.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积：">
<el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
<el-form-item label="分摊建筑面积：">
<el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="竣工时间：">
<el-input v-model="ruleForm.fdcq2.jgsj"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="不动产权证号：">
......@@ -200,13 +130,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.fdcq2.fj"></el-input>
<el-input v-model="ruleForm.jsydsyq.fj"></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<div class="slxx_title title-block">
权利人信息
......@@ -271,6 +201,7 @@
</div>
</template>
<script>
import store from '@/store/index.js'
import { mapGetters } from "vuex";
import { init,save } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
......@@ -282,10 +213,31 @@ export default {
},
data() {
return {
// 键名转换，方法默认是label和children进行树状渲染
normalizer (node) { //方法
if (node.children == null || node.children == 'null') {
delete node.children;
}
return {
id: node.dcode,
label: node.dname
}
},
//表单是否可操作
propsParam: this.$attrs,
ableOperation: true,
key: 0,
// 权属状态
qsztlist: [
{
dcode: "1",
dname: "现势",
},
{
dcode: "2",
dname: "历史",
},
],
isShow: false,
disabled: true,
czrOptions: [],
......@@ -299,8 +251,13 @@ export default {
},
mounted() {},
methods: {
// 字典
getDictData (val) {
return store.getters.dictData[val]
},
loadData() {
console.log("建设用地使用权",this.propsParam);
console.log("this.getDictData('A30')",this.getDictData('A22'));
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
......
var qlxxPage = [
{ qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
{ qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
{ qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
{ qllx: "A02", id: "tdsyq", form: "tdsyq.vue", label: "国家土地所有权" },
{ qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
{ qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
{ qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
......@@ -52,7 +52,7 @@ export function loadTreeData(qlxxData, bdcdyh) {
treedata[1].children[0].children[0].children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx));
//抵押权
treedata[1].children[0].children[0].children.push(getNode("A37", qlxxData.diyaq, ''));
//地役权
//地役权
treedata[1].children[0].children[0].children.push(getNode("A19", qlxxData.diyiq, ''));
//预告登记
treedata[1].children[0].children[0].children.push(getNode("B40", qlxxData.ygdj, ''));
......
<template>
<div class="djxxTable">
<div class="tableBox">
<div class="title">
{{ title }}
<div class="checkbox">
<el-checkbox-group v-model="checkList" @change="checkChange">
<el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div class="xxTableBox rollTable">
<!-- 固定前三个 -->
<table class="xxTable">
<tr v-for="(item, colindex) in columns" :key="colindex">
<td>
{{ item.label }}
</td>
<td v-for="(row, index) in tableData" :key="index" :class="[
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
<span v-else> {{ row[item.prop] }}</span>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getTdsyqList } from "@/api/registerBook.js";
export default {
data () {
return {
title: "土地所有权信息",
qsztList: datas.columns().qsztList,
checkList: datas.columns().checkList,
//传递参数
propsParam: this.$attrs,
//列表数据
tableData: [],
//空列值个数
emptycolNum: datas.columns().emptycolNum,
//列名称对象
columns: datas.columns().JSYDSYQ,
};
},
created () {
this.loadData();
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getTdsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
qszt: this.checkList,
}).then((res) => {
if (res.code === 200) {
this.tableData = res.result;
this.tableData.forEach(item => {
item.sjlx = getSjlx(item.sjlx)
})
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
datas.columns().emptycolNum - this.tableData.length;
} else {
this.emptycolNum = 0;
}
}
});
},
checkChange () {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
} else {
this.loadData();
}
},
getQsztName (code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
name = item.label;
break;
}
}
return name;
},
// 新增一条补录信息
editDialog(row,del){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row,del)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
},
},
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
</style>
......@@ -69,7 +69,10 @@ export function getForm (tabName, djywbm) {
case "cfdjxx":
form = require("@/views/registerBook/cfdj.vue");
break;
case "jsydsyqQlxx":
case "tdsyqQlxx":
form = require("@/views/registerBook/tdsyq.vue");
break;
case "jsydsyqQlxx":
form = require("@/views/registerBook/jsydsyq.vue");
break;
case "nydsyqQlxx":
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:02
-->
......@@ -87,44 +87,52 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="取得价格：">
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" :disabled="$route.query.viewtype == '1'"
oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" :disabled="$route.query.viewtype == '1'">
<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 label="农用地面积：">
<el-input v-model="ruleForm.tdsyq.nydmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
<el-col :span="8">
<el-form-item label="耕地面积：">
<el-input v-model="ruleForm.tdsyq.gdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="林地面积：">
<el-input v-model="ruleForm.tdsyq.ldmj"></el-input>
</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.jsydsyq.tdsyqx"></el-input>
<el-form-item label="草地面积：">
<el-input v-model="ruleForm.tdsyq.cdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="使用权起止时间：">
<el-input disabled v-model="ruleForm.jsydsyq.syqqzsj"></el-input>
<el-col :span="8">
<el-form-item label="其他农用地面积：">
<el-input v-model="ruleForm.tdsyq.qtnydmj"></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="10">
<el-col>
<el-form-item label="附记：" prop="fj">
<el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype == '1'"></el-input>
<el-col :span="8">
<el-form-item label="建筑使用面积：">
<el-input v-model="ruleForm.tdsyq.jsydmj"></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积：">
<el-input v-model="ruleForm.tdsyq.wlydmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积单位：">
<el-input v-model="ruleForm.tdsyq.mjdw"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -177,7 +185,7 @@
<el-col>
<el-form-item label="登记原因：" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype"
v-model="ruleForm.jsydsyq.djyy">
v-model="ruleForm.tdsyq.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -304,4 +312,4 @@
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
\ No newline at end of file
</style>
......