Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
83da5cd3 by 田浩浩
Options

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

2 parents 1c56475d 560bdac5
Inline Side-by-side
Showing 5 changed files with 125 additions and 150 deletions
......@@ -4,13 +4,12 @@ class data extends filter {
constructor() {
super()
}
columns() {
return {
title: "建设用地使用权、宅基地使用权登记信息",
columns: [
columns () {
return [
{
prop: "ssywh",
label: "上手业务号"
label: "上手业务号",
width: "120"
},
{
prop: "dah",
......@@ -64,14 +63,6 @@ class data extends filter {
prop: "syqqzsj",
label: "使用权起止时间",
},
// {
// prop: "syqjssj",
// label: "使用权结束时间",
// },
// {
// prop: "tdsyqx",
// label: "土地使用期限",
// },
{
prop: "tdsyqx",
label: "土地使用期限",
......@@ -101,8 +92,6 @@ class data extends filter {
label: "附记",
},
]
}
}
}
......
......@@ -12,14 +12,14 @@
</div>
</div>
<div class="xxTableBox">
<table class="xxTable" :width="tableWidth">
<table class="xxTable">
<tr>
<th rowspan="3">业务类型</th>
</tr>
<!-- 第一行表头 -->
<tr class="one" id="">
<tr class="one">
<th v-for="(item, index) in ths" :key="index" :class="[item.class, item.type == '临时' ? 'linshiIcon' : '']">
<div class="icon" v-if="item.type == '临时'">{{ item.type }}</div>
<div class="icon" v-if="item.type == '临时'">正在办理</div>
{{ item.type }}
</th>
</tr>
......@@ -49,55 +49,65 @@
</template>
<script>
import { mapGetters } from "vuex";
import { datas } from "./jsydsyqQlxx";
import { datas } from "./jsydsyq";
import { getJsydsyqList } from "@/api/zhcx.js";
export default {
name: "djxxTable",
props: {
showType: "",
},
name: "jsydsyq",
data () {
return {
checkList: ["临时", "现势", "历史"],
tableWidth: 810,
type: datas.columns(),
tableData: [],
showTableData: [],
ths: [],
showThs: [],
columns: [],
title: "",
title: "建设用地使用权、宅基地使用权登记信息",
emptyData: {
ssywh: '',
dah: '',
ywh: '',
bdcdyh: "",
zl: "",
qlrlx: '',
qlrmc: "",
qlrzjzl: "",
qlrzjhm: "",
gyfs: "",
mj: null,
qlxz: '',
ytmc: "",
syqqzsj: null,
tdsyqx: null,
qdjg: null,
djyy: '',
bdcqzh: null,
djsj: '',
dbr: '',
fj: "",
qllxmc: "",
djlxmc: '',
qszt: "",
}
};
},
computed: {
...mapGetters(["djbxx"]),
},
watch: {
showType: {
handler (newVlue) {
async created () {
// 清空值
this.tableData = [];
this.ths = [];
this.columns = this.type[newVlue].columns;
this.title = this.type[newVlue].title;
this.checkList = ["临时", "现势", "历史"];
this.tableWidth = 810;
let detail;
if (newVlue === "JSYDSYQ") {
getJsydsyqList({
this.columns = datas.columns();
let res = await getJsydsyqList({
bdcdyid: "2b33851f4edfd468ceef4d68c370bd41",
qllx: "A03",
qszt: ["1"]
}).then((res) => {
if (res.code === 200) {
detail = res.result;
})
let resList = res.result.result ? res.result.result : []
if (resList.length < 3) {
let num = 3 - resList.length
for (let i = 0; i < num; i++) {
resList.push(this.emptyData)
}
});
} else {
detail = this.djbxx.detail.qlxxs[newVlue];
}
detail.forEach((item) => {
let detail = resList
detail.length > 0 && detail.forEach((item) => {
this.tableData.push(item);
if (item.qszt == "0") {
this.ths.push({
......@@ -126,61 +136,9 @@ export default {
}
});
this.showTableData = this.tableData;
this.showThs = this.ths;
let width = (this.tableData.length - 3) * 223 + this.tableWidth;
this.tableWidth = this.tableData.length > 3 ? width : 810;
},
immediate: true,
},
},
methods: {
checkChange () {
var checkKey = [];
this.ths = [];
this.tableWidth = 810;
this.checkList.forEach((item) => {
if (item == "临时") {
checkKey.push("0");
}
if (item == "现势") {
checkKey.push("1");
}
if (item == "历史") {
checkKey.push("2");
}
});
this.showTableData = this.tableData.filter((item) =>
checkKey.includes(item.qszt)
);
this.showTableData.forEach((item) => {
if (item.qszt == "0") {
this.ths.push({
type: "临时",
qllxmc: item.qllxmc,
djlxmc: item.djlxmc,
prop: "linshi",
class: "linshi",
});
} else if (item.qszt == "1") {
this.ths.push({
type: "现势",
qllxmc: item.qllxmc,
djlxmc: item.djlxmc,
prop: "xianshi",
class: "xianshi",
});
} else if (item.qszt == "2") {
this.ths.push({
type: "历史",
qllxmc: item.qllxmc,
djlxmc: item.djlxmc,
prop: "lishi",
class: "lishi",
});
}
});
let width = (this.showTableData.length - 3) * 223 + this.tableWidth;
this.tableWidth = this.showTableData.length > 3 ? width : 810;
},
},
};
......@@ -195,14 +153,12 @@ export default {
color: #333;
.tableBox {
width: 810px;
margin: 0 auto;
display: flex;
flex-wrap: wrap;
.title {
width: 100%;
font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
font-weight: 700;
font-size: 16px;
text-align: center;
......@@ -221,24 +177,28 @@ export default {
}
.xxTableBox {
width: 810px;
overflow-x: scroll;
width: 100%;
}
// .xxTable > tr th:not(:first-child) {
// width: 223px;
// }
.xxTable>tr:first-child th {
width: 140px;
}
tr td {
border: 1px solid #ccc;
}
.xxTable {
// border-spacing: 0;
border-spacing: 1px;
width: 100%;
tr>th {
background: #464c5b;
color: #fff;
font-size: 16px;
height: 60px;
}
th.linshi,
......@@ -276,19 +236,19 @@ export default {
display: block;
width: 0;
height: 0;
border-width: 0px 0px 45px 45px;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #fe9400;
position: absolute;
top: 0px;
right: 3px;
top: 0;
right: 0;
transform: rotate(-90deg);
}
.icon {
position: absolute;
top: 8px;
right: 6px;
top: 13px;
right: -4px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
......@@ -300,6 +260,7 @@ export default {
height: 40px;
padding: 4px;
font-size: 13px;
width: 140px;
}
>tr:nth-child(odd) td {
......
......@@ -6,24 +6,24 @@
<div class="slxx_title">受理信息</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="业务号：" prop="ywh">
<el-form-item :class="flag? 'marginBot0': ''" label="业务号：" prop="ywh">
<el-input disabled v-model="ruleForm.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理人员：" prop="slry">
<el-form-item :class="flag? 'marginBot0': ''" label="受理人员：" prop="slry">
<el-input disabled v-model="ruleForm.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理时间：" prop="slsj">
<el-form-item :class="flag? 'marginBot0': ''" label="受理时间：" prop="slsj">
<el-input disabled v-model="ruleForm.slsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利类型：" prop="qllx">
<el-form-item :class="flag? 'marginBot0': ''" label="权利类型：" prop="qllx">
<el-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......@@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型：" prop="djlx">
<el-form-item :class="flag? 'marginBot0': ''" label="登记类型：" prop="djlx">
<el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......@@ -39,7 +39,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记情形：" prop="djqx">
<el-form-item :class="flag? 'marginBot0': ''" label="登记情形：" prop="djqx">
<el-input disabled v-model="ruleForm.djqxmc"></el-input>
</el-form-item>
</el-col>
......@@ -47,34 +47,34 @@
<div class="slxx_title">不动产单元情况</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地代码：" prop="zddm">
<el-form-item :class="flag? 'marginBot0': ''" label="宗地代码：" prop="zddm">
<el-input disabled v-model="ruleForm.zddm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号：" prop="bdcdyh">
<el-form-item :class="flag? 'marginBot0': ''" label="不动产单元号：" prop="bdcdyh">
<el-input disabled v-model="ruleForm.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：" prop="qlxzmc">
<el-form-item :class="flag? 'marginBot0': ''" label="权利性质：" prop="qlxzmc">
<el-input disabled v-model="ruleForm.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积：" prop="zdmj">
<el-form-item :class="flag? 'marginBot0': ''" label="宗地面积：" prop="zdmj">
<el-input disabled v-model="ruleForm.zdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途：" prop="tdyt">
<el-form-item :class="flag? 'marginBot0': ''" label="土地用途：" prop="tdyt">
<el-input disabled v-model="ruleForm.tdyt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利设定方式：" prop="qlsdfs">
<el-form-item :class="flag? 'marginBot0': ''" label="权利设定方式：" prop="qlsdfs">
<el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式">
<el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
</el-option>
......@@ -84,33 +84,33 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="取得价格：" prop="qdjg">
<el-form-item :class="flag? 'marginBot0': ''" label="取得价格：" prop="qdjg">
<el-input disabled v-model="ruleForm.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="坐落：" prop="zl">
<el-form-item :class="flag? 'marginBot0': ''" label="坐落：" prop="zl">
<el-input disabled v-model="ruleForm.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="使用期限：" prop="tdsyqx">
<el-form-item :class="flag? 'marginBot0': ''" label="使用期限：" prop="tdsyqx">
<el-input disabled v-model="ruleForm.tdsyqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="使用权起止时间：" prop="qssj">
<el-form-item :class="flag? 'marginBot0': ''" label="使用权起止时间：" prop="qssj">
<el-input disabled v-model="ruleForm.syqqzsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item label="附记：" prop="fj">
<el-form-item :class="flag? 'marginBot0': ''" label="附记：" prop="fj">
<el-input type="textarea" v-model="ruleForm.fj"></el-input>
</el-form-item>
</el-col>
......@@ -118,7 +118,7 @@
<div class="slxx_title">权利人信息</div>
<el-row :gutter="10">
<el-col :span="14">
<el-form-item label="共有方式：">
<el-form-item :class="flag? 'marginBot0': ''" label="共有方式：">
<el-radio-group v-model="ruleForm.gyfs">
<el-radio label="1">单独所有</el-radio>
<el-radio label="2">共同共有</el-radio>
......@@ -127,7 +127,7 @@
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs=='2'">
<el-form-item label="是否分别持证：">
<el-form-item :class="flag? 'marginBot0': ''" label="是否分别持证：">
<el-radio-group v-model="ruleForm.sffbcz">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
......@@ -135,7 +135,7 @@
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs=='2'">
<el-form-item label="持证人：">
<el-form-item :class="flag? 'marginBot0': ''" label="持证人：">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
......@@ -147,14 +147,14 @@
<div class="slxx_title">登记原因</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因：" prop="djyy">
<el-form-item :class="flag? 'marginBot0': ''" label="登记原因：" prop="djyy">
<el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-form-item class="btn">
<el-form-item :class="flag? 'marginBot0': ''" class="btn">
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
</el-row>
......@@ -245,6 +245,7 @@ export default {
margin-right: 10px;
}
/deep/.el-select {
width: 100%;
}
......@@ -253,6 +254,10 @@ export default {
margin-bottom: 8px;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.slxx {
box-sizing: border-box;
padding-right: 15px;
......@@ -271,10 +276,10 @@ export default {
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 15px;
margin-bottom: 15px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 18px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
......
......@@ -164,9 +164,9 @@ export default {
.spyj_title {
text-align: center;
font-size: 24px;
font-size: 18px;
display: block;
margin: 30px 0;
margin: 5px;
}
/deep/.el-form-item {
......
......@@ -58,6 +58,7 @@
<p class="splitScreen tabsList-title">材料信息</p>
<div class="splitScreen"></div>
</div>
<<<<<<< HEAD
<el-tabs v-model="activeName" @tab-click="activeClick">
<el-tab-pane
:label="item.name"
......@@ -83,6 +84,18 @@
</div>
</el-tab-pane>
</el-tabs>
=======
<div style="width:100%">
<el-tabs v-model="activeName" @tab-click='activeClick'>
<el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
</el-tab-pane>
</el-tabs>
<div class="splitScreen-con">
<component ref='slxx' v-if="activeName == 'slsq'" :is="editItem" :flag="flag" :key="key" />
<component :is="editItem" :key="key" />
</div>
</div>
>>>>>>> 560bdac56422758a7b06eb466a42296662fac954
</div>
</div>
<zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" />
......@@ -132,8 +145,12 @@ export default {
},
watch: {
activeName: {
handler(newName, oldName) {
this.editItem = this.loadView(newName);
handler (newName, oldName) {
if (newName === 'qlxx') {
this.editItem = this.loadViewSlsq()
} else {
this.editItem = this.loadView(newName)
}
},
immediate: true,
},
......@@ -153,14 +170,13 @@ export default {
that.id = id;
var formdata = new FormData();
formdata.append("bsmSlsq", id);
leftMenu(formdata).then((res) => {
console.log(res, "eeeeeeeeeeee");
leftMenu(formdata).then(res => {
if (res.code === 200) {
this.unitData = res.result ? res.result : [];
setTimeout(() => {
that.$refs?.slxx[0].list(that.unitData && that.unitData[0].bsmSldy);
this.taskId = that.unitData[0].taskId;
this.bsmBusiness = that.unitData[0].bsmBusiness;
that.$refs.slxx?.[0].list(that.unitData?.[0]?.bsmSldy)
this.taskId = that.unitData?.[0]?.taskId
this.bsmBusiness = that.unitData?.[0]?.bsmBusiness
}, 300);
}
});
......@@ -173,8 +189,8 @@ export default {
formdata.append("bestepid", bestepid);
stepExpandInfo(formdata).then((res) => {
if (res.code === 200) {
this.tabList1 = [...res.result.form];
this.tabList = res.result.form;
this.tabList1 = [...res.result.form]
this.tabList = res.result.form
this.headerleftList = res.result.button;
this.headerRightList = res.result.operation;
}
......@@ -237,6 +253,9 @@ export default {
return (r) =>
require.ensure([], () => r(require(`./components/${view}.vue`)));
},
loadViewSlsq () {
return r => require.ensure([], () => r(require('../../components/jsydsyq/jsydsyq.vue')))
},
},
};
</script>
......@@ -261,13 +280,15 @@ export default {
font-size: 12px;
}
/deep/.el-tabs__content {
height: calc(100vh - 135px) !important;
/deep/.el-tabs__header {
margin: 0 !important;
}
.splitScreen-con {
padding: 0 15px;
box-sizing: border-box;
height: calc(100% - 350px);
}
.fqsq {
......@@ -358,7 +379,6 @@ export default {
.tabsList-left {
border-right: 1px solid #ebeef5;
position: relative;
width: 250px;
box-sizing: border-box;
ul {
......