Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
379930e8 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 42e3dbde 52f6e7a0
Inline Side-by-side
Showing 5 changed files with 89 additions and 60 deletions
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-09-18 11:00:38
* @LastEditTime: 2023-09-19 16:13:24
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -75,7 +75,7 @@
isRefresh: {
handler (newVal, oldVal) {
if (newVal) {
this.loadBdcdylist()
this.loadBdcdylist(true)
}
},
immediate: true
......@@ -86,7 +86,7 @@
* @description: 读取申请单元信息
* @author: renchao
*/
loadBdcdylist () {
loadBdcdylist (status = false) {
let that = this
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
......@@ -104,6 +104,7 @@
that.currentSelectProps = res.result[0];
that.$emit('getCurrentSelectProps', this.currentSelectProps);
that.judgeBatchShow();
if (!status) {
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
......@@ -114,6 +115,7 @@
}
}
}
}
})
} else {
leftMenu(formdata).then((res) => {
......@@ -123,6 +125,7 @@
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
if (!status) {
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
......@@ -133,6 +136,7 @@
}
}
}
}
})
}
},
......
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2023-09-15 15:02:25
* @LastEditTime: 2023-09-19 16:15:15
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -88,7 +88,7 @@
watch: {
isRefresh: {
handler (newVal, oldVal) {
if (newVal) this.loadBdcdylist()
if (newVal) this.loadBdcdylist(true)
},
immediate: true
}
......@@ -98,7 +98,7 @@
* @description: 读取申请单元信息
* @author: renchao
*/
loadBdcdylist () {
loadBdcdylist (status = false) {
let that = this
var formdata = new FormData();
// 受理申请标识码
......@@ -114,6 +114,7 @@
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
if (!status) {
if (sessionStorage.getItem('keyPath')) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
......@@ -124,6 +125,7 @@
}
}
}
}
})
} else {
leftMenu(formdata).then((res) => {
......@@ -133,6 +135,7 @@
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
if (!status) {
if (sessionStorage.getItem('keyPath')) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
......@@ -143,6 +146,7 @@
}
}
}
}
})
}
},
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-09-15 16:09:33
* @LastEditTime: 2023-09-19 16:42:02
-->
<template>
<div class="slxx">
......@@ -400,7 +400,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="viewEdit">
<el-row class="btn" v-if="isSave">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -440,8 +440,14 @@
}
});
this.czrOptions = this.ruleForm.qlrList;
this.isSave = this.viewEdit
} else {
this.$message.error(res.message);
this.isSave = false
this.$confirm(res.message, '提示', {
cancelButtonText: '取消',
showConfirmButton: false,
type: 'warning'
})
}
}).catch(() => {
this.loading = false
......@@ -453,6 +459,7 @@
},
data () {
return {
isSave: true,
loading: false,
mjdw: "1",
// 键名转换，方法默认是label和children进行树状渲染
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 15:44:16
* @LastEditTime: 2023-09-19 17:19:32
-->
<template>
<!-- 受理信息 -->
......@@ -15,7 +15,7 @@
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px">
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
申请业务信息
<div class="triangle"></div>
......@@ -70,9 +70,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利性质">
<el-form-item label="权利性质：">
<treeselect
v-model="ruleForm.zdjbxx.qlxzmc"
v-model="ruleForm.zdjbxx.qlxz"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
......@@ -192,7 +192,7 @@
v-for="(item, index) in czrOptions"
:key="index"
:label="item.sqrmc"
:value="item.zjh">
:value="item.sxh">
</el-option>
</el-select>
</el-form-item>
......@@ -264,18 +264,26 @@
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
this.loading = false
this.$nextTick(() => {
setTimeout(() => {
that.loading = false
}, 200)
if (res.code === 200) {
that.ruleForm = res.result;
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
that.czrOptions = that.ruleForm.qlrList;
that.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.czr = item.zjh
console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
that.czr = item.sxh
}
})
that.isSave = that.viewEdit
} else {
that.isSave = false
that.$confirm(res.message, '提示', {
cancelButtonText: '取消',
showConfirmButton: false,
type: 'warning'
})
}
}).catch(() => {
this.loading = false
})
......@@ -294,6 +302,7 @@
},
data () {
return {
isSave: true,
// 键名转换，方法默认是label和children进行树状渲染
normalizer (node) {
//方法
......@@ -311,7 +320,6 @@
viewEdit: true,
czr: "",
key: 0,
isShow: false,
disabled: true,
czrOptions: [],
ruleForm: {},
......@@ -342,7 +350,7 @@
this.key++;
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
if (item.sxh == this.czr) {
this.num++
}
})
......@@ -428,7 +436,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == that.czr) {
if (item.sxh == that.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 15:30:04
* @LastEditTime: 2023-09-19 17:02:47
-->
<template>
<!-- 受理信息 -->
......@@ -9,12 +9,12 @@
<el-form
:model="ruleForm"
:rules="rules"
class="loadingtext"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px">
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
申请业务信息
<div class="triangle"></div>
......@@ -85,8 +85,6 @@
<el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="农用地面积：">
<div class="flex">
......@@ -109,6 +107,8 @@
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="耕地面积：">
<div class="flex">
......@@ -153,8 +153,6 @@
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="草地面积：">
<div class="flex">
......@@ -177,6 +175,8 @@
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="其他农用地面积：">
<div class="flex">
......@@ -221,8 +221,6 @@
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积：">
<div class="flex">
......@@ -292,9 +290,9 @@
:disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:key="item.sxh"
:label="item.sqrmc"
:value="item.zjh">
:value="item.sxh">
</el-option>
</el-select>
</el-form-item>
......@@ -362,31 +360,42 @@
this.propsParam = this.$attrs;
var formdata = new FormData();
let that = this;
this.$startLoading();
this.loading = true
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
this.$nextTick(() => {
setTimeout(() => {
this.loading = false
}, 200)
if (res.code === 200) {
that.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.czr = item.zjh
that.czrOptions = that.ruleForm.qlrList;
that.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == '1') {
that.czr = item.sxh
}
});
});
});
})
this.isSave = this.viewEdit
} else {
this.isSave = false
this.$confirm(res.message, '提示', {
cancelButtonText: '取消',
showConfirmButton: false,
type: 'warning'
})
}
}).catch(() => {
this.loading = false
})
},
computed: {
...mapGetters(["dictData", "flag"]),
},
data () {
return {
isSave: true,
loading: false,
// 键名转换，方法默认是label和children进行树状渲染
normalizer (node) {
//方法
......@@ -412,7 +421,6 @@
//表单是否可操作
viewEdit: true,
key: 0,
isShow: false,
disabled: true,
czrOptions: [],
czr: "",
......@@ -442,7 +450,7 @@
this.czrOptions = this.ruleForm.qlrList;
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
if (item.sxh == this.czr) {
this.num++
}
})
......@@ -450,7 +458,6 @@
this.czr = ''
}
},
// 更新义务人信息
/**
* @description: 更新义务人信息
* @param {*} val
......@@ -460,7 +467,6 @@
this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
this.key++;
},
// 是否持证人变化
/**
* @description: 是否持证人变化
* @param {*} val
......@@ -518,23 +524,23 @@
//是
this.ruleForm.qlrList.forEach((item, index) => {
item.sfczr = "1";
});
})
} else {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
type: "error",
});
return false;
type: "error"
})
return false
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == that.czr) {
item.sfczr = "1";
if (item.sxh == that.czr) {
item.sfczr = "1"
} else {
item.sfczr = "0";
item.sfczr = "0"
}
});
})
}
}
/**
......