39b475c2 by 杨威

林权相关修改

1 parent 2eaddfbd
import request from '@/plugin/axios'
/**
* 根据bsm查询林权基本信息
*/
export function getQjLqDetailById(data) {
return request({
url: '/system/qjLq/getQjLqDetailById',
method: 'get',
params: {
id: data
}
})
}
\ No newline at end of file
......@@ -335,6 +335,10 @@
type: String,
default: "",
},
lq:{
type: String,
default: "",
}
},
data() {
return {
......@@ -386,9 +390,9 @@
yb: "",
zjh: "",
zjzlbsm: "",
lqqlrtype:""
},
glbsm:'',
rules:[],
};
},
......@@ -502,6 +506,8 @@
this.formData.dlrList[k].type=1;
this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]);
}
//林权权利人类型判断
this.formData.lqqlrtype = this.lq;
//如果是从更新按钮点击确定的则进行更新操作,如果不是,则进行添加操作
if(this.update){
console.log(this.formData)
......@@ -511,7 +517,6 @@
this.$message.success("修改完成!");
this.getQlrInfo(this.bsm);
this.update=false;
}
})
}else {
......@@ -671,12 +676,6 @@
} ,
deep:true
},
/* gyfsList:{
handler:function(v){
//console.log(v,"共有方式")
},
deep:true
},*/
dialogVisible(n){
if(n === false){
this.formData = {
......@@ -723,15 +722,6 @@
}
}
},
/* tableData(){
this.gyfsList = this.$store.state.gyfsList;
if(this.tableData.length>1){
for(let i = 0;i<this.gyfsList.length;i++){
let item = this.gyfsList[i];
this.gyfsList[i].disabled = item.mc === "单独所有";
}
}
},*/
"formData.qlrlxbsm":function (val) {
//console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
......@@ -740,32 +730,6 @@
this.$refs.qlrlxbsm.$el.style.border = '';
}
},
/* "formData.zjzlbsm":function (val) {
if (val != '') {
this.$refs.zjzlbsm.$el.style.border = '';
}
},
"formData.gyfsbsm":function (val) {
let ddsy = '';
for(let i = 0;i<this.gyfsList.length;i++){
if(this.gyfsList[i].mc === "单独所有"){
ddsy = this.gyfsList[i].bsm
}
}
if(ddsy === val){
if(this.update){
if(this.tableData.length > 1){
this.$message.warning("权利人人数大于1,不能选择单独所有")
}
}else{
if(this.tableData.length > 0){
this.$message.warning("权利人人数大于1,不能选择单独所有")
}
}
}
}*/
}
};
</script>
......@@ -822,7 +786,7 @@
.el-table--border::after,
.el-table--group::after,
.el-table::before {
background-color: #E6E6E6;
background-color: rgba(0, 0, 0, 0);
}
.el-table--border td,
.el-table--border th,
......@@ -844,6 +808,8 @@
}
.qlrTable {
border-color: #E6E6E6 !important;
border-bottom: 0;
border-right: 0;
position: relative;
top: -1px;
.el-input__inner {
......
......@@ -405,6 +405,7 @@ export default {
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
qlxzmc:"",
zhqlxzlx: "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质
list: [
{
......@@ -492,6 +493,7 @@ export default {
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
qlxzmc:"",
zhqlxzlx: "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质
list: [
{
......@@ -536,6 +538,7 @@ export default {
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
qlxzmc:"",
zhqlxzlx: "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质
list: [
{
......@@ -718,6 +721,8 @@ export default {
handler : function (newVal, oldVal) {
newVal.forEach((i,ind)=>{
if(i.qlxzdm != '' &&i.qlxzdm != null){
console.log(this.$refs.qlxzdm,'this.$refs.qlxzdm[ind]');
i.qlxzmc = this.$refs.qlxzdm[ind].name;
this.$refs.qlxzdm[ind].$el.style.border=""
}
i.list.forEach((item,index)=>{
......
......@@ -26,6 +26,10 @@ let bdcLxArray = [
value: "zd",
},
{
label: "林权",
value: "lq",
},
{
label: "自然幢",
value: "zrz",
},
......
......@@ -112,10 +112,10 @@ const constantRoutes = [
component: () => import("@/views/ybx/index"),
},
{
path: "/lh",
name: "林",
path: "/lq",
name: "林",
code: "1-3",
component: () => import("@/views/lh/index"),
component: () => import("@/views/lq/index"),
},
],
},
......
......@@ -315,7 +315,6 @@ export default {
s.hxjgList = s.hxjgList.length == 0 ?await this.getDicData("户型结构") : s.hxjgList;
s.fwjgList = s.fwjgList.length == 0 ?await this.getDicData("户型结构") : s.fwjgList;
s.gzwlxList = s.gzwlxList.length == 0 ?await this.getDicData("构(建)筑物类型") : s.gzwlxList;
s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions;
s.cbOptions = s.cbOptions.length == 0 ?await this.getDicData("房屋产别") : s.cbOptions;
s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions;
......
<template>
<div class="main">
林海调查表
</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<template>
<el-tabs v-model="activeName" class="tabs">
<el-tab-pane label="林权调查表" name="lhdcb"><Lhdcb></Lhdcb></el-tab-pane>
<el-tab-pane label="林权调查表" name="lqdcb"><Lqdcb></Lqdcb></el-tab-pane>
</el-tabs>
</template>
<script>
import { getQjZdjbxxDetailById } from "@api/zd";
import Lhdcb from "./lhdcb"
import Lqdcb from "./lqdcb"
export default {
name: "",
components: {
Lhdcb
Lqdcb
},
props: {},
data() {
return {
activeName:'lhdcb'
activeName:'lqdcb'
};
},
methods: {
getZdData(bsm) {
getQjZdjbxxDetailById(bsm).then((res) => {
if (res.success) {
console.log(res, "宗地信息");
this.isFldc = res.result.zdtzmbsm === "PSHGSBDCQJDC000000000000DC440010";
this.isTdcb = res.result.zdtzmbsm === ("PSHGSBDCQJDC000000000000DC440060" || "PSHGSBDCQJDC000000000000DC440070" ||"PSHGSBDCQJDC000000000000DC440080");
// getZdData(bsm) {
// getQjLqjbxxDetailById(bsm).then((res) => {
// if (res.success) {
// console.log(res, "宗地信息");
// this.isFldc = res.result.zdtzmbsm === "PSHGSBDCQJDC000000000000DC440010";
// this.isTdcb = res.result.zdtzmbsm === ("PSHGSBDCQJDC000000000000DC440060" || "PSHGSBDCQJDC000000000000DC440070" ||"PSHGSBDCQJDC000000000000DC440080");
}
});
},
// }
// });
// },
},
created() {},
mounted() {
this.getZdData(this.$route.query.bsm);
// this.getZdData(this.$route.query.bsm);
},
computed: {
lhbsm() {
......
<template>
<div class="main" ref="mainBox">
<table class="lqjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="12">
<div class="dw">
单位 :
<el-radio-group v-model="formData.mjdw">
<el-radio :label="3">平方米</el-radio>
<el-radio :label="6">公顷</el-radio>
<el-radio :label="9"></el-radio>
</el-radio-group>
</div>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">森林、林木所有权人</td>
<td colspan="10">
<Qlr
ref="qlrxxModule"
:bsm="$route.query.bsm"
:qszt="formData.qszt"
type="lq"
lq="1"
></Qlr>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">森林、林木使用权人</td>
<td colspan="10">
<Qlr
ref="qlrxxModule"
:bsm="$route.query.bsm"
:qszt="formData.qszt"
type="lx"
lq="2"
></Qlr>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">定着物类型</td>
<td colspan="4">
<el-select
name="qlsdfs"
class="formSelect"
:disabled="disabled"
v-model="formData.dzwlx"
>
<el-option
v-for="item in dzwlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td>
<td colspan="4" class="psr">
<input
name="zddm"
:disabled="disabled"
@blur="inputBlur($event)"
ref="zddm"
on
maxlength="19"
type="text"
class="formInput percent80"
v-model="formData.zddm"
/>
<el-button
type="warning"
:disabled="disabled"
class="createBtn"
@click="generatorCode"
>生成
</el-button>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">造林年度</td>
<td colspan="4">
<input
name="djh"
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.djh"
/>
</td>
<td colspan="2" class="tdright">
<i class="requisite">*</i>不动产单元号
</td>
<td colspan="4" class="psr">
<input
name="bdcdyh"
type="text"
:disabled="disabled"
@blur="inputBlur($event)"
ref="bdcdyh"
maxlength="28"
class="formInput"
v-model="formData.bdcdyh"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="10">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.zl"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">小地名</td>
<td colspan="10">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.xdm"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">林班</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.lb"
/>
</td>
<td colspan="2" class="tdright">小班</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.xb"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">面积</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.mj"
/>
</td>
<td colspan="2" class="tdright">起源</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.qy"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">株数</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.zs"
/>
</td>
<td colspan="2" class="tdright">主要树种</td>
<td colspan="4">
<input
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.zysz"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">林种</td>
<td colspan="10">
<el-radio-group class="fl" v-model="formData.lz">
<el-radio :label="1">防护林</el-radio>
<el-radio :label="2">用材林</el-radio>
<el-radio :label="3">经济林</el-radio>
<el-radio :label="4">薪炭林</el-radio>
<el-radio :label="5">特种用途体</el-radio>
</el-radio-group>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">林地使用起始时间</td>
<td colspan="2">
<el-date-picker
v-model="formData.ldsyqssj"
ref="tdsyqssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@blur="inputBlur($event, true)"
>
</el-date-picker>
</td>
<td colspan="2" class="tdright">林地使用期限</td>
<td colspan="2">
<input
type="text"
ref="syqx"
@blur="inputBlur($event, false)"
maxlength="3"
onkeyup="value=value.replace(/[^\d]/g,'')"
v-model="formData.syqx"
class="formInput"
/>
</td>
<td colspan="2" class="tdright">林地使用起始时间</td>
<td colspan="2">
<el-date-picker
v-model="formData.ldsyjssj"
ref="tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@blur="inputBlur($event, true)"
>
</el-date-picker>
</td>
</tr>
<tr >
<td colspan="2" rowspan="2" class="tdright">共有情况</td>
<td colspan="10" rowspan="2">
<input
class="formInput"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="formData.gyqk"
/>
</td>
</tr>
<tr></tr>
<tr rowspan="2">
<td colspan="2" class="tdright">审核意见</td>
<td colspan="10">
<input
class="formInput"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="formData.shyj"
/>
</td>
</tr>
<tr rowspan="2">
<td colspan="2" class="tdright">备注</td>
<td colspan="10">
<input
class="formInput"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="formData.bz"
/>
</td>
</tr>
</table>
<div class="header-button" :style="{ width: mainBoxWidth + 'px' }">
<el-button type="primary">保存</el-button>
</div>
</div>
</template>
<script>
import Qlr from "@components/formMenu/qlr";
import { getQjLqDetailById } from "@api/lq"
export default {
name: "",
components: {
Qlr,
},
props: {},
data() {
return {
disabled: false,
formData: {
mjdw: "",
zddm: "",
bdcdyh: "",
zl: "",
xdm: "",
lb: "",
xb: "",
mj: "",
qy: "",
zs: "",
zysz: "",
lz: "",
ldsyqssj: "",
syqx: "",
ldsyjssj: "",
gyqk: "",
shyj: "",
shrmc: "",
shsj: "",
bz: "",
},
dzwlxList: [
{
bsm: "1",
mc: "森林、林木",
},
{
bsm: "2",
mc: "其他",
},
],
mainBoxWidth: 0,
};
},
created() {},
mounted() {
this.getLqData(this.$route.query.bsm);
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
methods: {
inputBlur() {},
//查询林权基本信息
getLqData(bsm) {
getQjLqDetailById(bsm).then((res) => {
if (res.success) {
console.log(res, "林权信息");
}
});
},
},
computed: {},
watch: {},
};
</script>
<style scoped lang="less">
.main {
.lqjbxxTable {
margin: 0 0 50px 0;
background-color: #fff;
font-size: 14px;
width: 100%;
table-layout: fixed;
.dw {
float: right;
margin-right: 10px;
}
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td {
text-align: center;
height: 36px;
border-color: #e6e6e6;
}
/deep/ .el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
}
.percent68 {
width: 68% !important;
float: left;
position: relative;
top: 7px;
}
.el-radio-group {
margin-left: 10px;
}
.el-radio {
margin-right: 20px !important;
}
.el-input__icon {
line-height: 37px;
}
.el-select {
width: 100%;
}
}
.header-button {
z-index: 3;
height: 50px;
position: fixed;
bottom: 0;
right: 6px;
text-align: center;
background-color: #ffffff;
.el-button {
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn {
background-color: #00cacd;
border-color: #00cacd;
/deep/.iconfont {
font-size: 14px;
}
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, 0.8);
border-color: rgba(0, 202, 205, 0.8);
}
}
}
</style>
......@@ -137,7 +137,7 @@
</el-form>
<div class="handleBtn">
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
<el-button type="primary" class="w98 creat" @click="newLq">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
</el-tab-pane>
......@@ -315,6 +315,9 @@ export default {
if (this.$refs["ruleForm2"]) {
this.$refs["ruleForm2"].resetFields();
}
if (this.$refs["ruleForm3"]) {
this.$refs["ruleForm3"].resetFields();
}
},
handleClick(tab, event) {
console.log(tab, event);
......@@ -323,29 +326,6 @@ export default {
newZd() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
// insertQjZdjbxx(this.ruleForm)
// .then((res) => {
// console.log(res.result);
// if (res.code == "200") {
// this.getRightTree(res.result,'0,1,2');
// this.$message({
// message: "创建成功!",
// type: "success",
// });
// this.$store.state.zdbsm = res.result;
// //todo 跳转到宗地基本信息内容表页面 (预留)
// this.close();
// this.$router.push({
// path: '/zd', query:{
// source: 2,
// bsm:res.result
// }
// });
// } else {
// this.$message.error(res.message);
// }
// })
// .catch((error) => {});
let data = {
params:this.ruleForm,
workflowName:'新建宗地'
......@@ -390,34 +370,6 @@ export default {
if (valid) {
this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
// insertZrzjbxx(this.ruleForm1)
// .then((res) => {
// if (res.code == "200") {
// //获取左侧树数据
// this.$store.state.oldZdbsm = '';
// this.getTreeByBsm(res.result.bsm,'zrz','0,1,2');
// this.$message({
// message: "创建成功!",
// type: "success",
// });
// //todo 跳转到自然幢基本信息内容表页面 (预留)
// this.$store.state.zdbsm=res.result.zdbsm;
// this.$store.state.zrzbsm=res.result.bsm;
// this.$store.state.xmmc=res.result.xmmc;
// this.$store.state.newZdbsm = res.result.zdbsm;
// this.close();
// this.$router.push({
// path: '/zrz', query:{
// source: 1,
// bsm:res.result.bsm,
// auth: '0,1,2'
// }
// });
// } else {
// this.$message.error("创建失败!");
// }
// })
// .catch((error) => {});
let data = {
params:this.ruleForm1,
workflowName:'新建自然幢'
......@@ -431,13 +383,10 @@ export default {
message: "创建成功!",
type: "success",
});
this.close();
this.$store.state.zrzbsm = res.processInstance.title;
this.$nextTick(()=>{
this.loadCache(res.processInstance.title,'zrz');
})
// todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.$router.push({
path: '/zrz', query:{
......@@ -522,31 +471,6 @@ export default {
this.$refs['ruleForm2'].validate((valid) => {
if (valid) {
this.ruleForm2.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
// insertDzjbxx(this.ruleForm2)
// .then((res) => {
// if (res.code == "200") {
// this.getTreeByBsm(res.result.bsm,'dz','0,1,2');
// this.$message({
// message: "创建成功!",
// type: "success",
// });
// this.$store.state.zdbsm=res.result.zdbsm;
// this.$store.state.dzbsm=res.result.bsm;
// this.$store.state.xmmc=res.result.xmmc;
// this.$store.state.newZdbsm = res.result.zdbsm;
// this.close();
// this.$router.push({
// path: '/dz', query:{
// source: 1,
// bsm:res.result.bsm,
// auth: '0,1,2'
// }
// });
// } else {
// this.$message.error("创建失败!");
// }
// })
// .catch((error) => {});
let data = {
params:this.ruleForm2,
workflowName:'新建多幢'
......@@ -561,7 +485,6 @@ export default {
type: "success",
});
this.close();
this.$store.state.dzbsm = res.processInstance.title;
this.$nextTick(()=>{
this.loadCache(res.processInstance.title,'dz');
......@@ -589,6 +512,50 @@ export default {
});
},
newLq(){
this.$refs['ruleForm3'].validate((valid) => {
if (valid) {
this.ruleForm3.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
let data = {
params:this.ruleForm3,
workflowName:'新建林权'
};
createProcessInstance(data)
.then((res) => {
console.log(res);
if (res.needShow) {
this.getTreeByBsm(res.processInstance.title,"lq",'0,1,2');
this.$message({
message: "创建成功!",
type: "success",
});
this.close();
this.$store.state.dzbsm = res.processInstance.title;
this.$nextTick(()=>{
this.loadCache(res.processInstance.title,'lq');
})
// todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.$router.push({
path: '/lq', query:{
source: 1,
bsm:res.processInstance.title,
ywbsm:res.processInstance.businessId,
workitemInstanceId:res.workitemInstance.id,
auth: '0,1,2'
}
});
} else {
this.$message.error("创建失败");
}
})
.catch((error) => {});
} else {
console.log('error submit!!');
return false;
}
});
},
todo(){
this.$message({
message: "待开发",
......