Browse Source

搜索栏按钮,智能搜索,

V1.0
马魁 3 years ago
parent
commit
629cac83bd
  1. BIN
      src/assets/images/index/i-menu.png
  2. BIN
      src/assets/images/index/i-menu2.png
  3. 31
      src/assets/scss/buttonstyle.scss
  4. 70
      src/assets/scss/modules/management/list-main.scss
  5. 14
      src/assets/scss/people-info.scss
  6. 27
      src/views/components/resiForm.vue
  7. 319
      src/views/components/resiSearch.vue
  8. 37
      src/views/components/smartSearchRule.vue
  9. 12
      src/views/modules/shequ/cpts/peopleDetail.vue

BIN
src/assets/images/index/i-menu.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

BIN
src/assets/images/index/i-menu2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

31
src/assets/scss/buttonstyle.scss

@ -23,7 +23,7 @@
line-height: 2px !important;
padding:0 8px !important;
}
//蓝色
@ -36,8 +36,8 @@
height: 32px !important;
// line-height: 22px !important;
// padding:0 8px !important;
border: none !important;
}
//黄色
@ -62,8 +62,8 @@
height: 32px !important;
line-height: 2px !important;
padding:0 8px !important;
}
//红色
.diy-button--red {
@ -75,8 +75,8 @@
height: 32px !important;
line-height: 2px !important;
padding:0 8px !important;
}
//灰色
.diy-button--gray {
@ -88,7 +88,7 @@
height: 32px !important;
line-height: 2px !important;
padding:0 8px !important;
}
//白色
.diy-button--white {
@ -105,7 +105,18 @@
border-radius: 2px !important;
border: 1px solid #0056D6 !important;
}
// 普通按钮
.diy-button--common {
font-size: 14px !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #606266 !important;
min-width: 60px !important;
height: 32px !important;
background: #FFFFFF !important;
border-radius: 2px !important;
border: 1px solid #dcdfe6 !important;
}
//操作栏更多
.diy-button--other {
text-decoration: underline !important;
@ -115,7 +126,7 @@
// height: 32px !important;
// line-height: 2px !important;
// padding:0 8px !important;
}
//列表中操作按钮

70
src/assets/scss/modules/management/list-main.scss

@ -2,7 +2,7 @@
.g-main {
width: 100%;
.m-search {
padding: 10px;
// box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
@ -105,133 +105,133 @@
// 弹性盒子
.M_flex {
.f-flex {
display: flex;
flex-wrap: nowrap;
}
.M_hflex {
.f-hflex {
display: flex;
flex-flow: column;
overflow: hidden;
}
.M_flex1 {
.f-flex1 {
flex: 1;
}
.M_mean {
.f-mean {
justify-content: space-around;
}
.M_endpoint {
.f-endpoint {
justify-content: space-between;
}
.M_align_item {
.f-align_item {
align-items: center;
}
// 字体大小
.M_font12 {
.f-font12 {
font-size: 12px;
}
.M_font14 {
.f-font14 {
font-size: 14px !important;
}
.M_font16 {
.f-font16 {
font-size: 16px !important;
}
.M_font18 {
.f-font18 {
font-size: 18px !important;
}
//内边距
.M_p0 {
.f-p0 {
padding: 0 !important;
}
.M_p10 {
.f-p10 {
padding: 10px;
}
.M_p16 {
.f-p16 {
padding: 16px;
}
.M_p50 {
.f-p50 {
padding: 50px;
}
.M_p30 {
.f-p30 {
padding: 30px;
}
// 外边距
.M_right5 {
.f-right5 {
margin-right: 5px;
}
.M_right24 {
.f-right24 {
margin-right: 24px;
}
.M_bottom8 {
.f-bottom8 {
margin-bottom: 8px;
}
.M_bottom16 {
.f-bottom16 {
margin-bottom: 16px;
}
.M_top2 {
.f-top2 {
margin-top: 2px;
}
.M_top12 {
.f-top12 {
margin-top: 12px;
}
.M_top24 {
.f-top24 {
margin-top: 24px !important;
}
.M_top32 {
.f-top32 {
margin-top: 32px !important;
}
.M_top40 {
.f-top40 {
margin-top: 40px !important;
}
.M_top48 {
.f-top48 {
margin-top: 48px !important;
}
.M_top8 {
.f-top8 {
margin-top: 8px !important;
}
.M_bot8 {
.f-bot8 {
margin-bottom: 8px;
}
.M_bot24 {
.f-bot24 {
margin-bottom: 24px !important;
}
.M_top16 {
.f-top16 {
margin-top: 16px !important;
}
.M_bot16 {
.f-bot16 {
margin-bottom: 16px !important;
}
.M_right8 {
.f-right8 {
margin-right: 8px !important;
}
.M_margin30 {
.f-margin30 {
margin: 30px;
}
.M_m0 {
.f-m0 {
margin: 0 !important;
}
// 详情分类title
@ -240,7 +240,7 @@
height: 12px;
line-height: 16px;
margin-left: 70px;
padding-left: 6px;
padding-left: 4px;
font-size: 16px;
font-weight: bold;
}

14
src/assets/scss/people-info.scss

@ -52,12 +52,11 @@
.list {
display: flex;
flex-wrap: wrap;
padding: 10px 20px 10px 97px;
padding: 10px 20px 10px 49px;
.item {
position: relative;
box-sizing: border-box;
padding: 0 15px;
width: 33%;
color: #fff;
font-size: 18px;
@ -70,7 +69,16 @@
&.z-long {
width: 100%;
}
.item-field{
width: 100px;
display: inline-block;
text-align: right;
color: #ccc;
}
&::v-deep .el-button{
padding: 0;
height: 24px;
}
// &::before {
// position: absolute;
// left: 0;

27
src/views/components/resiForm.vue

@ -57,7 +57,7 @@
placeholder="请选择小区"
size="small"
clearable
class="resi-cell-select"
class="item_width_communitycascader"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
@ -71,7 +71,7 @@
placeholder="请选择楼号"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle"
class="item_width_buildcascader"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
@ -85,7 +85,7 @@
placeholder="请选择单元"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle"
class="item_width_buildcascader"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
@ -99,7 +99,7 @@
placeholder="请选择房号"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle"
class="item_width_buildcascader"
@change="handleChangeH">
<el-option v-for="item in optionsH"
:key="item.value"
@ -110,16 +110,16 @@
</el-form-item>
</div>
<!-- <el-col :span="6">
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
</el-col> -->
</div>
</el-form-item>
@ -225,7 +225,7 @@
:value="item.value">
</el-option>
</el-select>
<!-- <el-cascader
:options="options"
:props="{ checkStrictly: true }"
@ -252,7 +252,7 @@
v-model.trim="form[n.columnName]"
>
<!-- {{ n.options[0].label }} -->
</el-checkbox>
</el-checkbox>
<!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
</template>
<template v-else-if="n.itemType === 'checkbox'">
@ -272,7 +272,7 @@
</el-form-item>
</el-col>
</el-row>
</template>
</el-form>
</div>
@ -872,7 +872,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.resi-cell-value .resi-cell-input {
width: 190px;
}
@ -913,4 +913,7 @@ export default {
.resi-cell-select:last-child {
margin-right: 0;
}
.el-tabs__item ::v-deep .is-active{
color:#0056d6 ;
}
</style>

319
src/views/components/resiSearch.vue

@ -3,23 +3,14 @@
<!-- <el-card class="resi-card"> -->
<div>
<el-form :inline="true"
class="header_form_box"
v-for="(item, index) in sliceList(itemList, 4)"
:class="boxHeight ? 'm-form-box-height-auto' : 'm-form-box-height'"
:key="index">
<el-form-item v-for="n in item"
:key="n.id">
<el-form :inline="true" class="header_form_box" v-for="(item, index) in sliceList(itemList, 4)"
:class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'" :key="index">
<el-form-item v-for="n in item" :key="n.id">
<div class="resi-cell">
<div style="width:100px;text-align: right;padding-right:14px ;">{{ n.label }}:</div>
<div class="resi-cell-value"
:class="n.itemType === 'radio' && 'resi-cell-value-radio'">
<el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
v-model.trim="form[n.columnName]"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入内容">
<div class="resi-cell-value" :class="n.itemType === 'radio' && 'resi-cell-value-radio'">
<el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'" v-model.trim="form[n.columnName]"
class="item_width_normal" size="small" clearable placeholder="请输入内容">
</el-input>
<template v-else-if="n.itemType == 'inputRange'">
<!-- <el-input
@ -29,153 +20,69 @@
clearable
placeholder="请输入内容"
/> -->
<inputRange style="height:37px;"
v-model="form[n.columnName]"
:type="n.validType"
@change="handleAgeChange" />
<inputRange style="height:37px;" v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker style="width:218px ;"
v-if="n.queryType === 'daterange'"
v-model.trim="timer.startPickerTime"
:picker-options="startPickerOptions"
type="date"
align="right"
unlink-panels
placeholder="开始时间"
class="u-item-width-daterange"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
<el-date-picker style="width:218px ;" v-if="n.queryType === 'daterange'" v-model.trim="timer.startPickerTime"
:picker-options="startPickerOptions" type="date" align="right" unlink-panels placeholder="开始时间"
class="item_width_daterange" size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker style="width:219px ;"
v-if="n.queryType === 'daterange'"
v-model.trim="timer.endPickerTime"
:picker-options="endPickerOptions"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="结束时间">
<el-date-picker style="width:219px ;" v-if="n.queryType === 'daterange'" v-model.trim="timer.endPickerTime"
:picker-options="endPickerOptions" class="item_width_daterange data-tag" size="small" type="date"
value-format="yyyy-MM-dd" value="yyyy-MM-dd" placeholder="结束时间">
</el-date-picker>
<el-date-picker v-else
v-model.trim="form[n.columnName]"
class="resi-cell-input"
type="inputRange"
size="small"
clearable
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期">
<el-date-picker v-else v-model.trim="form[n.columnName]" class="resi-cell-input" type="inputRange"
size="small" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</template>
<el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
v-model.trim="form[n.columnName]"
placeholder="请选择"
size="small"
clearable
class="u-item-width-normal"
:collapse-tags="n.multiSelect == 1 ? true : false"
:multiple="n.multiSelect == 1 ? true : false">
<el-option v-for="item in n.options"
:key="item.value"
:label="item.label"
:value="item.value">
<el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'" v-model.trim="form[n.columnName]"
placeholder="请选择" size="small" clearable class="item_width_normal"
:collapse-tags="n.multiSelect == 1 ? true : false" :multiple="n.multiSelect == 1 ? true : false">
<el-option v-for="item in n.options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-cascader v-else-if="n.itemType === 'cascader'"
v-model.trim="form[n.columnName]"
:options="n.options"
:props="{ checkStrictly: true }"
clearable
size="small"
class="resi-cell-select">
<el-cascader v-else-if="n.itemType === 'cascader'" v-model.trim="form[n.columnName]" :options="n.options"
:props="{ checkStrictly: true }" clearable size="small" class="resi-cell-select">
</el-cascader>
<template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model="form[n.columnName]">
<el-checkbox v-for="ns in n.options"
:key="ns.value"
:label="ns.value">{{ ns.label }}</el-checkbox>
<el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ ns.label }}</el-checkbox>
</el-checkbox-group>
</template>
</div>
</div>
</el-form-item>
<el-form-item prop="agencyIdArray">
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属组织:</span>
<el-cascader class="u-item-width-normal"
ref="myCascader"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
<el-form-item prop="agencyIdArray">
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属组织:</span>
<el-cascader class="item_width_normal" ref="myCascader" v-model="agencyIdArray" :options="orgOptions"
:props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item prop="VILLAGE_ID">
<el-form-item prop="VILLAGE_ID" >
<div class="resi-cell">
<div class="resi-cell-value">
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属房屋:</span>
<el-select v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区"
size="small"
filterable
clearable
class="u-item-width-communitycascader"
@clear="handleClearVillage"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属房屋:</span>
<el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" filterable clearable
class="item_width_communitycascader" @clear="handleClearVillage" @change="handleChangeV">
<el-option v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.BUILD_ID"
placeholder="楼号"
size="small"
filterable
clearable
style="margin-left: 5px"
class="u-item-width-buildcascader"
:disabled="changeVDisabled"
@clear="handleClearBuild"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
<el-select v-model.trim="form.BUILD_ID" placeholder="楼号" size="small" filterable clearable
style="margin-left: 5px" class="item_width_buildcascader" :disabled="changeVDisabled" @clear="handleClearBuild"
@change="handleChangeB">
<el-option v-for="item in optionsB" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.UNIT_ID"
:disabled="changeBDisabled"
placeholder="单元"
size="small"
filterable
clearable
style="margin-left: 5px"
class="u-item-width-buildcascader"
@click="handleClearDan"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
<el-select v-model.trim="form.UNIT_ID" :disabled="changeBDisabled" placeholder="单元" size="small"
filterable clearable style="margin-left: 5px" class="item_width_buildcascader" @click="handleClearDan"
@change="handleChangeD">
<el-option v-for="item in optionsD" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.HOME_ID"
:disabled="changeDDisabled"
placeholder="房号"
size="small"
filterable
clearable
style="margin-left: 5px"
class="u-item-width-buildcascader">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
<el-select v-model.trim="form.HOME_ID" :disabled="changeDDisabled" placeholder="房号" size="small"
filterable clearable style="margin-left: 5px" class="item_width_buildcascader">
<el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@ -184,48 +91,30 @@
</el-form>
</div>
<el-row v-if="showSmartSearchForm"
class="resi-row-more M_m0">
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
<el-col :span="24">
<span style="width:100px;">智能查询</span>
<el-button v-for="btnItem in btnList"
:key="btnItem.index"
size="small"
:class="selBtnIndex === btnItem.index ? 'diy-button--blue' : 'diy-button--gray'"
@click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
<span style="width:100px;display: inline-block;text-align: right;padding-right: 18px;">智能查询</span>
<el-button v-for="btnItem in btnList" :key="btnItem.index" size="small"
:class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'"
@click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
</el-col>
<el-col>
<smart-search-rule ref="ref_rule"
:formType="formType"></smart-search-rule>
<smart-search-rule ref="ref_rule" :formType="formType"></smart-search-rule>
</el-col>
</el-row>
<el-row v-if="isArrow"
class="resi-search">
<el-row v-if="isArrow" class="resi-search">
<el-col :span="24">
<el-button type="primary"
size="small"
plain
class="diy-button--blue"
@click="handleSmartSearch">智能查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--white"
type="primary"
plain
@click="resetForm">重置</el-button>
<el-button type="primary"
size="small"
class="diy-button--blue"
@click="handleSearch"
plain>查询 </el-button>
<el-button style="margin-left:15px"
size="small"
class="div-table-button--blue showUnfold"
type="text"
@click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
<el-button type="primary" size="small" plain class="diy-button--blue"
@click="handleSmartSearch">智能查询</el-button>
<el-button style="margin-left:10px" size="small" class="diy-button--white" type="primary" plain
@click="resetForm">重置</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch" plain>查询 </el-button>
<el-button style="margin-left:15px" size="small" class="div-table-button--blue showUnfold" type="text"
@click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i
:class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
</el-col>
</el-row>
@ -258,7 +147,7 @@ export default {
default: false
}
},
data () {
data() {
let initForm = (arr, columnName) => {
let _form = {}
// console.log('formInfo', obj)
@ -364,7 +253,7 @@ export default {
shortcuts: [
{
text: '最近一周',
onClick (picker) {
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
@ -373,7 +262,7 @@ export default {
},
{
text: '最近一个月',
onClick (picker) {
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@ -382,7 +271,7 @@ export default {
},
{
text: '最近三个月',
onClick (picker) {
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@ -503,7 +392,7 @@ export default {
}
},
computed: {
sliceList () {
sliceList() {
return function (data, count) {
//
if (data !== undefined) {
@ -521,19 +410,19 @@ export default {
}
}
},
changeVDisabled () {
changeVDisabled() {
return !this.form.VILLAGE_ID
},
changeBDisabled () {
changeBDisabled() {
return !this.form.BUILD_ID
},
changeDDisabled () {
changeDDisabled() {
return !this.form.UNIT_ID
},
},
watch: {
form: {
handler (val, val2) {
handler(val, val2) {
// console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
@ -546,14 +435,14 @@ export default {
deep: true
},
timer: {
handler (newVal) {
handler(newVal) {
this.handelWatchStartDate(newVal)
},
deep: true,
immediate: true
}
},
created () {
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getOrgTreeList()
@ -562,39 +451,39 @@ export default {
if (this.columnName) this.handleChangeForm(this.columnName)
},
methods: {
handleSmartSearch () {
handleSmartSearch() {
this.showSmartSearchForm = !this.showSmartSearchForm
},
handelSelSmartBtn (index) {
handelSelSmartBtn(index) {
this.selBtnIndex = index
},
handelWatchStartDate (val) {
handelWatchStartDate(val) {
return val
},
initForm () {
initForm() {
this.formList.forEach((item) => {
this.$set(this.form, item.columnName, '')
})
console.log('formcccc---', this.form)
},
computdSpan (len) {
computdSpan(len) {
return len == 1 ? 24 : 6
},
handleClearVillage () {
handleClearVillage() {
this.form.BUILD_ID = ''
this.form.HOME_ID = ''
},
handleClearBuild () {
handleClearBuild() {
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
},
handleClearDan () {
handleClearDan() {
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
},
resetForm (formName) {
resetForm(formName) {
for (const n in this.form) {
if (n == 'age') {
this.form.age = {
@ -614,7 +503,7 @@ export default {
// this.handleSearch()
// this.orgOptions = [];
},
handleSearch () {
handleSearch() {
if (this.showSmartSearchForm) {
let refObj = this.$refs['ref_rule']
refObj.getRule()
@ -656,7 +545,7 @@ export default {
} else {
let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY')
console.log(i, '标');
arr3 = arr3.splice(i, 1)
arr3 = arr3.splice(i,1)
console.log(arr3);
}
this.$emit('search', arr3)
@ -666,24 +555,24 @@ export default {
}
},
handleOpenSearch () {
handleOpenSearch() {
this.openSearch = !this.openSearch
},
handleAgeChange (val) {
handleAgeChange(val) {
// debugger
console.log('val----age---', val)
// console.log(v);
if (val.start) {
const s = this.computedBirth1(val.start)
const e = this.computedBirth(val.start)
this.form.BIRTHDAY = [s, e]
} else {
this.form.BIRTHDAY = []
return
}
if(val.start){
const s = this.computedBirth1(val.start)
const e = this.computedBirth(val.start)
this.form.BIRTHDAY = [s, e]
}else {
this.form.BIRTHDAY = []
return
}
},
handleChangeAgency (val) {
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if (obj.level === 'grid') {
@ -705,7 +594,7 @@ export default {
this.form.HOME_ID = ''
this.getValiheList()
},
handleChangeGrid (val) {
handleChangeGrid(val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
@ -713,26 +602,26 @@ export default {
this.form.HOME_ID = ''
this.getValiheList()
},
handleChangeV (val) {
handleChangeV(val) {
console.log('val', val)
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getBuildList()
},
handleChangeB (val) {
handleChangeB(val) {
console.log('val', val)
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getUniList()
},
handleChangeD (val) {
handleChangeD(val) {
console.log('val', val)
this.form.HOME_ID = ''
this.getHouseList()
},
// form
handleChangeForm (val) {
handleChangeForm(val) {
for (let n in this.fixedForm) {
if (n === val) {
if (this.fixedList.length > 0) {
@ -771,7 +660,7 @@ export default {
if (item.columnName === val) item.isChange = true
})
},
getOrgTreeList () {
getOrgTreeList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
@ -788,7 +677,7 @@ export default {
return this.$message.error('网络错误')
})
},
getGridList () {
getGridList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
@ -804,7 +693,7 @@ export default {
return this.$message.error('网络错误')
})
},
getValiheList () {
getValiheList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', {
@ -824,7 +713,7 @@ export default {
return this.$message.error('网络错误')
})
},
getBuildList () {
getBuildList() {
this.$http
.post('/gov/org/icbuilding/buildingoption', {
neighborHoodId: this.form.VILLAGE_ID
@ -841,7 +730,7 @@ export default {
return this.$message.error('网络错误')
})
},
getUniList () {
getUniList() {
this.$http
.post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.form.BUILD_ID
@ -858,7 +747,7 @@ export default {
return this.$message.error('网络错误')
})
},
getHouseList () {
getHouseList() {
this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
.then(({ data: res }) => {
@ -873,7 +762,7 @@ export default {
return this.$message.error('网络错误')
})
},
computedBirth (age) {
computedBirth(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
@ -887,7 +776,7 @@ export default {
}
return subYear + '-' + nowMonth + '-' + nowDay
},
computedBirth1 (age) {
computedBirth1(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
@ -909,6 +798,8 @@ export default {
@import "@/assets/scss/modules/management/list-main.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
.header_form_box {
display: flex;
flex-wrap: wrap;

37
src/views/components/smartSearchRule.vue

@ -169,17 +169,10 @@
:value="item.value">
</el-option>
</el-select>
<img v-if=" ruleIndex<smartRuleList.length-1"
class="img_del"
src="@/assets/img/icon-del.png"
@click="delRule(ruleIndex)">
<i v-if=" ruleIndex<smartRuleList.length-1" class="el-icon-remove-outline icon_del" @click="delRule(ruleIndex)"></i>
<div v-if=" ruleIndex==smartRuleList.length-1"
class="d-icon">
<img class="img_del"
src="@/assets/img/icon-add.png"
@click="addRule(ruleIndex)">
<i class="el-icon-circle-plus-outline icon_add" @click="addRule(ruleIndex)"></i>
<div class="d-save">保存为常用查询条件</div>
</div>
@ -238,7 +231,7 @@ export default {
smartRuleList: [
{
selSmartType: 'house',
nextLogicalRel: '',//andor
nextLogicalRel: '',//andor
nextLogicalRelName: '',
houseRule: {
ruleDesc: '',
@ -257,7 +250,7 @@ export default {
},
personRule: {
ruleDesc: '',//
ruleDesc: '',//
itemGroupId: '',
itemId: '',
queryType: '',
@ -318,7 +311,7 @@ export default {
}
oneData.personRule = {
ruleDesc: '',//
ruleDesc: '',//
itemGroupId: '',
itemId: '',
queryType: '',
@ -474,7 +467,7 @@ export default {
let obj = {
selSmartType: 'house',
nextLogicalRel: '',//andor
nextLogicalRel: '',//andor
nextLogicalRelName: '',
houseRule: {
ruleDesc: '',
@ -493,7 +486,7 @@ export default {
},
personRule: {
ruleDesc: '',//
ruleDesc: '',//
itemGroupId: '',
itemId: '',
queryType: '',
@ -767,7 +760,7 @@ export default {
<style lang="scss" scoped >
.m-main {
// display: flex;
margin-left: 100px;
margin-top: 15px;
}
@ -807,9 +800,19 @@ export default {
display: flex;
}
.img_del {
.icon_add {
color:#47c0c9 ;
width: 25px;
height: 25px;
font-size: 25px;
margin-top: 3px;
cursor: pointer;
}
.icon_del {
color:#faa8ab ;
width: 25px;
height: 25px;
font-size: 25px;
margin-top: 3px;
cursor: pointer;
}
@ -825,7 +828,6 @@ export default {
font-size: 12px;
font-family: Source Han Serif CN;
font-weight: 600;
color: #0043c8;
line-height: 26px;
cursor: pointer;
@ -835,7 +837,6 @@ export default {
top: 9px;
width: 8px;
height: 8px;
background: #006ecd;
border-radius: 50%;
}
}

12
src/views/modules/shequ/cpts/peopleDetail.vue

@ -2,7 +2,7 @@
<div class="m-pop">
<div class="wrap">
<div class="wrap2">
<div class="title flex M_endpoint M_font16 M_p10" style="border-bottom: 1px #DCDEE0 solid;">
<div class="title flexf-endpointf-font16f-p10" style="border-bottom: 1px #DCDEE0 solid;">
<span>居民详情</span>
<el-button type="text"> <i class="el-icon-close" @click="handleClose"></i></el-button>
@ -13,7 +13,7 @@
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div> -->
<div class="title-small M_top40">基本信息</div>
<div class="title-smallf-top40">基本信息</div>
<div :key="'fieldSubList' + index"
v-for="(fieldSubList, index) in fieldList">
<div class="list" :class="{'listTransform':index==1}">
@ -73,12 +73,12 @@
</div>
</div>
<div class="title-small M_top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<section v-show="index==0 " style="position:absolute;top:42px;left: 20px;" class="M_font14">居民分类: </section>
<div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<section v-show="index==0 " style="position:absolute;top:42px;left: 20px;" class="f-font14">居民分类: </section>
</div>
</div>
<!-- 详情下方tab -->
<el-tabs class="M_top32" v-model="groupIndex" @tab-click="handlTabs">
<el-tabs class="f-top32" v-model="groupIndex" @tab-click="handlTabs">
<template>
<el-dropdown>
<span class="el-dropdown-link">
@ -283,7 +283,7 @@
</div>
</div>
</div >
<el-row class="M_bot12" justify="end" >
<el-row class="f-bot12" justify="end" >
<el-col :span="24"> <el-button style="float:right" @click="handleClose">关闭</el-button></el-col>
</el-row>

Loading…
Cancel
Save