2282194a by renchao@pashanhoo.com

Merge branch 'dev'

2 parents f042a339 66ce7671
{
"TITLE": "不动产登记系统",
"SERVERAPI": "/bdcdj",
"SERVERAPI": "/bdcdj-th",
"IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
}
\ No newline at end of file
......
......@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) {
*/
export function init (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params,
url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params.bsmRepair+'&isEdit='+params.isEdit,
method: 'get',
})
}
......@@ -92,6 +92,31 @@ export function save (data) {
}
/**
* @description: 获取上手信息
* @param {*} data
* @author: renchao
*/
export function getSsQlxx (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/getSsQlxx',
method: 'get',
params
})
}
/**
* @description: 获取主体信息
* @param {*} data
* @author: renchao
*/
export function getZtQlxx (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/getZtQlxx',
method: 'get',
params
})
}
/**
* @description: 发起业务申请流程
* @param {*} data
* @author: renchao
......
......@@ -4,12 +4,12 @@
* @Author: sakuya
* @Date: 2021年6月10日10:04:07
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-06-29 11:14:11
* @LastEditTime: 2023-07-05 10:39:17
-->
<template>
<el-select ref="select" v-model="defaultValue" :size="size" :clearable="clearable" :multiple="multiple" :collapse-tags="collapseTags"
:collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled" :filter-method="filterMethod"
:collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
@remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
<template #empty>
<div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading">
......@@ -19,14 +19,10 @@
<el-table ref="table" :data="tableData" :height="245" :highlight-current-row="!multiple" @row-click="click" @select="select" @select-all="selectAll">
<el-table-column v-if="multiple" type="selection" width="45"></el-table-column>
<el-table-column v-else type="index" width="45">
<template #default="scope"><span>{{scope.$index+(currentPage - 1) * pageSize + 1}}</span></template>
<template #default="scope"><span>{{scope.$index +1 }}</span></template>
</el-table-column>
<slot></slot>
</el-table>
<div class="sc-table-select__page">
<el-pagination small background layout="prev, pager, next" :total="total" :page-size="pageSize" v-model:currentPage="currentPage"
@current-change="reload"></el-pagination>
</div>
</div>
</template>
</el-select>
......@@ -48,29 +44,23 @@
disabled: { type: Boolean, default: false },
tableWidth: { type: Number, default: 400 },
mode: { type: String, default: "popover" },
props: { type: Object, default: () => { } }
props: { type: Object, default: () => { } },
// 表格数据
tableData: { type: Array, default: () => { [] } },
},
data () {
return {
loading: false,
keyword: null,
defaultValue: [],
tableData: [],
pageSize: config.pageSize,
total: 0,
currentPage: 1,
defaultProps: {
label: config.props.label,
value: config.props.value,
page: config.request.page,
pageSize: config.request.pageSize,
keyword: config.request.keyword
value: config.props.value
},
formData: {}
}
},
computed: {
},
watch: {
modelValue: {
......@@ -90,8 +80,6 @@
//表格显示隐藏回调
visibleChange (visible) {
if (visible) {
this.currentPage = 1
this.keyword = null
this.formData = {}
this.getData()
} else {
......@@ -100,58 +88,24 @@
},
//获取表格数据
async getData () {
this.loading = true;
var reqData = {
[this.defaultProps.page]: this.currentPage,
[this.defaultProps.pageSize]: this.pageSize,
[this.defaultProps.keyword]: this.keyword
}
Object.assign(reqData, this.formData)
// var res = await this.apiObj.get(reqData);
let res = {
code: 200,
data: {
total: 2, rows: [
{
user: 11111111111,
id: 111111111111
},
{
user: 2222222222222,
id: 22222222222
}
]
},
message: ""
}
var parseData = config.parseData(res)
this.tableData = parseData.rows;
this.total = parseData.total;
this.loading = false;
//表格默认赋值
this.$nextTick(() => {
if (this.multiple) {
this.defaultValue.forEach(row => {
var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value])
if (setrow.length > 0) {
this.$refs.table.toggleRowSelection(setrow[0], true);
}
})
} else {
if (this.multiple) {
this.defaultValue.forEach(row => {
var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value])
if (setrow.length > 0) {
this.$refs.table.toggleRowSelection(setrow[0], true);
}
})
} else {
if (this.defaultValue) {
var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue[this.defaultProps.value])
this.$refs.table.setCurrentRow(setrow[0]);
// this.$refs.table.setCurrentRow(setrow[0]);
}
this.$refs.table.setScrollTop(0)
})
}
// this.$refs.table.setScrollTop(0)
},
//插糟表单提交
formSubmit () {
this.currentPage = 1
this.keyword = null
this.getData()
},
//分页刷新表格
reload () {
this.getData()
},
//自动模拟options赋值
......@@ -162,7 +116,9 @@
item.currentLabel = item.value[this.defaultProps.label]
})
} else {
this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label]
if (this.defaultValue) {
this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label]
}
}
})
},
......@@ -207,6 +163,7 @@
this.defaultValue = row
this.$refs.select.blur()
this.autoCurrentLabel()
this.$refs.table.setCurrentRow(row);
this.$emit('update:modelValue', this.defaultValue);
this.$emit('change', this.defaultValue);
}
......@@ -225,14 +182,6 @@
findRowByKey (value) {
return this.tableData.find(item => item[this.defaultProps.value] === value)
},
filterMethod (keyword) {
if (!keyword) {
this.keyword = null;
return false;
}
this.keyword = keyword;
this.getData()
},
// 触发select隐藏
blur () {
this.$refs.select.blur();
......@@ -244,7 +193,6 @@
}
}
</script>
<style scoped>
.sc-table-select__table {
padding: 12px;
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-29 11:05:49
* @LastEditTime: 2023-07-05 09:48:23
*/
//表格选择器配置
......@@ -9,17 +9,12 @@ export default {
pageSize: 10, //表格每一页条数
parseData: function (res) {
return {
data: res.data,
rows: res.data.rows, //分析行数据字段结构
total: res.data.total, //分析总数字段结构
msg: res.message, //分析描述字段结构
code: res.code //分析状态字段结构
data: res.data
}
},
request: {
page: 'page', //规定当前分页字段
pageSize: 'pageSize', //规定一页条数字段
keyword: 'keyword' //规定搜索字段
},
props: {
label: 'label', //映射label显示字段
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 16:35:04
* @LastEditTime: 2023-07-04 16:07:37
-->
<template>
<div class="rlPopup">
......@@ -26,13 +26,13 @@
<el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
:on-change="handleChange"
accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
<el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype">上传</el-button>
<el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype && ableOperation">上传</el-button>
</el-upload>
<el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
v-if="!this.$route.query.viewtype && thumbnailImages.length>0">删除</el-button>
v-if="!this.$route.query.viewtype && thumbnailImages.length>0 && ableOperation">删除</el-button>
<div v-if="!this.$route.query.viewtype" class="pl-5">
<el-button type="primary" @click="handleOpenScan">{{scanTitle}}</el-button>
<el-button type="primary" @click="handleViewScan" v-if="isScan">拍照</el-button>
<el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button>
<el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
</div>
</div>
<ul>
......@@ -58,6 +58,10 @@
previewImg: {
type: Object,
default: () => { }
},
ableOperation: {
type: Boolean,
default: true
}
},
components: {
......
......@@ -13,7 +13,8 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="127px">
label-width="127px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -37,6 +38,62 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
查封不动产情况
<div>请选择查封不动产信息,请选择上手权利信息</div>
<div class="triangle"></div>
</div>
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件种类:">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件号:">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号:">
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积:">
<el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途:">
<el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
房地产权(独幢、层、套、间房屋)
<div class="triangle"></div>
</div>
......@@ -66,8 +123,12 @@
<el-col :span="8">
<el-form-item label="登记类型:">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -109,8 +170,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="共有方式:">
<el-radio-group
v-model="ruleForm.qlxx.gyqk">
<el-radio-group v-model="ruleForm.qlxx.gyqk">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -123,7 +183,8 @@
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.qlxx.gyfs"
/>
<div>
<div class="slxx_title title-block">
......@@ -134,7 +195,8 @@
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList" />
@upDateQlrxxList="upDateYwrxxList"
/>
</div>
</div>
<el-row class="btn">
......@@ -147,12 +209,12 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init,save } from "@/api/djbbl.js";
import { init, save } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable,ywrCommonTable,tdytTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -175,26 +237,27 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记",this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("查封登记", this.propsParam);
this.propsParam.isEdit = this.$parent.isEdit;
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm",this.ruleForm);
console.log("this.ruleForm", this.ruleForm);
this.isShow = true;
}
});
},
// 更新土地用途信息
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
console.log("val",val);
console.log("val", val);
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
this.czrOptions = this.ruleForm.qlrData;
this.key++;
},
......@@ -204,7 +267,7 @@ export default {
this.key++;
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
console.log("this.ruleForm大信息", this.ruleForm);
if (this.ruleForm.qlrData.length == 0) {
this.$message({
showClose: true,
......
......@@ -303,8 +303,9 @@
mounted () { },
methods: {
loadData () {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("地役权", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -392,7 +392,9 @@ export default {
mounted() {},
methods: {
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
console.log("房屋", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
if( this.ruleForm.tdytqxList.length>0){
......
......@@ -38,7 +38,7 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
国有建设用地使用权信息
建设用地、宅基地使用权信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -90,16 +90,42 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记原因:">
<el-input v-model="ruleForm.jsydsyq.djyy"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="房地坐落:">
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="使用权面积:">
<el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用权起始时间">
<el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用权结束时间">
<el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用期限">
<el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途">
<el-input v-model="ruleForm.jsydsyq.yt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格:">
<div style="display: flex">
......@@ -292,7 +318,8 @@ export default {
return store.getters.dictData[val];
},
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
if( this.ruleForm.tdytqxList.length>0){
......
......@@ -38,7 +38,7 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
房地产权(独幢、层、套、间房屋)
预告买卖登记信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -66,7 +66,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="登记原因:">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.ygdj.djyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -128,7 +128,7 @@
<el-col :span="8">
<el-form-item label="预告登记种类">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.ygdjlx">
<el-option
v-for="item in dictData['A29']"
:key="item.dcode"
......@@ -141,12 +141,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.ghyt">
<el-option
v-for="item in dictData['A17']"
:key="item.dcode"
......@@ -159,12 +159,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="用途名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.fwxz">
<el-option
v-for="item in dictData['A19']"
:key="item.dcode"
......@@ -177,12 +177,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.fwjg">
<el-option
v-for="item in dictData['A46']"
:key="item.dcode"
......@@ -195,62 +195,62 @@
</el-col>
<el-col :span="8">
<el-form-item label="所在层">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告业务号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告原因">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销时间">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额单位">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.jedw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="担保范围">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.dbfw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记:">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
<el-input v-model="ruleForm.ygdj.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -340,7 +340,8 @@ export default {
methods: {
loadData() {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -59,17 +59,17 @@
</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>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="登记原因:">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="登记类型:">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
......@@ -81,17 +81,17 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="不动产坐落:">
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="不动产权证号:">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="区县代码:">
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
......@@ -128,42 +128,42 @@
<el-col :span="8">
<el-form-item label="异议事项">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.yysx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议业务号">
<el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议原因">
<el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议登簿人">
<el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议登记时间">
<el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记:">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
<el-input v-model="ruleForm.yydj.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -252,8 +252,9 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("异议登记", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -109,6 +109,7 @@ export default {
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
isEdit:true,
// 弹框显示
dialogVisible: true,
//表单集合
......@@ -214,7 +215,7 @@ export default {
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
console.log("切换选项卡内容组件", tabname,this.tabList);
this.componentTag = getForm(tabname);
},
closefp() {
......
......@@ -111,6 +111,7 @@ export default {
tabName: "",
// 弹框显示
dialogVisible: true,
isEdit:false,
//表单集合
tabList: [],
type: "READ_ONLY",
......@@ -216,11 +217,9 @@ export default {
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
this.componentTag = getForm(tabname);
},
closefp() {
console.log("点击分屏");
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/set1tScreen", this.splitScreen);
this.getFromRouter(this.tabList[0].value);
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 15:34:44
* @LastEditTime: 2023-07-04 16:05:44
-->
<template>
<div class="clxx">
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -49,6 +49,8 @@
components: { clxxAddDialog, imagePreview },
data () {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
menuList: [
{
......@@ -214,6 +216,7 @@
...mapGetters(["dictData"])
},
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.clmlInitList()
},
methods: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 16:29:37
* @LastEditTime: 2023-07-05 09:55:42
-->
<template>
<div class="clxx">
......@@ -22,9 +22,11 @@
</div>
</div>
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()"
v-if="!this.$route.query.viewtype && ableOperation">新增</el-button>
</div>
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" :ableOperation="ableOperation" @updateList="updateList"
@nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -42,6 +44,8 @@
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
data () {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
iclass: "",
// 材料目录选中
......@@ -63,6 +67,7 @@
...mapGetters(["dictData"])
},
created () {
this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
this.clmlInitList(1)
},
methods: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-30 14:32:40
* @LastEditTime: 2023-07-04 15:04:59
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -20,6 +20,7 @@
<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: {
......@@ -57,7 +58,6 @@
}
},
mounted () {
debugger
this.columns = datas.columns();
if (this.formData.bdcqz) {
//从缮证进入
......
......@@ -65,9 +65,10 @@
</el-table-column>
<el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
<el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
<el-table-column label="创建时间" prop="createTime" width="160" align="center" />
<el-table-column label="办结时间" prop="endTime" width="160" align="center" />
<el-table-column label="操作方式" prop="businessName" align="center"/>
<el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="操作方式" prop="controls" align="center"/>
<el-table-column label="意见" prop="idea" align="center"/>
</el-table>
</div>
......@@ -118,6 +119,14 @@
this.clearViewer()
},
methods: {
formatDate(row, column) {
let data = row[column.property]
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
},
processReZoom () {
this.defaultZoom = 1
this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
......@@ -240,6 +249,7 @@
item.comments.forEach(element => {
if(element.type=="COMPLETE"){
this.formData.allCommentList[index].idea=element.message
this.formData.allCommentList[index].controls="完成"
}
});
this.formData.allCommentList[index].agent=item.assignee.name
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 14:42:24
* @LastEditTime: 2023-07-05 09:58:31
*/
import { getForm } from "../flowform";
import { getHomeNoticeList } from "@/api/home.js"
......@@ -38,6 +38,7 @@ export default {
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
console.log(item, 'item11111111111');
break;
}
}
......
......@@ -86,64 +86,64 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:">
<el-input disabled v-model="ruleForm.ssQlxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号:" prop="qlxx.bdcqzh">
<el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况:">
<el-input disabled v-model="ruleForm.ssQlxx.gyqk"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.gyqk"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人:" prop="qlxx.qlrmc">
<el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:">
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:">
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:" prop="qlxx.bdcdyh">
<el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:">
<el-input disabled v-model="ruleForm.ssQlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质:">
<el-input disabled v-model="ruleForm.ssQlxx.qlxzmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="用途:">
<el-input disabled v-model="ruleForm.ssQlxx.ytmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="面积:">
<el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -274,10 +274,10 @@
formdata.append("isEdit", this.ableOperation);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.$endLoading();
this.ruleForm = res.result;
this.ruleForm.diyaq.sfczjzhxz = "0";
}
this.$endLoading();
})
},
components: { qlrCommonTable },
......
......@@ -130,6 +130,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -207,6 +215,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -228,7 +237,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -246,6 +255,12 @@
}
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......@@ -258,6 +273,7 @@
this.ruleForm.ywrList = _.cloneDeep(val);
},
onSubmit () {
console.log("this.ruleForm",);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......
......@@ -133,6 +133,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -191,6 +199,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -214,7 +223,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -272,6 +281,12 @@
}
});
},
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......
......@@ -139,7 +139,7 @@
<el-col>
<el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
v-model="ruleForm.slsq.djyy">
v-model="ruleForm.fdcq2List[0].djyy">
</el-input>
</el-form-item>
</el-col>
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:58:04
-->
......@@ -124,6 +124,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -179,6 +187,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -198,7 +207,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -247,6 +256,12 @@
};
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:02
-->
......@@ -125,6 +125,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -194,6 +202,7 @@
<script>
import { mapGetters } from "vuex"
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
import tdytTable from "@/views/workflow/components/tdytTable";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
export default {
mounted () {
......@@ -214,7 +223,7 @@
})
})
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"])
},
......@@ -233,6 +242,12 @@
}
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
......@@ -281,6 +296,7 @@
})
}
}
console.log("this.ruleFormmmmmmmmm",this.ruleForm);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......@@ -304,4 +320,4 @@
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
\ No newline at end of file
</style>
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:49
-->
......@@ -127,6 +127,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -189,6 +197,7 @@
<script>
import { mapGetters } from "vuex";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
export default {
mounted () {
......@@ -206,7 +215,7 @@
this.$endLoading();
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"])
},
......@@ -228,6 +237,12 @@
};
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-29 11:13:35
* @LastEditTime: 2023-07-04 16:23:54
-->
<template>
<!-- 受理信息 -->
......@@ -88,41 +88,41 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="农用地面积:">
<el-input v-model="ruleForm.tdsyq.nydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.nydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="耕地面积:">
<el-input v-model="ruleForm.tdsyq.gdmj"></el-input>
<el-input v-model="ruleForm.tdsyq.gdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></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-input v-model="ruleForm.tdsyq.ldmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="草地面积:">
<el-input v-model="ruleForm.tdsyq.cdmj"></el-input>
<el-input v-model="ruleForm.tdsyq.cdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他农用地面积:">
<el-input v-model="ruleForm.tdsyq.qtnydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.qtnydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑使用面积:">
<el-input v-model="ruleForm.tdsyq.jsydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.jsydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积:">
<el-input v-model="ruleForm.tdsyq.wlydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.wlydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -141,7 +141,14 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -211,10 +218,11 @@
<script>
import { mapGetters } from "vuex"
import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
import tdytTable from "@/views/workflow/components/tdytTable";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
import selectTable from '@/components/selectTable/index.vue'
export default {
components: { qlrCommonTable, selectTable },
components: { qlrCommonTable, selectTable,tdytTable },
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
......@@ -262,7 +270,12 @@
}
},
methods: {
change () { },
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
......
......@@ -198,10 +198,9 @@
"/djbworkFrameview?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
item.bestepid +
"&bsmBusiness=" +
"&sqywbm=" +
item.djywbm
item.bestepid+
"&isEdit=" +
true
);
window.open(href, `urlname${item.bsmSlsq}`);
}else{
......
......@@ -256,12 +256,12 @@
type: 'success'
})
store.dispatch('user/refreshPage', true);
this.$popupCacel()
} else {
this.$message.error(res.message);
}
})
}
this.$popupCacel()
},
handleSelectionChange (val) {
this.bdcdysz = val
......
......@@ -30,8 +30,8 @@
</div>
<!-- 一并申请 -->
<div v-if="selectType == 'together'" class="right-situation el-card">
<div class="right-title">一并申请</div>
<ul>
<div class="right-title">一并申请</div>
<ul>
<li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
@dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
<dt>{{ item.nodename }}</dt>
......@@ -91,7 +91,7 @@
</div>
</template>
<script>
import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
export default {
data () {
return {
......@@ -147,13 +147,13 @@
if (this.selectType == 'amend') {
this.getRepairBiz();
}
if (this.selectType == 'together') {
if (this.selectType == 'together') {
getTogetherBiz().then(res => {
if (res) {
console.log("res", res);
this.djqxList = res.result;
}
})
if (res) {
console.log("res", res);
this.djqxList = res.result;
}
})
}
},
//权利类型菜单事件
......
......@@ -24,7 +24,7 @@
},
mounted () {
if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm,this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
this.router = this.loadView(view);
} else {
let view = queueDjywmc(this.$route.query?.sqywbm);
......@@ -33,6 +33,7 @@
},
methods: {
loadView (view) {
console.log(view, 'view');
return (r) =>
require.ensure([], () => r(require(`./components/${view}.vue`)));
},
......