a036215b by xiaomiao

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

2 parents 227ebca4 184f471c
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 15:31:00
* @LastEditTime: 2023-07-11 08:58:31
-->
<template>
<div class="container">
......@@ -12,8 +12,7 @@
<li
@click="operation(item)"
v-for="(item, index) in leftButtonList"
:key="index"
>
:key="index">
<svg-icon class="icon" :icon-class="item.icon" />
<span class="iconName">{{ item.name }}</span>
</li>
......@@ -22,8 +21,7 @@
<li
@click="operation(item)"
v-for="(item, index) in rightButtonList"
:key="index"
>
:key="index">
<svg-icon class="icon" :icon-class="item.icon" />
<span class="iconName">{{ item.name }}</span>
</li>
......@@ -50,15 +48,13 @@
:label="item.name"
:name="item.value"
v-for="item in tabList"
:key="item.value"
>
:key="item.value">
</el-tab-pane>
</el-tabs>
<component
:key="fresh"
:is="componentTag"
v-bind="currentSelectProps"
/>
v-bind="currentSelectProps" />
</div>
</div>
</div>
......@@ -67,207 +63,215 @@
</div>
</template>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "./workFrame.scss";
@import "~@/styles/mixin.scss";
@import "./workFrame.scss";
</style>
<script>
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform";
import { getStepFormInfo } from "@/api/fqsq.js";
import NoticeBar from "@/components/NoticeBar/index";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import { leftMenubl } from "@/api/djbbl.js";
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbbl.js";
// 获取权利类型数组
import { getQllxByBdcdyid } from "@/api/djbbl.js";
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform";
import { getStepFormInfo } from "@/api/fqsq.js";
import NoticeBar from "@/components/NoticeBar/index";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import { leftMenubl } from "@/api/djbbl.js";
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbbl.js";
// 获取权利类型数组
import { getQllxByBdcdyid } from "@/api/djbbl.js";
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
components: {
selectBdc,
NoticeBar,
ProcessViewer,
ordinaryMenu,
qllxDailog,
},
mixins: [WorkFlow],
data() {
return {
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
//受理申请标识码
bdcdyid: this.$route.query.bdcdyid,
//当前流程所在环节
bdcdyh: this.$route.query.bdcdyh,
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
isEdit:true,
// 弹框显示
dialogVisible: true,
//表单集合
tabList: [],
//选择加载哪一个组件
componentTag: "",
//设置表单传递数据
currentSelectProps: {},
// 首次拿到的业务信息
oneSelectProps: {},
//材料信息选择卡索引
oneget: true,
//页面监听时间
_beforeUnload_time: "",
treedata: {},
tabdata: [],
defaultNode: {},
bsmRepair:""
};
},
mounted() {
// this.getleftMenubl()
},
methods: {
stepForm(qllx) {
this.oneSelectProps.qllx = qllx;
if (this.$refs.Menu.supplementarylist.length) {
getStepFormInfo(this.oneSelectProps).then((res) => {
this.$nextTick(function () {
this.tabList = res.result;
this.tabName = this.tabList[0].value;
this.getFromRouter(this.tabName);
});
});
}
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
components: {
selectBdc,
NoticeBar,
ProcessViewer,
ordinaryMenu,
qllxDailog,
},
// 获取右侧菜单
// getleftMenubl() {
// leftMenubl(this.bsmSlsq).then((res) => {
// this.supplementarylist = res.result;
// })
// },
getQllxByBdcdyid() {
if (this.currentSelectProps.bdcdyid) {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
this.$refs.qllxlist.qllxlistdata = res.result;
this.$refs.qllxlist.dialogVisible = true;
}
}
);
}
mixins: [WorkFlow],
data () {
return {
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
//受理申请标识码
bdcdyid: this.$route.query.bdcdyid,
//当前流程所在环节
bdcdyh: this.$route.query.bdcdyh,
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
isEdit: true,
// 弹框显示
dialogVisible: true,
//表单集合
tabList: [],
//选择加载哪一个组件
componentTag: "",
//设置表单传递数据
currentSelectProps: {},
// 首次拿到的业务信息
oneSelectProps: {},
//材料信息选择卡索引
oneget: true,
//页面监听时间
_beforeUnload_time: "",
treedata: {},
tabdata: [],
defaultNode: {},
};
},
// 获取右侧选项卡
getCurrentSelectProps(val) {
if(val.bsmRepair){
this.bsmRepair=val.bsmRepair
}
if (val.bdcdyid) {
this.oneSelectProps = val;
}
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
this.stepForm(this.currentSelectProps.qllx);
} else if (!this.oneget) {
this.getdjblist();
}
if (this.oneget) {
this.oneget = false;
this.stepForm(this.currentSelectProps.qllx);
}
mounted () {
// this.getleftMenubl()
},
// 获取渲染登记簿列表
getdjblist() {
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.currentSelectProps.qllx, {
linShi: 0,
xianShi: 0,
liShi: 0,
methods: {
stepForm (qllx) {
this.oneSelectProps.qllx = qllx;
if (this.$refs.Menu.supplementarylist.length) {
getStepFormInfo(this.oneSelectProps).then((res) => {
this.$nextTick(function () {
this.tabList = res.result;
this.tabName = this.tabList[0].value;
this.getFromRouter(this.tabName);
});
this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
});
let settree = JSON.parse(JSON.stringify(this.treedata));
this.tabdata = [
...settree,
...settree[1].children[0].children[0].children,
];
this.tabdata.forEach((item, index, arr) => {
arr[index].name = item.label;
arr[index].value = item.id;
});
this.tabList = this.tabdata;
}
});
},
//右侧表单选项卡事件
beforeLeave(activeName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter(tabname) {
this.componentTag = getForm(tabname);
},
closefp() {
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/set1tScreen", this.splitScreen);
this.getFromRouter(this.tabList[0].value);
this.clxxForm = getForm(this.tabList[1].value);
},
// 增加补录记录
addRepairRecord(row, del) {
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
bsmSldy: this.currentSelectProps.bsmSldy,
operate: "C",
qllx: "",
};
if (row) {
from.bsmQlxx = row.bsmQlxx;
if (del) {
from.operate = del;
} else {
from.operate = row.bsmQlxx ? "U" : "C";
},
// 获取右侧菜单
// getleftMenubl() {
// leftMenubl(this.bsmSlsq).then((res) => {
// this.supplementarylist = res.result;
// })
// },
getQllxByBdcdyid () {
if (this.currentSelectProps.bdcdyid) {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
this.$refs.qllxlist.qllxlistdata = res.result;
this.$refs.qllxlist.dialogVisible = true;
}
}
);
}
from.qllx = row.qllx;
}
addRepairRecord(from)
.then((res) => {
if (res.code == "200") {
this.$refs.qllxlist.dialogVisible = false;
this.$nextTick(() => {
this.$refs.Menu.getleftMenubl(res.result);
this.$message({
type: "success",
message: "补录成功!",
},
// 获取右侧选项卡
getCurrentSelectProps (val) {
if (val.bdcdyid) {
this.oneSelectProps = val;
}
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
this.stepForm(this.currentSelectProps.qllx);
} else if (!this.oneget) {
this.getdjblist();
}
if (this.oneget) {
this.oneget = false;
this.stepForm(this.currentSelectProps.qllx);
}
},
// 获取渲染登记簿列表
getdjblist () {
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.currentSelectProps.qllx, {
linShi: 0,
xianShi: 0,
liShi: 0,
});
this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
});
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
type: "warning",
let settree = JSON.parse(JSON.stringify(this.treedata));
this.tabdata = [
...settree,
...settree[1].children[0].children[0].children,
];
this.tabdata.forEach((item, index, arr) => {
arr[index].name = item.label;
arr[index].value = item.id;
});
this.tabList = this.tabdata;
}
})
.catch((res) => {
console.log("错", res);
});
},
},
};
},
//右侧表单选项卡事件
beforeLeave (activeName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter (tabname) {
this.componentTag = getForm(tabname);
},
closefp () {
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/set1tScreen", this.splitScreen);
this.getFromRouter(this.tabList[0].value);
this.clxxForm = getForm(this.tabList[1].value);
},
// 增加补录记录
addRepairRecord (row, del) {
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
bsmSldy: this.currentSelectProps.bsmSldy,
operate: "C",
qllx: "",
};
if (row) {
from.bsmQlxx = row.bsmQlxx;
if (del) {
from.operate = del;
} else {
from.operate = row.bsmQlxx ? "U" : "C";
}
from.qllx = row.qllx;
}
addRepairRecord(from)
.then((res) => {
if (res.code == "200") {
this.$refs.qllxlist.dialogVisible = false;
this.$nextTick(() => {
this.$refs.Menu.getleftMenubl(res.result);
this.$message({
type: "success",
message: "补录成功!",
});
});
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
type: "warning",
});
}
})
.catch((res) => {
console.log("错", res);
})
},
openDialog () {
this.$store.dispatch('user/refreshPage', false)
let data = JSON.parse(localStorage.getItem('ywbl'))
let title
if (data?.sqywmc) {
title = "申请业务:" + data?.sqywmc
} else {
title = "申请业务:" + data?.djywmc
}
this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
}
}
};
</script>
<style scoped lang="scss"></style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-04 16:23:54
* @LastEditTime: 2023-07-10 15:16:48
-->
<template>
<!-- 受理信息 -->
......@@ -130,25 +130,14 @@
<el-input v-model="ruleForm.tdsyq.mjdw"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="下拉表格测试:">
<select-table v-model="value2" :table-width="600" :props="props" @change="change">
<el-table-column prop="id" label="ID" width="180"></el-table-column>
<el-table-column prop="user" label="姓名"></el-table-column>
</select-table>
</el-form-item>
</el-col> -->
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
@upDateTdytxxList="upDateTdytxxList" />
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -218,11 +207,10 @@
<script>
import { mapGetters } from "vuex"
import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
import tdytTable from "@/views/workflow/components/tdytTable";
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,tdytTable },
components: { qlrCommonTable, tdytTable },
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
......@@ -270,12 +258,12 @@
}
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新土地用途信息
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))
......