41588b3d by renchao@pashanhoo.com

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

2 parents fa26cc0a 7990d2b4
......@@ -20,8 +20,8 @@
<el-menu :default-active="activeIndex" @select="unitClick">
<el-menu-item v-for="(item, index) in supplementarylist" :index="index.toString()" :key="index">
<div>
<p>{{ item.bdcdyh }}</p>
<p class="title-detail">{{ item.zl }}</p>
<p>{{ item.qllxmc }} ||{{ item.operate }} </p>
<!-- <p class="title-detail">{{ item.zl }}</p> -->
</div>
<i class="el-icon-delete" v-if="supplementarylist.length > 1" @click.stop="handleDel(item)"></i>
</el-menu-item>
......@@ -106,46 +106,27 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
if (res.code === 200 && res.result) {
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
// this.getdjblist()
}
})
this.loadData ()
})
this.getleftMenubl()
},
getleftMenubl(){
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
leftMenubl(formdata).then((res) => {
console.log("左侧菜单集合",res);
// if (res.code === 200 && res.result) {
// this.currentSelectProps = res.result[0];
// this.$emit('getCurrentSelectProps', this.currentSelectProps);
// // this.getdjblist()
// }
leftMenubl(formdata).then((res) => {
this.supplementarylist=res.result;
}
)
},
// 获取登记簿菜单
loadData () {
this.supplementarylist=[{
"zl": "抵押权",
},{
"zl": "抵押权",
}]
},
handleNodeClick (data, node, elem) {
this.$parent.loadComponent(this.currentSelectProps,data);
this.$parent.tabset();
},
//申请单元点击事件
unitClick (index) {
this.$parent.tabset()
// this.currentSelectProps = this.unitData[index];
unitClick (index) {
this.$parent.currentSelectProps=this.supplementarylist[index];
this.$parent.tabset();
// console.log("this.currentSelectProps", this.supplementarylist[index]);
// this.currentSelectProps.batchOperation = false;
// this.activeIndex = index.toString();
// //选中表单传递数据
......
<template>
<div class="from-clues-header">
<div>受理信息</div>
<el-form ref="form" :model="form" label-width="160px">
<el-row>
<el-col :span="12">
<el-form-item label="权属状态" label-width="140px">
<el-select v-model="form.qszt">
<el-option
v-for="item in qsztList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-for="item in datalist" :key="item.bdcdyh">
<el-form-item
:prop="item.prop"
:label="item.label"
label-width="140px"
>
<el-input v-model="form[item.prop]"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="btn">
<el-button type="primary" @click="slxxsubmitForm">保存</el-button>
<el-button @click="closeDialog">取消</el-button>
</div>
</div>
<div class="from-clues-header">
<div>收件信息</div>
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
label-width="120px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
受理信息
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.slsq">
<el-col :span="8">
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理人员:">
<el-input disabled v-model="ruleForm.slsq.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理时间:">
<el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.slsq">
<el-col :span="8">
<el-form-item label="权利类型:">
<el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型:">
<el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记情形:">
<el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>-->
<div class="btn">
<el-button type="primary" @click="slxxsubmitForm">保存</el-button>
<el-button @click="closeDialog">取消</el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import { mapGetters } from "vuex";
import { init } from "@/api/djbbl.js";
export default {
props: {
formData: {
currentSelectProps: {
type: Object,
default: () => {},
},
......@@ -64,37 +81,38 @@ export default {
isshow: true,
};
},
computed: {
...mapGetters(["dictData"])
},
created () {
console.log("this.propsParam",this.propsParam);
// this.clmlInitList(1)
},
computed: {
...mapGetters(["dictData"]),
},
created() {
this.init2();
//console.log("this.propsParam", this.propsParam);
// this.clmlInitList(1)
},
mounted() {
if (this.formData.data) {
this.$nextTick(() => {
this.form = Object.assign({}, this.formData.data);
// this.datalist = Object.assign([], this.formData.datalist)
this.form.qszt =
this.form.qszt == "0"
? "临时"
: this.form.qszt == "1"
? "现势"
: "历史";
});
}
// if (this.formData.data) {
// this.$nextTick(() => {
// this.form = Object.assign({}, this.formData.data);
// // this.datalist = Object.assign([], this.formData.datalist)
// this.form.qszt =
// this.form.qszt == "0"
// ? "临时"
// : this.form.qszt == "1"
// ? "现势"
// : "历史";
// });
// }
// this.datalist = this.formData.datalist
this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
this.datalist.shift();
this.datalist.shift();
console.log("this.datalist", this.datalist);
// this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
// this.datalist.shift();
// this.datalist.shift();
// console.log("this.datalist", this.datalist);
},
methods: {
init2() {
console.log("this.currentSelectProps", this.currentSelectProps);
},
// 受理信息保存
slxxsubmitForm() {
this.$refs.form.validate((valid) => {
......@@ -114,10 +132,7 @@ export default {
});
this.isshow = false;
},
closeDialog(){
}
closeDialog() {},
},
};
</script>
......@@ -154,7 +169,7 @@ export default {
padding: 20px 40px;
/deep/.el-input__inner {
width: 200px;
border:none;
border: none;
}
}
.spyj_title {
......@@ -236,126 +251,126 @@ export default {
}
// 材料信息样式
.active {
background: $light-blue !important;
color: #fff;
}
.active {
background: $light-blue !important;
color: #fff;
}
.required {
font-size: 12px;
color: $pink;
float: left;
}
.required {
font-size: 12px;
color: $pink;
float: left;
}
.cl_number {
float: right;
}
.cl_number {
float: right;
}
.clxx {
width: 100%;
.clxx {
width: 100%;
display: flex;
padding-left: 5px;
height: calc(100vh - 125px);
.left {
display: flex;
padding-left: 5px;
height: calc(100vh - 125px);
flex-direction: column;
justify-content: space-between;
.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;
}
}
}
.left {
display: flex;
flex-direction: column;
justify-content: space-between;
.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;
}
.right {
width: 100%;
height: 100%;
.clmlmx-box {
margin: 0 auto;
.title {
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
.right {
.clyl-box {
width: 100%;
height: 100%;
display: flex;
.clmlmx-box {
margin: 0 auto;
.title {
.menu-tree {
width: 20%;
min-width: 160px;
height: 100%;
margin-right: 10px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
.item {
line-height: 30px;
padding-top: 5px;
border-bottom: 1px solid #e8e8e8;
font-size: 16px;
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
color: $light-blue;
.clyl-box {
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;
.item {
line-height: 30px;
padding-top: 5px;
.itemIcon {
float: right;
line-height: 60px;
cursor: pointer;
}
.child {
line-height: 32px;
border-bottom: 1px solid #e8e8e8;
font-size: 16px;
text-align: center;
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);
}
.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;
}
.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>
......
......@@ -70,8 +70,6 @@
</style>
<script>
import WorkFlow from "./mixin/index";
// import publicFlow from "./mixin/public.js";
// import { getStepFormInfo } from "@/api/fqsq.js"
import { getForm } from "./flowform"
import NoticeBar from "@/components/NoticeBar/index";
import { unClaimTask } from "@/api/ywbl.js";
......@@ -152,7 +150,7 @@ export default {
arr[index].value=item.id
})
this.tabList=this.tabdata
console.log("登记簿列表",this.tabList);
//console.log("登记簿列表",this.tabList);
}, 200)
},
......@@ -201,13 +199,7 @@ export default {
if (activeName && activeName != 0) this.getFromRouter(activeName)
},
//切换选项卡内容组件
getFromRouter (tabname) {
// for (let item of this.tabList) {
// if (item.value === tabname) {
// this.currentSelectTab = item
// break;
// }
// }
getFromRouter (tabname) {
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
},
......