f1fe14da by renchao@pashanhoo.com

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

2 parents b6ef8df1 6c3edbdd
Showing 31 changed files with 289 additions and 217 deletions
......@@ -71,12 +71,6 @@ export function leftMenubl (params) {
* @param {*} params
* @author: renchao
*/
// export function getQllxByBdcdyid (params) {
// return request({
// url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid?bdcdyid='+params,
// method: 'get',
// })
// }
export function getQllxByBdcdyid (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
......
......@@ -68,7 +68,6 @@ export function loadTreeData(qlxxData, bdcdyh) {
//获取权利类型、不动产单元类型对应的树形节点信息
export function getNode(qllx, qlxx, bdcdylx) {
console.log("qllx",qllx,"bdcdylx",bdcdylx);
let node;
for (var i = 0; i < qlxxPage.length; i++) {
if (qlxxPage[i].qllx == qllx) {
......
......@@ -106,18 +106,20 @@ export default {
};
},
mounted() {
this.loadBdcdylist();
this.getleftMenubl();
},
computed: {
...mapGetters(["isRefresh"]),
// ...mapGetters(["isRefresh"]),
},
watch: {
isRefresh: {
handler(newVal, oldVal) {
if (newVal) this.loadBdcdylist();
},
immediate: true,
},
// isRefresh: {
// handler(newVal, oldVal) {
// if (newVal) this.loadBdcdylist();
// },
// immediate: true,
// },
},
methods: {
//读取申请单元信息
......@@ -128,30 +130,31 @@ export default {
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.currentSelectProps = res.result[0];
console.log("读取申请单元信息");
this.$emit("getCurrentSelectProps", this.currentSelectProps);
if(add){
this.$parent.getQllxByBdcdyid()
}
}
});
this.getleftMenubl();
},
// 获取右侧菜单
getleftMenubl(row) {
leftMenubl(this.bsmSlsq).then((res) => {
this.supplementarylist = res.result;
console.log("this.supplementarylist",this.supplementarylist);
console.log("获取右侧菜单");
this.unitClick(0)
if(row){
this.supplementarylist.forEach((item,index) => {
if(item.bsmRepair==row.bsmRepair){
this.activeIndex=index.toString()
// 补录成功后定位到该条记录
this.unitClick(index)
}
})
}
});
},
handleNodeClick(data, node, elem) {
this.$parent.loadComponent(this.currentSelectProps, data);
......@@ -159,20 +162,14 @@ export default {
},
//申请单元点击事件
unitClick(index) {
console.log("申请单元点击事件");
this.currentSelectProps = this.supplementarylist[index];
this.$emit("getCurrentSelectProps", this.currentSelectProps);
},
//登记簿点击事件
djbClick() {
this.loadBdcdylist();
// this.$parent.getdjblist()
},
// 定位到该条补录记录
// orientation(){
// // this.activeIndex="2"
// this.unitClick(0)
// },
// 删除补录记录
handleDel(row) {
this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
......@@ -265,6 +262,11 @@ export default {
}
.menus {
background-color: #e7f4fe;
div{
font-size: 16px;
font-weight: 600;
}
}
.blxx {
border: #b0d9f8 solid 1px;
......
......@@ -231,9 +231,8 @@
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.qlrList"
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,6 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -280,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -305,10 +332,12 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("抵押权");
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,22 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -323,7 +334,9 @@ export default {
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,22 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -321,9 +332,12 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("房地产权");
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,22 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -321,9 +332,12 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("建设用地使用权");
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,22 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -323,7 +334,9 @@ export default {
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -227,6 +227,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
</div>
......@@ -244,22 +254,22 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.qlxx.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
......@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
import { init } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -323,7 +334,9 @@ export default {
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-09 09:20:10
-->
<template>
<dialogBox title="新建材料信息1111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
<dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
:isFullscreen="false">
<el-form :model="ruleForm" ref="ruleForm" label-width="70px">
<el-row>
......
......@@ -48,11 +48,20 @@ export default {
this.qllx= key;
}
}
let qllxobj = {
if(this.qllx){
let qllxobj = {
qllx:this.qllx,
bsmQlxx:""
};
this.$parent.addRepairRecord(qllxobj)
}else{
this.$message({
type: "warning",
message: "请选择权利类型!",
});
}
},
},
};
......
......@@ -25,7 +25,7 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<div class="setbut" v-if="item.prop == 'cz'&&item.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="deleteDialog(row)">删除</el-button>
</div>
......
......@@ -4,58 +4,10 @@
* @LastEditTime: 2023-05-29 14:39:11
*/
//流程环节操作按钮
export function getForm (tabName, djywbm) {
export function getForm(tabName) {
let form;
switch (tabName) {
// case "jsydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx.vue");
// break;
// case "jsydsyqslxx300":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
// break;
// case "fwsyqslxx100":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx.vue");
// break;
// case "fwsyqslxx300":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
// break;
// case "nydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue");
// break;
// case "nydsyqslxx200":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue");
// break;
// case "tdslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/tdslxx.vue");
// break;
// case "plslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/plcfslxx.vue");
// break;
// case "diyaqSlxx":
// form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
// break;
// case "ygmm100":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
// break;
// case "ygmm300":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx300.vue");
// break;
// case "ygdy100":
// case "ygdy300":
// form = require("@/views/ywbl/slsqxx/ygdy/slxx.vue");
// break;
// case "zjgcdyqSlxx":
// form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
// break;
// case "szxx":
// form = require("@/views/djbworkflow/components/szxx.vue");
// break;
// case "fzxx":
// form = require("@/views/djbworkflow/components/fzxx.vue");
// break;
// case "zdt":
// form = require("@/views/djbworkflow/components/zdt.vue");
// break;
case "zdjbxx":
form = require("@/views/registerBook/zdjbxx.vue");
break;
......@@ -89,72 +41,33 @@ export function getForm (tabName, djywbm) {
case "yydj":
form = require("@/views/registerBook/yydj.vue");
break;
// // 宗地基本信息
// case "zdjbxx":
// form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
// break;
// // 查封登记
// case "cfdj":
// form = require("@/views/djbworkflow/djbBook/cfdj.vue");
// break;
// // 国有建设用地使用权
// case "jsydsyq":
// form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
// break;
// // 农用地使用权
// case "nydsyq":
// form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
// break;
// // 房屋产权2
// case "fdcq2":
// form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
// break;
// // 抵押权
// case "diyaq":
// form = require("@/views/djbworkflow/djbBook/diyaq.vue");
// break;
// // 预告登记
// case "ygdj":
// form = require("@/views/djbworkflow/djbBook/ygdj.vue");
// break;
// // 地役权
// case "diyiq":
// form = require("@/views/djbworkflow/djbBook/diyiq.vue");
// break;
// // 登记簿封面
// case "djbfm":
// form = require("@/views/djbworkflow/djbBook/djbfm.vue");
// break;
// // 异议登记
// case "yydj":
// form = require("@/views/djbworkflow/djbBook/yydj.vue");
// break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
// break;
// case "slxx":
// form = require("@/views/djbworkflow/djbBook/slxx.vue");
// break;
case "slxxjsydsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
break;
case "slxxfdcq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue");
break;
case "slxxdyaq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue");
break;
case "slxxygdj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue");
break;
case "slxxyydj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue");
break;
case "slxxdyiq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue");
break;
case "slxxcfdj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue");
break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/clxx.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/components/clxxUnify.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/components/spyj.vue");
// break;
default:
form = require("@/views/error-page/404.vue");
break;
......
......@@ -73,6 +73,7 @@
<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";
// 引入左侧菜单
......@@ -115,10 +116,13 @@ export default {
componentTag: "",
//设置表单传递数据
currentSelectProps: {},
// 首次拿到的业务信息
oneSelectProps:{},
//材料信息选择卡索引
clxxIndex: "",
//材料信息选项卡对象
clxxTab: {},
oneget:true,
//页面监听时间
_beforeUnload_time: "",
treedata: {},
......@@ -126,9 +130,23 @@ export default {
defaultNode: {},
};
},
mounted() {},
mounted() {
},
methods: {
stepForm (qllx) {
this.oneSelectProps.qllx=qllx
getStepFormInfo(this.oneSelectProps).then((res) => {
this.tabList=res.result
this.$nextTick(function () {
this.tabName =this.tabList[0].url;
console.log("this.tabName",this.tabName);
});
})
},
getQllxByBdcdyid() {
if(this.currentSelectProps.bdcdyid){
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
......@@ -144,12 +162,28 @@ export default {
},
// 获取右侧选项卡
getCurrentSelectProps(val) {
console.log("vallllllllllllllllll",val);
if(val.bdcdyid){
this.oneSelectProps = val;
}
console.log("this.oneSelectProps",this.oneSelectProps);
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
console.log("进入补录");
this.tabset(val);
} else {
} else if(!this.oneget){
console.log("进入登记簿");
this.getdjblist();
}
if(this.oneget){
console.log("进入补录");
this.oneget=false
this.tabset(val);
}
},
// 获取渲染登记簿列表
getdjblist() {
......@@ -183,46 +217,65 @@ export default {
this.tabList = this.tabdata;
}, 200);
},
tabset(val) {
console.log("valsweqweqrfwqerqweq",val);
// console.log("this.currentSelectProps2222222222222",this.currentSelectProps);
this.stepForm (this.currentSelectProps.qllx)
// this.tabList = [
// {
// name: val.qllxmc + "补录信息",
// value: "slxx",
// sort: 1,
// },
// {
// name: "审批意见",
// value: "spyj",
// sort: 2,
// },
// {
// name: "材料信息",
// value: "clxx",
// sort: 2,
// },
// ];
tabset(val) {
this.tabName = "";
this.tabList = [
{
name: val.qllxmc + "补录信息",
value: "slxx",
sort: 1,
},
{
name: "审批意见",
value: "spyj",
sort: 2,
},
{
name: "材料信息",
value: "clxx",
sort: 2,
},
];
this.$nextTick(function () {
this.tabName = "slxx";
});
},
// tabset(val) {
// this.tabName = "";
// this.tabList = [
// {
// name: val.qllxmc + "补录信息",
// value: "slxx",
// sort: 1,
// },
// {
// name: "审批意见",
// value: "spyj",
// sort: 2,
// },
// {
// name: "材料信息",
// value: "clxx",
// sort: 2,
// },
// ];
// this.$nextTick(function () {
// this.tabName = "slxx";
// });
// },
//右侧表单选项卡事件
beforeLeave(activeName, oldActiveName) {
console.log("右侧表单选项卡事件",activeName);
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabname",tabname);
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item;
break;
}
}
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
console.log("tabnameaaaaaaaaaaaaaaaaaaaa",tabname);
this.componentTag = getForm(tabname);
},
// 增加补录记录
......@@ -244,11 +297,25 @@ export default {
from.qllx = row.qllx;
}
addRepairRecord(from).then((res) => {
this.$refs.qllxlist.dialogVisible = false;
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("错i了哦",res);
});;
},
},
};
......
This diff could not be displayed because it is too large.
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687311691503" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10425" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M867.584 160.192c-149.632-16.928-262.208-57.408-334.592-120.352l-19.04-16.544-20.544 14.656C379.968 118.944 267.776 160 160 160H128v448c0 137.344 121.088 261.92 370.208 380.864l13.088 6.24 13.344-5.728C771.072 883.52 896 755.232 896 608V163.424l-28.416-3.232zM832 608c0 116.8-107.392 223.36-319.328 316.8C299.872 821.024 192 714.464 192 608V222.976c104.672-6.784 211.584-46.688 318.496-118.944C587.232 162.528 695.168 201.536 832 220.256V608z" p-id="10426" fill="#6D7278"></path><path d="M359.776 468.672a32 32 0 1 0-47.968 42.4l121.792 137.824c12.608 14.24 30.176 21.568 47.904 21.568a64.384 64.384 0 0 0 49.696-23.52l197.6-242.72a32 32 0 0 0-49.632-40.416l-197.6 242.688-121.792-137.824z" p-id="10427" fill="#6D7278"></path></svg>
\ No newline at end of file
......@@ -324,7 +324,6 @@ export default {
},
//切换房屋状态
handleChoosedH(bsms, color) {
debugger
this.$refs.lpbContent.changeChoosed(bsms, color);
},
//获取各项单元状态统计数据
......
......@@ -171,7 +171,6 @@ export default {
},
changeChoosedObj: {
handler(val) {
debugger
//清除选中户
this.borderColor = 'rgb(230, 230, 230)';
this.zdySelectAll(false,true)
......
......@@ -89,7 +89,6 @@ export default {
methods: {
// 改变户选中状态
changeChoosed(bsms, color){
debugger
this.changeChoosedObj.bsms = bsms;
this.changeChoosedObj.color = color;
},
......
......@@ -24,7 +24,7 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<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>
......
......@@ -29,7 +29,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
<div class="setbut" v-if="item.prop == 'cz'">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button
type="text"
icon="el-icon-edit-outline"
......
......@@ -29,7 +29,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
<div class="setbut" v-if="item.prop == 'cz'">
<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>
......
......@@ -22,7 +22,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<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>
......
......@@ -29,7 +29,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
<div class="setbut" v-if="item.prop == 'cz'">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button
type="text"
icon="el-icon-edit-outline"
......@@ -134,16 +134,11 @@ export default {
})
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
});
})
.catch(() => {
this.$message({
type: "info",
message: "取消编辑",
message: "取消",
});
});
},
......
......@@ -22,7 +22,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<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>
......
......@@ -22,7 +22,7 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<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>
......