Skip to content

M
multiSystem
Commit 66bebf5b authored by Gakki's avatar Gakki
Browse files
Options

标签截止03.17

parent 87e23b52
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 188 deletions
src/views/houseData/basicInfoByLabel.vue
View file @ 66bebf5b
...@@ -2,184 +2,175 @@ ...@@ -2,184 +2,175 @@
<template> <template>
<div class="routerWapper"> <div class="routerWapper">
<!-- {{checkedKeys}} --> <!-- {{checkedKeys}} -->
<a-row type='flex'> <div class="layoutMargin layoutPadding">
<a-col flex='250px' style="overflow: hidden"> <a-row>
<div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding" style="height: 100%"> <a-col :span="4" style="height:100%; position:relative">
<!-- <a-row style="font-weight: bold">标签筛选条件</a-row> <span style="display: block; width: 90%; color:#1890ff; font-size: 16px; font-weight: 500; padding-bottom:5px; border-bottom:1px solid #1890ff;">标签筛选条件</span>
<a-divider /> -->
<a-tree <a-tree
@check='onCheck' @check='onCheck'
checkable checkable
:tree-data="treeData" :tree-data="treeData"
:replace-fields="replaceFields" :replace-fields="replaceFields"
/> />
<!-- <a-tree </a-col>
v-model='checkedKeys' <a-col :span="17" style="padding-left: 10px; border-left:1px solid #ccc;">
checkable <!-- <div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding"> -->
:tree-data="treeData" <a-form :form="form" class="protalForm" >
:replace-fields="replaceFields" <a-row class="formItem" type="flex" :justify="simpleSearchForm ? 'end' : ''" align="top" :gutter="simpleSearchForm ? 16 : 0">
:selected-keys="selectedKeys" <a-col span="8">
@select="onSelect" <a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
/> --> <a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" />
</div> </a-form-item>
</a-col> </a-col>
<a-col flex='78%'> <a-col span="8" >
<div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding"> <a-form-item label="小区地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-form :form="form" class="protalForm" > <a-input placeholder="请输入查询内容" v-decorator="['addrFrst_l']" />
<a-row class="formItem" type="flex" :justify="simpleSearchForm ? 'end' : ''" align="top" :gutter="simpleSearchForm ? 16 : 0"> </a-form-item>
<a-col span="8"> </a-col>
<a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-col span="8" >
<a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" /> <a-form-item label="房办" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
</a-form-item> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.hoId']" @change="handleChangefb">
</a-col> <a-select-option v-for="(item) in hos" :key="item.hoId" :value="item.cspName+'#'+item.hoId">{{ item.hoName }}</a-select-option>
<a-col span="8" > </a-select>
<a-form-item label="小区地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> </a-form-item>
<a-input placeholder="请输入查询内容" v-decorator="['addrFrst_l']" /> </a-col>
</a-form-item> <a-col span="8" >
</a-col> <a-form-item label="门牌幢地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-col span="8" > <a-input placeholder="请输入查询内容" v-decorator="['unitAddr']" />
<a-form-item label="房办" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> </a-form-item>
<a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.hoId']" @change="handleChangefb"> </a-col>
<a-select-option v-for="(item) in hos" :key="item.hoId" :value="item.cspName+'#'+item.hoId">{{ item.hoName }}</a-select-option> <a-col span="8">
</a-select> <a-form-item label="物业公司名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
</a-form-item> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.cspId'] " @change="changeWy">
</a-col> <a-select-option v-for="(item) in wuye" :key="item.cspId" :value=" item.cspName+'#'+item.cspId">{{ item.cspName }}</a-select-option>
<a-col span="8" > </a-select>
<a-form-item label="门牌幢地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> </a-form-item>
<a-input placeholder="请输入查询内容" v-decorator="['unitAddr']" /> </a-col>
</a-form-item> <a-col span="8" >
</a-col> <a-form-item label="街道名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-col span="8"> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.streetId']" @change="changeStreet">
<a-form-item label="物业公司名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-select-option v-for="(item) in street" :key="item.streetId" :value="item.strName+'#'+item.streetId">{{ item.strName }}</a-select-option>
<a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.cspId'] " @change="changeWy"> </a-select>
<a-select-option v-for="(item) in wuye" :key="item.cspId" :value=" item.cspName+'#'+item.cspId">{{ item.cspName }}</a-select-option> </a-form-item>
</a-select> </a-col>
</a-form-item> <a-col span="8">
</a-col> <a-form-item v-if="!simpleSearchForm" label="更新时间" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-col span="8" > <a-range-picker v-decorator="['syncTime_betn']" />
<a-form-item label="街道名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> </a-form-item>
<a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.streetId']" @change="changeStreet"> </a-col>
<a-select-option v-for="(item) in street" :key="item.streetId" :value="item.strName+'#'+item.streetId">{{ item.strName }}</a-select-option> <a-col span="8">
</a-select> <a-form-item v-if="!simpleSearchForm" label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
</a-form-item> <a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc">
</a-col> <a-select-option value="false">否</a-select-option>
<a-col span="8"> <a-select-option value="true">是</a-select-option>
<a-form-item v-if="!simpleSearchForm" label="更新时间" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> </a-select>
<a-range-picker v-decorator="['syncTime_betn']" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col span="8">
<a-col span="8"> <a-form-item v-if="!simpleSearchForm" label="物业合同服务到期日" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-form-item v-if="!simpleSearchForm" label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-date-picker placeholder="请选择查询内容" v-decorator="['cspContractEndDate_lt']" />
<a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc"> </a-form-item>
<a-select-option value="false">否</a-select-option> </a-col>
<a-select-option value="true">是</a-select-option> <a-col span="8">
</a-select> <a-form-item v-if="!simpleSearchForm" label="小区性质" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
</a-form-item> <a-select
</a-col> v-decorator="['stKind_in']"
<a-col span="8"> mode="multiple"
<a-form-item v-if="!simpleSearchForm" label="物业合同服务到期日" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> style="width: 100%"
<a-date-picker placeholder="请选择查询内容" v-decorator="['cspContractEndDate_lt']" /> placeholder="请选择小区性质（多选）"
</a-form-item> @change="changeType"
</a-col> allowClear
<a-col span="8"> >
<a-form-item v-if="!simpleSearchForm" label="小区性质" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-select-option v-for="i in typeList" :key="i.key">{{i.name}}</a-select-option>
<a-select </a-select>
v-decorator="['stKind_in']" </a-form-item>
mode="multiple" </a-col>
style="width: 100%"
placeholder="请选择小区性质（多选）"
@change="changeType"
allowClear
>
<a-select-option v-for="i in typeList" :key="i.key">{{i.name}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select
v-decorator="['unitKind_in']"
mode="multiple"
style="width: 100%"
placeholder="请选择小区层数（多选）"
@change="changeLevel"
allowClear
>
<a-select-option v-for="i in levelType" :key="i.key">{{i.name}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col span="8"> <a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="物业服务类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item v-if="!simpleSearchForm" label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['wuyeServiceType'] " @change="changeServiceType"> <a-select
<a-select-option v-for="(item) in wuyeServiceType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option> v-decorator="['unitKind_in']"
</a-select> mode="multiple"
</a-form-item> style="width: 100%"
</a-col> placeholder="请选择小区层数（多选）"
@change="changeLevel"
allowClear
>
<a-select-option v-for="i in levelType" :key="i.key">{{i.name}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col span="8"> <a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="竣工日期" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item v-if="!simpleSearchForm" label="物业服务类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate"> <a-select allowClear placeholder="请选择查询内容" v-decorator="['wuyeServiceType'] " @change="changeServiceType">
<a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option> <a-select-option v-for="(item) in wuyeServiceType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col span="8" v-if="$store.state.isXuhui"> <a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="邻小汇成立状态" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item v-if="!simpleSearchForm" label="竣工日期" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['neighbourType'] " @change="changeNeighbourType"> <a-select allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate">
<a-select-option v-for="(item) in neighbourType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option> <a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<!-- 动态搜索条件 -->
<template v-if="customKeyEnable">
<a-col span="8" v-for="i in searchList" :key="i.id" >
<a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select> </a-select>
<a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'" placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]"> </a-form-item>
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option> </a-col>
<a-col span="8" v-if="$store.state.isXuhui">
<a-form-item v-if="!simpleSearchForm" label="邻小汇成立状态" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['neighbourType'] " @change="changeNeighbourType">
<a-select-option v-for="(item) in neighbourType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select> </a-select>
<a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'" v-decorator="[i.keyCode]" />
<a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
<a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> <!-- 动态搜索条件 -->
<template v-if="customKeyEnable">
<a-col span="8" v-for="i in searchList" :key="i.id" >
<a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select>
<a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'" placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select>
<a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'" v-decorator="[i.keyCode]" />
<a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
<a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
</a-form-item>
</a-col>
</template>
<!-- 功能按钮区 --> <!-- 功能按钮区 -->
<a-col span="24" class="algin-right"> <a-col span="24" class="algin-right">
<a-button v-if="!$store.state.isXuhui && $api.BASE_URL.indexOf('211.136.105')!=-1" @click="exportEWM">导出二维码</a-button> <a-button v-if="!$store.state.isXuhui && $api.BASE_URL.indexOf('211.136.105')!=-1" @click="exportEWM">导出二维码</a-button>
<a-button @click="exportList">导出数据</a-button> <a-button @click="exportList">导出数据</a-button>
<a-button @click="reset">重置</a-button> <a-button @click="reset">重置</a-button>
<a-button type="primary" @click="search">搜索</a-button> <a-button type="primary" @click="search">搜索</a-button>
<a-button <a-button
type="primary" type="primary"
v-if="simpleSearchForm" v-if="simpleSearchForm"
@click="showMoreSearch" @click="showMoreSearch"
>更多搜索</a-button >更多搜索</a-button
> >
<a-button <a-button
type="primary" type="primary"
v-if="!simpleSearchForm" v-if="!simpleSearchForm"
@click="closeMoreSearch" @click="closeMoreSearch"
>简单搜索</a-button >简单搜索</a-button
> >
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
<!-- <p class="gayLine noline" /> --> <!-- <p class="gayLine noline" /> -->
<div class="portalTableOperates"> <div class="portalTableOperates">
<tableAndMut ref="childTab" :tableData="tableData" :pagination="pagination" :tbl="tbl" /> <tableAndMut ref="childTab" :tableData="tableData" :pagination="pagination" :tbl="tbl" />
</div> </div>
</div> <!-- </div> -->
<RouterWapper v-else></RouterWapper> <!-- <RouterWapper v-else></RouterWapper> -->
</a-col> </a-col>
</a-row> </a-row>
</div>
</div> </div>
</template> </template>
......
src/views/label/labelList.vue
View file @ 66bebf5b
...@@ -8,7 +8,27 @@ ...@@ -8,7 +8,27 @@
<a-button @click="backPage"> 返回 </a-button> <a-button @click="backPage"> 返回 </a-button>
</div> </div>
</div> </div>
<div v-if="$route.name=='lvot'"> <div class="layoutMargin layoutPadding" v-if="$route.name == 'lvot'">
<a-row v-if="$route.name=='lvot'">
<a-col :span="4" style="border-right:1px solid #ccc;height:100%; position:relative">
<span style="display: block; width: 90%; color:#1890ff; font-size: 16px; font-weight: 500; padding-bottom:5px;"><a-button style="width: 100%" size='medium' type="default" @click="addLabel"> <a-icon type="plus" />添加标签 </a-button></span>
<a-tree
style="height: 700px"
:tree-data="treeData"
:replace-fields="replaceFields"
:selected-keys="selectedKeys"
@select="onSelect"
/>
</a-col>
<a-col :span="17" :offset="1">
<RightPanel v-if="currentState == 'create'" :trigger-type='currentState' @finish='getFinishState' />
<RightPanel v-else-if="currentState == 'loadChildLabel'" :trigger-type='currentState' :label-id='labelId' @finish='getFinishState' />
<ParentRightPanel v-else-if="currentState == 'loadParentLabel'" :trigger-type='currentState' :label-id='labelId' @finish='getFinishState' />
<EmptyRightPanel v-else />
</a-col>
</a-row>
</div>
<!-- <div v-if="$route.name=='lvot'">
<a-row> <a-row>
<a-col :span='4' class="layoutMargin layoutPadding" style="height: 680px"> <a-col :span='4' class="layoutMargin layoutPadding" style="height: 680px">
<a-row style="height: 36px"> <a-row style="height: 36px">
...@@ -29,7 +49,7 @@ ...@@ -29,7 +49,7 @@
<EmptyRightPanel v-else /> <EmptyRightPanel v-else />
</a-col> </a-col>
</a-row> </a-row>
</div> </div> -->
<RouterWapper v-else /> <RouterWapper v-else />
</div> </div>
</template> </template>
......
src/views/label/labelRightSide.vue
View file @ 66bebf5b
...@@ -116,8 +116,9 @@ ...@@ -116,8 +116,9 @@
<a-modal :visible='deleteVisible' @ok='handleDeleteOk' @cancel='handleCancelOk'> <a-modal :visible='deleteVisible' @ok='handleDeleteOk' @cancel='handleCancelOk'>
确定删除标签【{{labelNameForDel}}】吗? 确定删除标签【{{labelNameForDel}}】吗?
</a-modal> </a-modal>
<a-modal width='800px' :bordered='true' :title='`搜索到`+resultList.length + `条结果，确认保存吗？`' :visible='confirmVisible' @ok='handleConfirmVisible' @cancel='handleConfirmCancel'> <a-modal width='400px' :bordered='true' title='提示' :visible='confirmVisible' @ok='handleConfirmVisible' @cancel='handleConfirmCancel'>
<a-table class="portalTable" size="small" row-key="id" :columns="columns" :dataSource="resultList"></a-table> 确定保存吗？
<!-- <a-table class="portalTable" size="small" row-key="id" :columns="columns" :dataSource="resultList"></a-table> -->
</a-modal> </a-modal>
</div> </div>
</template> </template>
...@@ -419,28 +420,30 @@ export default { ...@@ -419,28 +420,30 @@ export default {
}) })
} }
this.$ajax.post({ // this.$ajax.post({
url: this.$api.GET_LABEL_BIND_FILTER_RESULT, // url: this.$api.GET_LABEL_BIND_FILTER_RESULT,
params: this.jsonData // params: this.jsonData
}).then(res => { // }).then(res => {
if (res.code == 200) { // if (res.code == 200) {
if(res.data == null) { // if(res.data == null) {
console.log(1) // console.log(1)
this.$message.error('该标签无搜索结果，标签添加失败！') // this.$message.error('该标签无搜索结果，标签添加失败！')
} else if(!!res.data.content) { // } else if(!!res.data.content) {
if(res.data.content.length > 0) { // if(res.data.content.length > 0) {
this.resultList = res.data.content // this.resultList = res.data.content
this.confirmVisible = !this.confirmVisible // this.confirmVisible = !this.confirmVisible
} else { // } else {
console.log(2) // console.log(2)
this.$message.error('该标签无搜索结果，标签添加失败！') // this.$message.error('该标签无搜索结果，标签添加失败！')
} // }
} else { // } else {
} // }
} else { // } else {
this.$message.error('接口报错，报错码 ' + res.code + ', 请稍后重试！') // this.$message.error('接口报错，报错码 ' + res.code + ', 请稍后重试！')
} // }
}) // })
// this.resultList = res.data.content
this.confirmVisible = !this.confirmVisible
} }
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment