250d1225 by 杨威

合并修改

2 parents c5092ce9 47cd4455
......@@ -55,7 +55,7 @@
</tr>
</table>
<div class="gz">
<span>室号规则:[单元号][分割符A][层号][分割符A][室号前缀][室号][室号后缀]</span>
<span>室号规则:{{gz}}</span>
</div>
</div>
<div>
......@@ -94,6 +94,7 @@
<script>
import {updateSh} from './../../api/zrz'
import {Message} from 'element-ui'
export default {
name: "plSh",
props: {
......@@ -154,8 +155,8 @@
save: function () {
this.plshData['bsms'] = this.bsms
console.log(this.plshData)
updateSh(this.plshData).then(res=>{
if (res.success){
updateSh(this.plshData).then(res => {
if (res.success) {
this.close();
} else {
Message.error(res.message)
......@@ -166,6 +167,33 @@
this.close()
}
},
computed: {
gz: function () {
let gz = "";
if (this.plshData.shqz != "") {
gz += this.plshData.shqz
}
if (this.plshData.isSelectDyh) {
gz += "[单元号]"
}
if (this.plshData.fgfA != "") {
gz += this.plshData.fgfA
}
if (this.plshData.c == 1) {
gz += "[名义层]"
} else if (this.plshData.c == 2) {
gz += "[实际层]"
}
if (this.plshData.fgfB != "") {
gz += this.plshData.fgfB
}
gz += "[户号]";
if (this.plshData.shhz != "") {
gz += this.plshData.shhz
}
return gz;
}
},
watch: {
plShVisible: function (val) {
this.isVisible = val
......
<template>
<div>
<el-dialog
title="批量坐落"
:visible.sync="isVisible"
width="60%"
@close="close"
:modal-append-to-body="false"
center>
<div>
<table border="1">
<tr>
<td>前缀</td>
<td>宗地</td>
<td>自然幢</td>
<td>逻辑幢</td>
<td>幢单元</td>
<td></td>
<td></td>
<td>后缀</td>
</tr>
<tr>
<td>
<input type="text" class="inputtitle" v-model="plzlData.qz"/>
</td>
<td>
<el-select v-model="plzlData.zd">
<el-option v-for="i in zdgz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<el-select v-model="plzlData.zrz">
<el-option v-for="i in zrzgz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<el-select v-model="plzlData.ljz">
<el-option v-for="i in ljzgz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<el-select v-model="plzlData.zdy">
<el-option v-for="i in zdygz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<el-select v-model="plzlData.c">
<el-option v-for="i in cgz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<el-select v-model="plzlData.h">
<el-option v-for="i in hgz"
:key="i.label"
:label="i.label"
:value="i.value">
</el-option>
</el-select>
</td>
<td>
<input type="text" class="inputtitle" v-model="plzlData.hz"/>
</td>
</tr>
</table>
<div class="gz">
<span>户坐落规则:{{gz}}</span>
</div>
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: "plZl",
props: {
plZlVisible: {
type: Boolean,
default: false
},
bsms: {
type: Array
},
measureType: {
type: Number
}
},
data() {
return {
isVisible: false,
plzlData: {
qz: '',
zd: '',
zrz: '',
ljz: '',
zdy: '',
c: '',
h: '',
hz: ''
},
zdgz: [
{
label: '宗地坐落',
value: '1'
}, {
label: "宗地名称",
value: '2'
}, {
label: "空",
value: '3'
}
],
zrzgz: [
{
label: '自然幢坐落',
value: '1'
}, {
label: "自然幢名称",
value: '2'
}, {
label: "空",
value: '3'
}
],
ljzgz: [
{
label: '逻辑幢名称',
value: '1'
}, {
label: "逻辑幢号",
value: '2'
}
],
zdygz: [
{
label: '幢单元名称',
value: '1'
}, {
label: "幢单元号",
value: '2'
}
],
cgz: [
{
key: '1',
label: '明义层',
value: '1'
}, {
key: '2',
label: '实际层',
value: '2'
}
],
hgz: [
{
key: '1',
label: '室号',
value: '1'
}, {
key: '2',
label: '户号',
value: '2'
}
]
}
},
methods: {
save: function () {
this.plzlData['bsms'] = this.bsms;
this.plzlData['measureType'] = this.measureType;
console.log("save......", this.plzlData)
},
cancel: function () {
console.log("cancel......")
},
close: function () {
this.$emit("close")
this.isVisible = false
this.result();
},
result: function () {
console.log("重置")
}
},
computed: {
gz: function () {
// [前缀][宗地][自然幢][单元][室号][室号][后缀]
let gz = "";
if (this.plzlData.qz != '') {
gz += this.plzlData.qz
}
if (this.plzlData.zd == 1) {
gz += "[宗地坐落]";
} else if (this.plzlData.zd == 2) {
gz += "[宗地名称]";
}
if (this.plzlData.zrz == 1) {
gz += "[自然幢坐落]"
} else if (this.plzlData.zrz == 2) {
gz += "[自然幢名称]";
}
if (this.plzlData.ljz == 1) {
gz += "[逻辑幢名称]"
} else if (this.plzlData.ljz == 2) {
gz += "[逻辑幢号]"
}
if (this.plzlData.zdy == 1) {
gz += "[幢单元名称]";
} else if (this.plzlData.zdy == 2) {
gz += "[幢单元号]"
}
if (this.plzlData.c == 1) {
gz += "[名义层]"
} else if (this.plzlData.c == 2) {
gz += "[实际层]"
}
if (this.plzlData.h == 1) {
gz += "[室号]"
} else if (this.plzlData.h == 2) {
gz += "[户号]"
}
if (this.plzlData.hz != "") {
gz += this.plzlData.hz
}
if (gz == "") {
gz += "无"
}
return gz;
}
},
watch: {
plZlVisible: function (val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
:hover {
cursor: pointer;
}
}
td {
text-align: center;
height: 36px;
min-width: 60px;
}
.xl {
color: blue;
float: right;
}
.xl:hover {
cursor: pointer;
}
.inputtitle {
line-height: 38px;
width: 90%;
border: none;
outline: none;
}
.shop {
text-align: center;
margin-top: 20px;
}
.gz {
color: #b2b2b2;
font-size: 12px;
margin-top: 40px;
}
.xlgz {
span {
font-size: 16px;
line-height: 22px;
span {
color: red;
}
}
}
</style>
......@@ -120,6 +120,7 @@
</el-dialog>
<!-- 批量操作弹出框 -->
<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h>
<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" :measureType="tabPosition" @close="plZlClose"></pl-zl>
<pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
<!-- 双击户的弹出框 -->
......@@ -140,6 +141,7 @@
import PlC from "./../../../../components/plc/plC"
import PlSh from "./../../../../components/plsh/plSh"
import PlH from "./../../../../components/plh/plH"
import PlZl from "./../../../../components/plzl/plZl"
import LineTree from "../../../../components/lineTree/lineTree";
import addLjz from "./ljz/index";
import addZdy from "./zdy/index";
......@@ -150,7 +152,7 @@ import { getLpbMenuTree } from "../../../../api/lpb";
export default {
name: "",
components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh,PlH,hbj },
components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh,PlH ,PlZl,hbj},
props: {},
data() {
return {
......@@ -160,7 +162,7 @@ export default {
plhVisible:false,
plShVisible:false,
hbjVisible:false,
tabPosition:'0',
tabPosition:1,
radio1: "",
radio2: "",
createFlag: false,
......@@ -249,6 +251,9 @@ export default {
}, 100);
},
methods: {
plZlClose(){
this.plzlVisible=false
},
plcClose(){
this.plcVisible=false;
},
......