bdf50ebf by 杨威

合并代码

2 parents 55dabf3b 0f4c69fb
......@@ -93,3 +93,13 @@ export function updatePlc(data) {
})
}
/**
* 批量修改室号
*/
export function updateSh(data) {
return request({
url: '/system/qjH/batchSh',
method: 'put',
data: data
})
}
......
<template>
<div>
<el-dialog
title="新增"
title="批量层"
:visible.sync="isVisible"
width="50%"
@close="close"
......@@ -162,14 +162,13 @@
}
.inputtitle {
line-height: 40px;
line-height: 41px;
width: 95%;
border: none;
height: 98%;
outline: none;
}
/* .inputtitle:focus {
outline: none;
}*/
.shop {
margin-top: 20px;
......
......@@ -50,7 +50,7 @@
<tr>
<td colspan="2">户型</td>
<td colspan="2">
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -61,7 +61,7 @@
</td>
<td colspan="2">户型结构</td>
<td>
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -82,7 +82,7 @@
<td colspan="2"><input type="text" class="inputtitle"/></td>
<td colspan="2">房屋类型</td>
<td>
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -95,7 +95,7 @@
<tr>
<td colspan="2">产别</td>
<td colspan="2">
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -112,7 +112,7 @@
<tr>
<td colspan="2">房屋性质</td>
<td colspan="2">
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -127,7 +127,7 @@
<tr>
<td colspan="2">房屋结构</td>
<td colspan="5">
<el-select>
<el-select class="selectTitle">
<el-option
v-for="i in hx"
:key="i.key"
......@@ -223,8 +223,7 @@
},
cancel: function () {
this.$emit('close')
this.isVisible = false
this.close()
}
},
mounted() {
......@@ -256,17 +255,23 @@
cursor: pointer;
}
.el-select {
width: 98%;
}
.inputtitle {
line-height: 40px;
width: 95%;
border: none;
outline: none;
height: 95%;
}
.selectTitle{
width: 100%;
border-radius: 0;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border: none;
position: relative;
display: block;
}
.shop {
text-align: center;
margin-top: 20px;
......
<template>
<div class="main">
<el-dialog
title="批量室号"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
center>
<div>
<span class="xl" @click="xl">祥例</span>
<table border="1">
<tr>
<td>室号前缀</td>
<td>单元号</td>
<td>分割符A</td>
<td>层号前自动补0</td>
<td></td>
<td>分割符B</td>
<td>户号</td>
<td>室号后缀</td>
</tr>
<tr>
<td>
<input type="text" class="inputtitle" v-model="plshData.shqz"/>
</td>
<td>
<el-checkbox v-model="plshData.isSelectDyh"></el-checkbox>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfA"/>
</td>
<td>
<el-checkbox v-model="plshData.isChqbl"></el-checkbox>
</td>
<td>
<el-select v-model="plshData.c">
<el-option
v-for="i in cs"
:key="i.key"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fghB"/>
</td>
<td>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.shhz"/>
</td>
</tr>
</table>
<div class="gz">
<span>室号规则:[单元号][分割符A][层号][分割符A][室号前缀][室号][室号后缀]</span>
</div>
</div>
<div>
<el-dialog
title="祥例"
:visible.sync="xlVisible"
width="50%"
:modal-append-to-body="false"
>
<div class="xlgz">
<span>
样例1:10101 <span>(1单元01层01室)</span>([单元号][层号],勾选“层号自动补0”)
<br/>
样例2:11301室<span>(1单元13层01室)</span>([单元号][层号][室号后缀])
<br/>
样例3:101<span>(1层01室)</span>([层号])
<br/>
样例4:1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符],勾选“层号之前增加分隔符”)
<br/>
样例5:1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符])
<br/>
样例6:1-01<span>(1单元13层01室)</span>([层号][分隔符],勾选“室号之前增加分隔符”)
</span>
</div>
</el-dialog>
</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>
import {updateSh} from './../../api/zrz'
import {Message} from 'element-ui'
export default {
name: "plSh",
props: {
plShVisible: {
type: Boolean,
default: false
},
bsms: {
type: Array
}
},
data() {
return {
isVisible: false,
xlVisible: false,
plshData: {
shqz: '',
isSelectDyh: false,
fgfA: '',
isChqbl: false,
c: '',
fgfB: '',
shhz: ''
},
cs: [
{
key: '1',
label: '明义层',
value: '1'
}, {
key: '2',
label: '实际层',
value: '2'
}
]
}
},
methods: {
xl: function () {
this.xlVisible = true;
},
close: function () {
this.$emit("close")
this.isVisible = false
this.result();
},
result: function () {
this.plshData = {
shqz: '',
isSelectDyh: false,
fgfA: '',
isChqbl: false,
c: '',
fgfB: '',
shhz: ''
}
},
save: function () {
this.plshData['bsms'] = this.bsms
console.log(this.plshData)
updateSh(this.plshData).then(res=>{
if (res.success){
this.close();
} else {
Message.error(res.message)
}
})
},
cancel: function () {
this.close()
}
},
watch: {
plShVisible: 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>
......@@ -111,6 +111,12 @@
default: function () {
return false
}
},
dylxs: {
type: Array,
default: function () {
return ['zd']
}
}
},
mounted() {
......@@ -123,7 +129,6 @@
this.queryData = {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
xmmc: "",
......@@ -133,6 +138,7 @@
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
})
......
......@@ -335,7 +335,7 @@
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
@close="close"></query-data>
<div class="header-button">
<el-button type="primary" @click="save">保存</el-button>
......@@ -505,7 +505,7 @@
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
@close="close"></query-data>
<div class="header-button">
<el-button type="primary" @click="save">保存</el-button>
......
......@@ -77,7 +77,7 @@
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
@close="close"></query-data>
</div>
</el-tab-pane>
......@@ -117,7 +117,7 @@
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
@close="close"></query-data>
</div>
</el-tab-pane>
......
......@@ -18,32 +18,11 @@
<el-button class="radioBtn" label="2" border>实预测转换</el-button>
<el-button class="radioBtn" label="3" border>批量户</el-button>
<el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
<el-button class="radioBtn" label="5" border>批量室号</el-button>
<el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
<el-button class="radioBtn" label="6" border>批量坐落</el-button>
<el-button class="radioBtn" label="7" border>批量单元号</el-button>
</el-col>
</el-row>
<!-- <div >
<el-radio-group v-model="tabPosition">
<el-radio-button label="sc">实测</el-radio-button>
<el-radio-button label="yc">预测</el-radio-button>
</el-radio-group>
<el-input
v-model="bdcdyh"
class="searchInput"
placeholder="输入不动产单元号"
></el-input>
<div>
<el-button class="radioBtn" label="1" @click="create" border>创建楼盘</el-button>
<el-button class="radioBtn" label="2" border>实预测转换</el-button>
<el-button class="radioBtn" label="3" border>批量户</el-button>
<el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
<el-button class="radioBtn" label="5" border>批量室号</el-button>
<el-button class="radioBtn" label="6" border>批量坐落</el-button>
<el-button class="radioBtn" label="7" border>批量单元号</el-button>
</div>
</div> -->
</div>
<div
class="tab-content"
......@@ -124,11 +103,13 @@
</div>
</el-dialog>
<pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
</div>
</template>
<script>
import PlC from "./../../../../components/plc/plC"
import PlSh from "./../../../../components/plsh/plSh"
import LineTree from "../../../../components/lineTree/lineTree";
import addLjz from "./ljz/index";
import addZdy from "./zdy/index";
......@@ -138,12 +119,13 @@ import { getLpbMenuTree } from "../../../../api/lpb";
export default {
name: "",
components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC },
components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh },
props: {},
data() {
return {
bsms:["123","321","231"],
plcVisible:false,
plShVisible:false,
tabPosition:'sc',
radio1: "",
radio2: "",
......@@ -236,6 +218,9 @@ export default {
plcClose(){
this.plcVisible=false;
},
plshClose(){
this.plShVisible=false
},
//获取高度计算lpb内容区高度
getHeight() {
this.lpbContentHight = window.innerHeight - 276;
......