fe55fa78 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 6719902e 69a283c9
......@@ -54,7 +54,9 @@ service.interceptors.response.use(
*/
if (response.status == 200) {
return response.data;
} else {
}else if (response.status == 2002){
Message.error(response.message);
}else {
handleErrorData(response.data);
}
return response;
......
......@@ -24,6 +24,116 @@ class data extends filter {
label: "历史",
},
],
TDSYQ: [
{
prop: "qszt",
label: "权属状态",
},
{
prop: "sjlx",
label: "数据类型",
},
{
prop: "qllxmc",
label: "权利类型",
},
{
prop: "djlxmc",
label: "登记类型",
},
{
prop: "ssywh",
label: "上手业务号",
},
{
prop: "dah",
label: "档案号",
},
{
prop: "ywh",
label: "业务号",
},
{
prop: "bdcdyh",
label: "不动产单元号",
},
{
prop: "zl",
label: "坐落",
},
{
prop: "gyqk",
label: "共有情况",
},
{
prop: "qlrlx",
label: "权利人类型",
},
{
prop: "qlrmc",
label: "权利人",
},
{
prop: "qlrzjzl",
label: "证件种类",
},
{
prop: "qlrzjhm",
label: "证件号",
},
{
prop: "ytmc",
label: "土地用途",
},
{
prop: "mjdw",
label: "面积单位",
},
{
prop: "gdmj",
label: "耕地面积",
},
{
prop: "ldmj",
label: "林地面积",
},
{
prop: "cdmj",
label: "草地面积",
},
{
prop: "qtnydmj",
label: "其他农用地面积",
},
{
prop: "jsydmj",
label: "建设用地面积",
},
{
prop: "wlydmj",
label: "未利用地面积",
},
{
prop: "djyy",
label: "登记原因",
},
{
prop: "bdcqzh",
label: "不动产权证号",
},
{
prop: "djsj",
label: "登记时间",
},
{
prop: "dbr",
label: "登簿人",
},
{
prop: "fj",
label: "附记",
},
],
JSYDSYQ: [
{
prop: "qszt",
......
......@@ -78,7 +78,7 @@
//空列值个数
emptycolNum: datas.columns().emptycolNum,
//列名称对象
columns: datas.columns().JSYDSYQ,
columns: datas.columns().TDSYQ,
};
},
created () {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-01 15:19:13
* @LastEditTime: 2023-08-15 09:43:21
-->
<template>
<div class="clxx">
......@@ -13,9 +13,7 @@
type="primary"
native-type="submit"
@click="viewDetail"
style="width: 100%; margin-top: 10px"
>查看明细</el-button
>
style="width: 100%; margin-top: 10px">申请材料目录</el-button>
<div class="item">
材料目录({{ tableData.length }})
<div style="margin-top: 10px">
......@@ -26,21 +24,17 @@
color: black;
font-size: 14px;
"
v-if="tableData.length == 0"
>
v-if="tableData.length == 0">
暂无数据
</div>
<div
v-for="(item, index) in tableData"
:key="item.bsmSj"
:class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
@click="treeClick(item, index)"
>
@click="treeClick(item, index)">
<span v-if="item.isrequired == 1" class="required">必选</span>
{{ item.sjmc }}
<span class="cl_number"
>({{ item.children ? item.children.length : 0 }})</span
>
<span class="cl_number">({{ item.children ? item.children.length : 0 }})</span>
</div>
</div>
</div>
......@@ -49,9 +43,7 @@
native-type="submit"
style="width: 100%"
@click="handleAdd()"
v-if="ableOperation"
>新增</el-button
>
v-if="ableOperation">新增</el-button>
</div>
<image-preview
ref="imageRef"
......@@ -60,402 +52,401 @@
:ableOperation="ableOperation"
@updateList="updateList"
@nextPriview="nextPriview"
@prevPriview="prevPriview"
/>
@prevPriview="prevPriview" />
</div>
</div>
<clxxAddDialog v-model="isDialog" />
</div>
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
import imagePreview from "@/views/components/imagePreview.vue";
import { InitClml, saveClml } from "@/api/clxx.js";
export default {
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
data() {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
iclass: "",
// 材料目录选中
treeCheckIndex: 0,
treeCheckId: "",
key: 0,
tableData: [],
previewImg: {
// 收件标识码
bsmSj: "",
bsmSlsq: this.$parent.bsmSlsq,
index: 0,
selectedIndex: 0,
imgList: [],
},
};
},
computed: {
...mapGetters(["dictData"]),
},
created() {
this.clmlInitList(1);
},
computed: {
...mapGetters(["workFresh"]),
},
watch: {
workFresh: {
handler(newVal, oldVal) {
if (newVal) this.clmlInitList(1);
},
import { mapGetters } from "vuex";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
import imagePreview from "@/views/components/imagePreview.vue";
import { InitClml, saveClml } from "@/api/clxx.js";
export default {
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
data () {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
iclass: "",
// 材料目录选中
treeCheckIndex: 0,
treeCheckId: "",
key: 0,
tableData: [],
previewImg: {
// 收件标识码
bsmSj: "",
bsmSlsq: this.$parent.bsmSlsq,
index: 0,
selectedIndex: 0,
imgList: [],
},
};
},
},
mounted() {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
// 自动预览
/**
* @description: 自动预览
* @author: renchao
*/
nextPriview() {
if (this.treeCheckIndex < this.tableData.length) {
this.treeCheckIndex++;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
this.previewImg.index = 0;
this.previewImg.imgList = this.tableData[this.treeCheckIndex].children;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
}
computed: {
...mapGetters(["dictData"]),
},
/**
* @description: prevPriview
* @author: renchao
*/
prevPriview() {
if (this.treeCheckIndex >= 1) {
this.treeCheckIndex--;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
this.previewImg.index = this.previewImg.imgList.length;
this.previewImg.imgList = this.tableData[this.treeCheckIndex].children;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
}
created () {
this.clmlInitList(1);
},
// 材料目录明细初始化
/**
* @description: 材料目录明细初始化
* @param {*} type
* @author: renchao
*/
clmlInitList(type) {
//type 1:列表初始化 2:新增材料
return new Promise((resolve) => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSlsq", this.$parent.bsmSlsq);
if (this.$route.query.sqywbm == "DJBBL") {
formdata.append("bsmSldy", this.$parent.bsmRepair);
formdata.append("clfl", 3);
} else {
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("clfl", 2);
computed: {
...mapGetters(["workFresh"]),
},
watch: {
workFresh: {
handler (newVal, oldVal) {
if (newVal) this.clmlInitList(1);
},
},
},
mounted () {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
// 自动预览
/**
* @description: 自动预览
* @author: renchao
*/
nextPriview () {
if (this.treeCheckIndex < this.tableData.length) {
this.treeCheckIndex++;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
this.previewImg.index = 0;
this.previewImg.imgList = this.tableData[this.treeCheckIndex].children;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
}
},
/**
* @description: prevPriview
* @author: renchao
*/
prevPriview () {
if (this.treeCheckIndex >= 1) {
this.treeCheckIndex--;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
this.previewImg.index = this.previewImg.imgList.length;
this.previewImg.imgList = this.tableData[this.treeCheckIndex].children;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
}
},
// 材料目录明细初始化
/**
* @description: 材料目录明细初始化
* @param {*} type
* @author: renchao
*/
clmlInitList (type) {
//type 1:列表初始化 2:新增材料
return new Promise((resolve) => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSlsq", this.$parent.bsmSlsq);
if (this.$route.query.sqywbm == "DJBBL") {
formdata.append("bsmSldy", this.$parent.bsmRepair);
formdata.append("clfl", 3);
} else {
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("clfl", 2);
}
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
this.tableData = res.result;
if (type == 1) {
this.treeClick(this.tableData[0], 0);
} else {
//新增材料后刷新列表焦点置于新增的对象上
this.treeClick(
this.tableData[this.tableData.length - 1],
this.tableData.length - 1
);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
this.tableData = res.result;
if (type == 1) {
this.treeClick(this.tableData[0], 0);
} else {
//新增材料后刷新列表焦点置于新增的对象上
this.treeClick(
this.tableData[this.tableData.length - 1],
this.tableData.length - 1
);
}
}
} else {
this.$message.error(res.message);
}
} else {
this.$message.error(res.message);
}
});
});
});
},
/**
* @description: setChecked
* @param {*} item
* @author: renchao
*/
setChecked(item) {
this.treeCheckId = item.bsmSj;
this.title = item.sjmc;
this.titleYs = 1;
this.titleNum = item.children.length;
this.previewImg.imgList = item.children;
this.previewImg.bsmSj = item.bsmSj;
},
/**
* @description: updateList
* @param {*} val
* @author: renchao
*/
updateList(val) {
let that = this;
if (val.children.length != 0) {
//删除最后一张图片时 val=null
this.tableData.forEach((item) => {
if (item.bsmSj === val.bsmSj) {
item.children = val.children;
},
/**
* @description: setChecked
* @param {*} item
* @author: renchao
*/
setChecked (item) {
this.treeCheckId = item.bsmSj;
this.title = item.sjmc;
this.titleYs = 1;
this.titleNum = item.children.length;
this.previewImg.imgList = item.children;
this.previewImg.bsmSj = item.bsmSj;
},
/**
* @description: updateList
* @param {*} val
* @author: renchao
*/
updateList (val) {
let that = this;
if (val.children.length != 0) {
//删除最后一张图片时 val=null
this.tableData.forEach((item) => {
if (item.bsmSj === val.bsmSj) {
item.children = val.children;
}
});
this.previewImg.imgList = _.cloneDeep(val.children);
if (this.previewImg.index == this.previewImg.imgList.length) {
this.previewImg.index = this.previewImg.index - 1;
}
});
this.previewImg.imgList = _.cloneDeep(val.children);
if (this.previewImg.index == this.previewImg.imgList.length) {
this.previewImg.index = this.previewImg.index - 1;
} else {
this.previewImg.imgList = [];
this.tableData.forEach((item, index) => {
if (this.treeCheckId == item.bsmSj) {
item.children = [];
that.treeCheckIndex = index;
}
});
}
},
// 添加材料目录
/**
* @description: 添加材料目录
* @author: renchao
*/
handleAdd () {
this.isDialog = true;
},
// 新增弹窗保存
/**
* @description: 新增弹窗保存
* @param {*} data
* @author: renchao
*/
addSave (data) {
let obj = {
bsmSlsq: this.$parent.bsmSlsq,
isrequired: "1",
sjmc: data.clmc,
sjsl: 0,
smzt: "",
ys: 0,
sjlx: data.cllx,
sfxjcl: "1", // 是否必选
};
if (this.$route.query.sqywbm == "DJBBL") {
obj.bsmSldy = this.$parent.bsmRepair
}
} else {
this.previewImg.imgList = [];
this.tableData.forEach((item, index) => {
if (this.treeCheckId == item.bsmSj) {
item.children = [];
that.treeCheckIndex = index;
saveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList(2);
if (res == 200)
this.$message({
message: "新增成功",
type: "success",
});
}
});
}
},
// 添加材料目录
/**
* @description: 添加材料目录
* @author: renchao
*/
handleAdd() {
this.isDialog = true;
},
// 新增弹窗保存
/**
* @description: 新增弹窗保存
* @param {*} data
* @author: renchao
*/
addSave(data) {
let obj = {
bsmSlsq: this.$parent.bsmSlsq,
isrequired: "1",
sjmc: data.clmc,
sjsl: 0,
smzt: "",
ys: 0,
sjlx: data.cllx,
sfxjcl: "1", // 是否必选
};
if (this.$route.query.sqywbm == "DJBBL") {
obj.bsmSldy=this.$parent.bsmRepair
}
saveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList(2);
if (res == 200)
this.$message({
message: "新增成功",
type: "success",
});
},
// 材料目录点击选中
/**
* @description: 材料目录点击选中
* @param {*} item
* @param {*} index
* @author: renchao
*/
treeClick (item, index) {
this.previewImg.index = 0;
this.treeCheckId = item?.bsmSj;
this.treeCheckIndex = index;
this.previewImg.imgList = item.children ? item.children : [];
this.previewImg.bsmSj = item?.bsmSj;
},
// 小图片点击
/**
* @description: 小图片点击
* @param {*} item
* @param {*} index
* @author: renchao
*/
imgClick (item, index) {
this.showImg = item;
this.titleYs = index + 1;
},
// 字典
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus (val, code) {
let data = this.$store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
});
return name;
}
});
},
// 材料目录点击选中
/**
* @description: 材料目录点击选中
* @param {*} item
* @param {*} index
* @author: renchao
*/
treeClick(item, index) {
this.previewImg.index = 0;
this.treeCheckId = item?.bsmSj;
this.treeCheckIndex = index;
this.previewImg.imgList = item.children ? item.children : [];
this.previewImg.bsmSj = item?.bsmSj;
},
// 小图片点击
/**
* @description: 小图片点击
* @param {*} item
* @param {*} index
* @author: renchao
*/
imgClick(item, index) {
this.showImg = item;
this.titleYs = index + 1;
},
// 字典
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus(val, code) {
let data = this.$store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
},
//查看明细
viewDetail () {
this.$store.dispatch("user/reWorkFresh", false);
this.$popupDialog(
"申请材料目录",
"workflow/components/dialog/clxxDetailDialog",
{
data: this.tableData,
unitData: this.$parent.unitData,
ableOperation: this.$parent.ableOperation,
bsmRepair: this.$parent.bsmRepair
},
"60%",
true
);
},
//设置tableData
setTableData (tableData) {
this.$nextTick((res) => {
this.tableData = tableData;
});
return name;
}
},
//查看明细
viewDetail() {
this.$store.dispatch("user/reWorkFresh", false);
this.$popupDialog(
"查看明细",
"workflow/components/dialog/clxxDetailDialog",
{
data: this.tableData,
unitData: this.$parent.unitData,
ableOperation: this.$parent.ableOperation,
bsmRepair:this.$parent.bsmRepair
},
"60%",
true
);
},
//设置tableData
setTableData(tableData) {
this.$nextTick((res) => {
this.tableData = tableData;
});
},
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
.active {
background: $light-blue !important;
color: #fff;
}
.required {
font-size: 12px;
color: $pink;
float: left;
}
@import "~@/styles/mixin.scss";
.cl_number {
float: right;
}
.clxx {
width: 100%;
display: flex;
padding-left: 5px;
height: calc(100vh - 125px);
.left {
display: flex;
flex-direction: column;
justify-content: space-between;
.active {
background: $light-blue !important;
color: #fff;
}
.item {
width: 28px;
height: 49%;
@include flex-center;
background-color: #e4e7ed;
border-bottom-right-radius: 10px;
padding: 5px;
cursor: pointer;
transition: all 0.3s;
.required {
font-size: 12px;
color: $pink;
float: left;
}
&:hover {
@extend .active;
}
}
.cl_number {
float: right;
}
.right {
.clxx {
width: 100%;
height: 100%;
display: flex;
padding-left: 5px;
height: calc(100vh - 125px);
.clmlmx-box {
margin: 0 auto;
.left {
display: flex;
flex-direction: column;
justify-content: space-between;
.title {
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
.item {
width: 28px;
height: 49%;
@include flex-center;
background-color: #e4e7ed;
border-bottom-right-radius: 10px;
padding: 5px;
cursor: pointer;
transition: all 0.3s;
&:hover {
@extend .active;
}
}
}
.clyl-box {
.right {
width: 100%;
height: 100%;
display: flex;
.menu-tree {
width: 20%;
min-width: 160px;
height: 100%;
margin-right: 10px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
.clmlmx-box {
margin: 0 auto;
.item {
line-height: 30px;
padding-top: 5px;
border-bottom: 1px solid #e8e8e8;
font-size: 16px;
.title {
text-align: center;
color: $light-blue;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
.itemIcon {
float: right;
line-height: 60px;
cursor: pointer;
}
.clyl-box {
width: 100%;
height: 100%;
display: flex;
.child {
line-height: 32px;
border-bottom: 1px solid #e8e8e8;
padding-left: 10px;
color: #6b6b6b;
cursor: pointer;
box-sizing: border-box;
border-radius: 6px;
line-height: 20px;
transition: all 0.3s;
padding: 8px 0;
}
.menu-tree {
width: 20%;
min-width: 160px;
height: 100%;
margin-right: 10px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
.child:hover {
.item {
line-height: 30px;
padding-top: 5px;
border-bottom: 1px solid #e8e8e8;
font-size: 16px;
text-align: center;
color: $light-blue;
transform: scale(1.1);
}
.checked {
border: 1px solid $light-blue;
color: $light-blue;
.itemIcon {
float: right;
line-height: 60px;
cursor: pointer;
}
.child {
line-height: 32px;
border-bottom: 1px solid #e8e8e8;
padding-left: 10px;
color: #6b6b6b;
cursor: pointer;
box-sizing: border-box;
border-radius: 6px;
line-height: 20px;
transition: all 0.3s;
padding: 8px 0;
}
.child:hover {
color: $light-blue;
transform: scale(1.1);
}
.checked {
border: 1px solid $light-blue;
color: $light-blue;
}
}
}
}
.clyl-img {
width: 75%;
height: 100%;
background: #f3f4f7;
margin: 0 auto;
position: relative;
.clyl-img {
width: 75%;
height: 100%;
background: #f3f4f7;
margin: 0 auto;
position: relative;
}
}
}
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 09:53:05
* @LastEditTime: 2023-08-15 09:43:46
-->
<template>
<div class="clmlmx-box">
<div class="title">申请材料目录</div>
<lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
</lb-table>
<div class="text-center">
......@@ -61,7 +60,7 @@
label: "材料名称",
render: (h, scope) => {
return (
this.formData.ableOperation ?
(this.formData.ableOperation && scope.row.isrequired != '1') ?
<el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
)
}
......@@ -209,14 +208,14 @@
return new Promise(resolve => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
formdata.append("bsmSldy", this.formData.bsmRepair);
formdata.append("clfl", 3);
} else {
formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
formdata.append("clfl", 2);
}
formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
formdata.append("bsmSldy", this.formData.bsmRepair);
formdata.append("clfl", 3);
} else {
formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
formdata.append("clfl", 2);
}
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
......
......@@ -211,17 +211,19 @@
*/
getNextNode (bsmSqyw) {
getNextNode(bsmSqyw).then(res => {
if (res.result.djqx) {
this.djqxList = res.result.djqx;
this.djqxList.forEach(item => {
this.$set(item, 'selected', false);
});
}
if (res.result.djlx) {
this.djlxList = res.result.djlx;
this.djlxList.forEach(item => {
this.$set(item, 'selected', false);
});
if (res.result) {
if (res.result.djqx) {
this.djqxList = res.result.djqx;
this.djqxList.forEach(item => {
this.$set(item, 'selected', false);
});
}
if (res.result.djlx) {
this.djlxList = res.result.djlx;
this.djlxList.forEach(item => {
this.$set(item, 'selected', false);
});
}
}
})
},
......