06e7bb26 by tianhaohao@pashanhoo.com

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

2 parents 473ecc96 c77e2de0
import { log } from "bpmn-js-token-simulation";
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-15 11:02:38
*/
var qlxxPage = [
{ qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
{ qllx: "A02", id: "tdsyq", form: "tdsyq.vue", label: "国家土地所有权" },
......@@ -41,7 +43,7 @@ var qlxxPage = [
];
//组装登记簿树形结构
export function loadTreeData(qlxxData) {
export function loadTreeData (qlxxData, index) {
let treedata = [];
//加载封面
treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
......@@ -74,19 +76,19 @@ export function loadTreeData(qlxxData) {
* @param {*} bdcdylx
* @author: renchao
*/
export function getNode(qllx, qlxx, bdcdylx) {
export function getNode (qllx, qlxx, bdcdylx) {
let node;
for (var i = 0; i < qlxxPage.length; i++) {
if (qlxxPage[i].qllx == qllx) {
if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
if (bdcdylx == "4") {
node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label};
node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label };
} else {
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label };
}
} else {
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label };
}
break;
}
......
......@@ -170,7 +170,7 @@
label="业务号:"
prop="qlxx.ywh"
:rules="rules.ywhrules">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
<el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -317,7 +317,7 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="解封业务号:">
<el-input v-model="ruleForm.qlxx.zxywh"></el-input>
<el-input maxlength="11" v-model="ruleForm.qlxx.zxywh"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -196,7 +196,7 @@
label="业务号:"
prop="qlxx.ywh"
:rules="rules.ywhrules">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
<el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -243,6 +243,7 @@
<el-form-item label="被担保主债权数额:">
<div style="display: flex">
<el-input
maxlength="11"
v-model="ruleForm.diyaq.bdbzzqse"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
......@@ -262,6 +263,7 @@
<el-form-item label="抵押面积:">
<div class="flex">
<el-input
maxlength="13"
v-model="ruleForm.diyaq.dymj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.diyaq.mjdw" style="width: 20%">
......@@ -338,7 +340,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="债务履行期限(确定期间):">
<el-input v-model="ruleForm.diyaq.dyqx"></el-input>
<el-input maxlength="10" v-model="ruleForm.diyaq.dyqx"></el-input>
</el-form-item>
</el-col>
......@@ -419,7 +421,7 @@
<el-col :span="24">
<el-form-item label="登记原因:">
<el-input v-model="ruleForm.qlxx.djyy"></el-input>
<el-input v-model="ruleForm.diyaq.djyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -429,7 +431,7 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销抵押业务号:">
<el-input v-model="ruleForm.diyaq.zxdyywh"></el-input>
<el-input maxlength="10" v-model="ruleForm.qlxx.zxywh"></el-input>
</el-form-item>
</el-col>
......
......@@ -164,7 +164,7 @@
prop="qlxx.ywh"
:rules="rules.ywhrules"
>
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
<el-input maxlength="20" v-model="ruleForm.qlxx.ywh" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -80,7 +80,7 @@
label="业务号:"
prop="qlxx.ywh"
:rules="rules.ywhrules">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
<el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -137,6 +137,7 @@
<el-form-item label="使用权面积:">
<div class="flex">
<el-input
maxlength="12"
v-model="ruleForm.jsydsyq.syqmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
......@@ -151,29 +152,20 @@
</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 label="使用权起止时间:">
<el-input maxlength="20" v-model="ruleForm.jsydsyq.syqqzsj"></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 label="土地使用期限:">
<el-input maxlength="10" v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格:">
<div style="display: flex">
<el-input
maxlength="11"
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 09:51:37
* @LastEditTime: 2023-08-15 10:39:19
-->
<template>
<div class="bdcqldjml">
......@@ -18,7 +18,7 @@
</tr>
<tr v-for="(item, index) in bdcqlml" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.bdcdyh }}</td>
<td><el-link type="primary" @click="handleSelectBdcdyh(item.bdcdyh)" :underline="false">{{ item.bdcdyh }} </el-link></td>
<td>{{ item.bdclx }}</td>
<td>{{ item.szbs }}</td>
<td>{{ item.bz }}</td>
......@@ -30,19 +30,25 @@
<script>
import { getBdcqldjmlByBdcdyid } from "@/api/djbDetail.js";
export default {
props: ["formData"],
data () {
return {
bdcqlml: [],
propsParam: this.$attrs,
};
propsParam: this.$attrs
}
},
mounted () {
getBdcqldjmlByBdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code === 200) {
this.bdcqlml = res.result;
}
});
})
},
methods: {
handleSelectBdcdyh (val) {
this.$emit('getBdcdyh', val);
}
}
};
</script>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-10 16:28:55
* @LastEditTime: 2023-08-15 10:57:30
-->
<template>
<div class="content">
......@@ -11,7 +11,7 @@
</el-tree>
</div>
<div class="right">
<component :is="componentTag" v-bind="currentSelectProps" />
<component :is="componentTag" @getBdcdyh="getBdcdyh" v-bind="currentSelectProps" />
</div>
</div>
</template>
......@@ -42,17 +42,21 @@
},
props: ["formData"],
mounted () {
this.loadData();
this.loadData(this.formData.bdcdyh);
},
methods: {
getBdcdyh (val) {
console.log(val, ';222222222222');
// this.loadData(val);
},
/**
* @description: loadData
* @author: renchao
*/
loadData () {
loadData (val) {
getBdcqljqtsx({
bdcdyid: this.formData.bdcdyid,
bdcdyh: this.formData.bdcdyh,
bdcdyh: val,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
......@@ -60,15 +64,15 @@
this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, this.formData.bdcdylx || "");
this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
this.loadComponent(this.defaultNode.form);
});
})
}
});
})
this.currentSelectProps = {
bdcdyid: this.formData.bdcdyid,
bdcdyh: this.formData.bdcdyh,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
};
bsmQlxx: this.formData.bsmQlxx
}
},
/**
* @description: handleNodeClick
......@@ -86,12 +90,11 @@
* @author: renchao
*/
loadComponent (form) {
console.log(form, 'formformformform');
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
require.ensure([], () => r(require("@/views/registerBook/" + form)))
}
}
}
};
</script>
<style scoped lang="scss">
/deep/.rollTable {
......
......@@ -11,7 +11,7 @@ var qlxxPage = [
{ qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
{ qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
{ qllx: "A11", id: "ldsyq", form: "ldsyq.vue", label: "林地使用权" },
{ qllx: "A12", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/森林、林木使用权" },
{ qllx: "A12", id: "sllmsyq", form: "sllmsyq.vue", label: "林地使用权/森林、林木使用权" },
{ qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
{ qllx: "A14", id: "jsydsyq", form: "jsydsyq.vue", label: "水域滩涂养殖权" },
{ qllx: "A15", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权" },
......
<!--
* @Author: yangwei
* @Date: 2023-08-15 14:15:06
* @LastEditors: yangwei
* @LastEditTime: 2023-08-15 14:15:19
* @FilePath: \bdcdj-web\src\views\registerBook\sllmsyq.vue
* @Description:
*
* Copyright (c) 2023 by yangwei, All Rights Reserved.
-->
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-11 15:33:53
-->
<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' : '',
row.qlzt == '4' ? 'linshi' : '',
item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
]"
>
<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.qlzt == '1'">有效</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</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 { getLqList } from "@/api/djbDetail.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().LDSYQ,
};
},
created() {
this.loadData();
},
methods: {
/**
* @description: loadData
* @author: renchao
*/
loadData() {
if (this.$parent.addRepairRecord) {
this.columns.unshift({
prop: "cz",
label: "操作",
});
}
getLqList({
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;
}
}
});
},
/**
* @description: checkChange
* @author: renchao
*/
checkChange() {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
} else {
this.loadData();
}
},
/**
* @description: getQsztName
* @param {*} code
* @author: renchao
*/
getQsztName(code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
name = item.label;
break;
}
}
return name;
},
// 新增一条补录信息
/**
* @description: 新增一条补录信息
* @param {*} row
* @param {*} del
* @author: renchao
*/
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>
\ No newline at end of file
......@@ -20,7 +20,7 @@
</div>
<el-row :gutter="10" v-if="ruleForm.slsq">
<el-col :span="8">
<el-form-item label="业务号111:">
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
......@@ -253,7 +253,6 @@
if (res.code == 200) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
console.log("ruleForm.sldyList[0].gyfsssssssssssssssssssss",this.ruleForm.sldyList[0].gyfs);
this.gyfs=this.ruleForm.sldyList[0].gyfs
this.splicingFdcq2Info();
}
......@@ -316,6 +315,25 @@
* @author: renchao
*/
onSubmit () {
if (this.ruleForm.sldyList[0].gyfs== "0") {
if (this.ruleForm.qlrList.length > 1) {
this.$message({
showClose: true,
message: "共有方式:单独所有,权利人只能是一个人",
type: "error",
});
return false;
}
} else {
if (this.ruleForm.qlrList.length <= 1) {
this.$message({
showClose: true,
message: "共有方式:共同所有,按份所有,其他所有,权利人必须是两个以上",
type: "error",
});
return false;
}
}
saveBatchData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-15 14:01:37
-->
<template>
<div class="from-clues">
<!-- 表单部分 森林林木 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="宗地代码">
<el-input placeholder="请输入宗地代码" maxlength="19" v-model="queryForm.zddm" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" class="btnColRight">
<el-form-item>
<!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
</div>
<div class="submit_button">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
</template>
<script>
//首次登记
import jump from "./mixin/jump";
import store from '@/store/index.js'
import table from "@/utils/mixin/table";
import { ywPopupDialog } from "@/utils/popup.js";
import { selectZdjbxx } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
export default {
mixins: [table, jump],
props: {
isJump: { type: Boolean, default: false },
sqywInfo: { type: Object, default: () => { } },
},
data () {
return {
loading: false,
queryForm: defaultParameters.defaultParameters(),
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
bdcdysz: [],
};
},
mounted () {
sendThis(this);
},
methods: {
/**
* @description: queryClick
* @author: renchao
*/
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
this.tableData.total = total;
this.tableData.data = records;
}
});
},
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
if (this.bdcdysz.length == 0) {
this.$alert("请至少选择一条数据");
return;
}
this.loading = true
startBusinessFlow({
bsmSqyw: this.bsmSqyw,
bdcdysz: this.bdcdysz,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
}).then((res) => {
this.loading = false
if (res.code == 200) {
this.$message({
showClose: true,
message: "发起申请成功",
type: "success",
});
if (!this.isJump) {
this.jump(res.result, this.djywbm);
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
}
}).catch(() => {
this.loading = false
})
},
/**
* @description: handleSelectionChange
* @param {*} val
* @author: renchao
*/
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsm = item.zdbsm;
});
if (this.sqywInfo.sqywdylx == "1") {
if (val.length > 1) {
this.bdcdysz = [...val[val.length - 1]];
} else {
this.bdcdysz = val;
}
} else {
this.bdcdysz = val;
}
},
/**
* @description: select
* @param {*} selection
* @param {*} row
* @author: renchao
*/
select (selection, row) {
if (this.sqywInfo.sqywdylx == "1") {
// 清除 所有勾选项
this.$refs.table.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length == 0) return
this.$refs.table.toggleRowSelection(row, true);
}
},
/**
* @description: handleRowClick
* @param {*} row
* @author: renchao
*/
handleRowClick (row) {
// 如果状态是1,那就是单选
if (this.sqywInfo.sqywdylx == "1") {
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if (bdcdysz.length == 1) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
} else {
this.$refs.table.toggleRowSelection(row);
}
},
/**
* @description: openBook
* @param {*} row
* @author: renchao
*/
openBook (row) {
var param = {
bdcdyid: row.bdcdyid,
qllx: row.qllx,
bdcdyh: row.bdcdyh,
bsmQlxx: row.bsmQlxx,
};
this.$popup("登记簿详情", "registerBook/djbFrame", {
formData: param
})
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
</style>
......@@ -108,6 +108,9 @@ export function queueDjywmc (djywbm, djqxbm) {
case "A11400"://林地使用权变更
vm = "selectLqqt";
break;
case "A12100"://森林林木首次
vm = "selectSllm";
break;
default:
vm = "selecBdcql";
break;
......