Browse Source

Merge branch 'dev-新新版' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-新新版

dev2
jiangyy 3 years ago
parent
commit
6e9bdc8c5c
  1. 2
      src/assets/scss/common-dai.scss
  2. 33
      src/views/components/rangeInput.vue
  3. 448
      src/views/components/resiSearch.vue
  4. 12
      src/views/main-sidebar-sub-menu.vue
  5. 40
      src/views/main-sidebar.vue
  6. 4
      src/views/main.vue
  7. 34
      src/views/modules/base/resi.vue

2
src/assets/scss/common-dai.scss

@ -478,7 +478,7 @@ img {
bottom: 0;
z-index: 1020;
width: $sidebar--width + $sidebar--width-fold;
overflow: hidden;
// overflow: hidden;
transition: width 0.3s;
background-color: transparent;

33
src/views/components/rangeInput.vue

@ -1,19 +1,18 @@
<template>
<el-form :model="inputForm"
:rules="rules"
class="demo-form-inline">
<div class="flex-div">
<el-form-item prop="start">
<el-input v-model="inputForm.start"
class="wd50"
class="item_width_normal"
size="small"
:type="inputType"
clearable
placeholder="请输入"
@change="handleChange" />
</el-form-item>
<div class="div_middle">-</div>
<el-form-item prop="end">
<!-- <el-form-item prop="end">
<el-input v-model="inputForm.end"
class="wd50"
size="small"
@ -22,7 +21,7 @@
placeholder="请输入"
@change="handleChange"
@blur="handleBlur" />
</el-form-item>
</el-form-item> -->
</div>
</el-form>
@ -66,11 +65,7 @@ export default {
}
return {
inputForm: { ...this.value },
rules: {
end: [
{ validator: checkAge, trigger: 'blur' }
],
}
}
},
computed: {
@ -80,6 +75,7 @@ export default {
},
watch: {
'value.start' (val) {
console.log(val);
this.inputForm.start = val
},
'value.end' (val) {
@ -88,7 +84,7 @@ export default {
},
methods: {
handleChange (val) {
console.log(this.inputForm );
// if ()
this.$emit('change', { ...this.inputForm })
},
@ -102,13 +98,12 @@ export default {
<style lang="scss" scoped>
.flex-div {
display: flex;
align-items: inherit;
align-items: center;
max-width: 200px;
height: 37px;
}
.wd50 {
width: 79px;
}
// .wd50 {
// // width: 45%;
// }
.demo-form-inline {
::v-deep {
.el-form-item {
@ -127,8 +122,6 @@ export default {
}
.div_middle {
padding: 0 3px;
position: relative;
bottom: 10px;
padding: 0 10px;
}
</style>
</style>

448
src/views/components/resiSearch.vue

@ -3,213 +3,115 @@
<!-- <el-card class="resi-card"> -->
<div>
<el-form :inline="true"
:label-width="'100px'"
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"
:span="computdSpan(item.length)"
:label="n.label"
class="margin0">
<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
<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;">{{ 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="item_width_normal" size="small" clearable placeholder="请输入内容">
</el-input>
<template v-else-if="n.itemType == 'inputRange'">
<!-- <el-input
v-model.trim="form[n.columnName]"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入内容"
/> -->
<inputRange v-model="form[n.columnName]"
:type="n.validType"
@change="handleAgeChange" />
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker v-if="n.queryType === 'daterange'"
v-model.trim="form[n.columnName]"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
class="item_width_daterange2"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-else
v-model.trim="form[n.columnName]"
class="item_width_normal"
type="date"
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="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>
<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-group>
</template>
<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 v-if="n.queryType === 'daterange'" v-model.trim="timer.startPickerTime"
:picker-options="startPickerOptions" type="date" align="right" unlink-panels placeholder="开始时间"
class="item_width_daterang" size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-if="n.queryType === 'daterange'" v-model.trim="timer.endPickerTime"
:picker-options="endPickerOptions" class="item_width_daterang 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>
</template>
<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>
<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-group>
</template>
</div>
</div>
</el-form-item>
<el-form-item label="所属组织"
prop="agencyIdArray">
<el-cascader class="item_width_normal"
ref="myCascader"
size="small"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
<el-form-item label="所属组织" prop="agencyIdArray" :label-width="'100px'" >
<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 label="所属房屋"
prop="VILLAGE_ID">
<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="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="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="item_width_buildcascader">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-form-item label="所属房屋" prop="VILLAGE_ID" :label-width="'100px'" >
<div class="resi-cell">
<div class="resi-cell-value">
<el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" filterable clearable
class="resi-cell-select" @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="width: 120px;" class="resi-cell-select" :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="width: 120px;" class="resi-cell-select" @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="width: 120px;" class="resi-cell-select">
<el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</div>
</el-form-item>
</el-form>
</div>
<el-row v-if="showSmartSearchForm"
class="resi-row-more">
<el-row v-if="showSmartSearchForm" class="resi-row-more">
<el-col :span="24">
<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>
<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>
</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 size="small"
class="diy-button--blue"
@click="handleSmartSearch">智能查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--white"
@click="resetForm">重置</el-button>
<el-button class="diy-button--blue"
size="small"
@click="handleSearch">查询 </el-button>
<el-button style="margin-left:15px"
size="small"
class="div-table-button--blue"
type="text"
@click="boxHeight = !boxHeight">{{boxHeight?'收起':'展开'}}<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<!-- <span class="font_color_blue"
style="cursor:pointer;"
@click="boxHeight = !boxHeight">{{boxHeight?'收起':'展开'}} <i :class="boxHeight?'el-icon-arrow-up':'el-icon-arrow-down'"></i></span> -->
<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" type="text"
@click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i
:class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
</el-col>
</el-row>
@ -242,7 +144,7 @@ export default {
default: false
}
},
data () {
data() {
let initForm = (arr, columnName) => {
let _form = {}
// console.log('formInfo', obj)
@ -269,6 +171,8 @@ export default {
...item
}
})
let form = initForm(itemList, this.columnName)
let tempFormList = itemList.map(item => {
@ -292,9 +196,23 @@ export default {
children: 'subAgencyList',
checkStrictly: true
}
let endDisabledDate = (time) => {//datareturn
let nowData = Date.now()
if (this.updateStartDate) {
let startTime = new Date(this.updateStartDate)
return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
} else {
return time.getTime() > nowData
}
}
let startDisabledDate = (time) => {//datareturn
let nowData = Date.now()
return time.getTime() > nowData
}
return {
boxHeight: false,
boxHeight: true,
pageLoading: false,
openSearch: false,
optionsV: [],
@ -306,6 +224,7 @@ export default {
orgOptionProps,
agencyIdArray: [],
value: '',
// 1
itemList,
fixedList: [],
fixedForm: {
@ -331,7 +250,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)
@ -340,7 +259,7 @@ export default {
},
{
text: '最近一个月',
onClick (picker) {
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@ -349,7 +268,7 @@ export default {
},
{
text: '最近三个月',
onClick (picker) {
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@ -456,13 +375,23 @@ export default {
},
]
}
]
],
endPickerOptions: {
disabledDate: endDisabledDate
},
startPickerOptions: {
disabledDate: startDisabledDate
},
timer: {
startPickerTime: '',
endPickerTime: ''
}
}
},
computed: {
sliceList () {
sliceList() {
return function (data, count) {
//
if (data !== undefined) {
let index = 0
let arrTemp = []
@ -472,25 +401,25 @@ export default {
arrTemp.push([])
}
arrTemp[index].push(data[i])
// console.log(data[i],'zhi');
}
console.log(arrTemp);
return arrTemp
}
}
},
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]) {
@ -501,9 +430,16 @@ export default {
this.constForm = { ...val }
},
deep: true
},
timer: {
handler(newVal) {
this.handelWatchStartDate(newVal)
},
deep: true,
immediate: true
}
},
created () {
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getOrgTreeList()
@ -512,47 +448,51 @@ export default {
if (this.columnName) this.handleChangeForm(this.columnName)
},
methods: {
handleSmartSearch () {
handleSmartSearch() {
this.showSmartSearchForm = !this.showSmartSearchForm
},
handelSelSmartBtn (index) {
handelSelSmartBtn(index) {
this.selBtnIndex = index
},
initForm () {
handelWatchStartDate(val) {
return val
},
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 = {
start: '',
end: ''
}
} else if (n == 'BIRTHDAY') {
this.form.BIRTHDAY = []
this.timer.startPickerTime = null
this.timer.endPickerTime = null
} else if (typeof this.form[n] == 'object') this.form[n] = []
else this.form[n] = ''
}
this.agencyIdArray = []
// let arr3 = [...arr1, ...arr]
@ -560,21 +500,20 @@ export default {
// this.handleSearch()
// this.orgOptions = [];
},
handleSearch () {
handleSearch() {
if (this.showSmartSearchForm) {
let refObj = this.$refs['ref_rule']
refObj.getRule()
} else {
// debugger
// console.log('formmmmm---', this.form)
const itemTypes = ['daterange', 'timerange', 'checkbox']
let a = this.tempFormList.filter(item => item.itemType != 'inputRange')
let arr = a.filter((n) => n.isChange).map((item) => {
let arr = a.filter(n => n.isChange).map((item) => {
return {
queryType: item.queryType,
tableName: item.tableName,
columnName: item.columnName,
// columnValue: []
columnValue: this.form[item.columnName] &&
(itemTypes.includes(item.queryType) ||
itemTypes.includes(item.itemType) || item.multiSelect == 1
@ -590,24 +529,47 @@ export default {
...item
}
})
let arr3 = [...arr1, ...arr2]
var arr4 = []
var arr3 = [...arr1, ...arr2];
if (this.timer.startPickerTime && this.timer.endPickerTime) {
arr4 = [{
queryType: 'daterange',
tableName: 'ic_resi_user',
columnName: 'BIRTHDAY',
columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || '']
}]
arr3 = [...arr1, ...arr2, ...arr4]
} else {
let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY')
console.log(i, '标');
arr3 = arr3.splice(i,1)
console.log(arr3);
}
this.$emit('search', arr3)
arr3 = []
return arr3
}
},
handleOpenSearch () {
handleOpenSearch() {
this.openSearch = !this.openSearch
},
handleAgeChange (val) {
handleAgeChange(val) {
// debugger
console.log('val----age---', val)
if (val.end) {
const s = this.computedBirth(val.end)
const e = this.computedBirth(val.start)
this.form.BIRTHDAY = [s, e]
}
// 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
}
},
handleChangeAgency (val) {
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if (obj.level === 'grid') {
@ -629,7 +591,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 = ''
@ -637,28 +599,27 @@ 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) {
let _item = {}
@ -696,7 +657,7 @@ export default {
if (item.columnName === val) item.isChange = true
})
},
getOrgTreeList () {
getOrgTreeList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
@ -713,7 +674,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' })
@ -729,7 +690,7 @@ export default {
return this.$message.error('网络错误')
})
},
getValiheList () {
getValiheList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', {
@ -749,7 +710,7 @@ export default {
return this.$message.error('网络错误')
})
},
getBuildList () {
getBuildList() {
this.$http
.post('/gov/org/icbuilding/buildingoption', {
neighborHoodId: this.form.VILLAGE_ID
@ -766,7 +727,7 @@ export default {
return this.$message.error('网络错误')
})
},
getUniList () {
getUniList() {
this.$http
.post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.form.BUILD_ID
@ -783,7 +744,7 @@ export default {
return this.$message.error('网络错误')
})
},
getHouseList () {
getHouseList() {
this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
.then(({ data: res }) => {
@ -798,7 +759,7 @@ export default {
return this.$message.error('网络错误')
})
},
computedBirth (age) {
computedBirth(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
@ -810,8 +771,21 @@ export default {
if (nowDay < 10) {
nowDay = '0' + nowDay
}
console.log(subYear + '-' + nowMonth + '-' + nowDay);
return subYear + '-' + nowMonth + '-' + nowDay
},
computedBirth1(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
let nowDay = now.getDate(); // daymonthmonthyearyear
let subYear = nowYear - age
if (nowMonth < 10) {
nowMonth = '0' + nowMonth
}
if (nowDay < 10) {
nowDay = '0' + nowDay
}
return subYear - 1 + '-' + nowMonth + '-' + nowDay
}
}
}
@ -820,6 +794,8 @@ export default {
<style lang="scss" scope>
@import "@/assets/scss/modules/management/list-main.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
.header_form_box {
display: flex;
flex-wrap: wrap;

12
src/views/main-sidebar-sub-menu.vue

@ -15,7 +15,7 @@
>
<use :xlink:href="`#${menu.icon}`" />
</svg>
<span>{{ menu.name }}</span>
<span :title="menu.name">{{ menu.name }}</span>
</template>
<sub-menu
:root="false"
@ -29,7 +29,7 @@
<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
<use :xlink:href="`#${menu.icon}`" />
</svg>
<span>{{ menu.name }}</span>
<span :title="menu.name">{{ menu.name }}</span>
</el-menu-item>
</div>
</template>
@ -69,3 +69,11 @@ export default {
},
};
</script>
<style lang="scss" scoped>
@import "~@/assets/scss/c/function.scss";
/deep/ .el-menu-item {
@include toe;
}
</style>

40
src/views/main-sidebar.vue

@ -3,7 +3,7 @@
<aside :class="['aui-sidebar', 'g-sd']">
<div class="m-nav">
<div class="nav">
<div class="nav-item" @click="toIndexPage">
<div class="nav-item" @click="toIndexPage" v-if="false">
<span>全部菜单</span>
</div>
@ -15,7 +15,11 @@
:key="menu.id"
@click="gotoRouteHandle(menu.id, idx)"
>
<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
<svg
v-if="menu.icon"
class="icon-svg aui-sidebar__menu-icon"
aria-hidden="true"
>
<use :xlink:href="`#${menu.icon}`" />
</svg>
<span>{{ menu.name }}</span>
@ -27,6 +31,15 @@
</div>
</div>
<div
class="m-folder"
v-show="$store.state.sidebarActiveSubMenuList.length != 0"
@click="$store.state.sidebarFold = !$store.state.sidebarFold"
>
<i class="el-icon-s-fold" v-show="!$store.state.sidebarFold"></i>
<i class="el-icon-s-unfold" v-show="$store.state.sidebarFold"></i>
</div>
<div
class="aui-sidebar_wrap"
v-show="$store.state.sidebarActiveSubMenuList.length != 0"
@ -105,6 +118,25 @@ export default {
display: flex;
}
/deep/ .m-folder {
position: absolute;
z-index: 100;
top: 50px;
right: -16px;
width: 32px;
height: 32px;
background: #ffffff;
box-shadow: 0px 5px 12px 4px rgba(0, 0, 0, 0.09),
0px 3px 6px 0px rgba(0, 0, 0, 0.12), 0px 1px 2px -2px rgba(0, 0, 0, 0.16);
line-height: 32px;
font-size: 18px;
text-align: center;
color: #666;
border-radius: 100%;
overflow: hidden;
cursor: pointer;
}
/deep/ .m-nav {
box-sizing: border-box;
padding: 25px 0;
@ -120,11 +152,11 @@ export default {
padding: 11px 0 9px 0;
cursor: pointer;
.icon-svg {
font-size: 18px;
margin-bottom: 6px;
font-size: 22px;
}
span {
display: block;
line-height: 30px;
}
&:hover,
&.z-on {

4
src/views/main.vue

@ -5,7 +5,9 @@
:class="[
'aui-wrapper',
{
'aui-sidebar--fold': $store.state.sidebarActiveSubMenuList.length == 0,
'aui-sidebar--fold':
$store.state.sidebarActiveSubMenuList.length == 0 ||
$store.state.sidebarFold,
},
{
'aui-sidebar--noside': $store.state.inIframe,

34
src/views/modules/base/resi.vue

@ -505,6 +505,8 @@ export default {
}
await this.getSearchList();
// await this.getFormList()
await this.getTableHeader();
// console.log('this.$refs.resiSearch', this)
@ -707,7 +709,6 @@ export default {
// console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
});
console.log("search-----refs", this.$refs);
console.log("search-----arr", arr);
this.currentPage = 1;
this.conditions = arr;
@ -1156,15 +1157,32 @@ export default {
},
async getTableData () {
this.tableLoading = true;
// console.log(this.conditions);
// if(this.conditions.columnName){
// columnValue
// }
// var index = this.conditions.findIndex(item=>item.columnName === 'BIRTHDAY' )
// this.conditions.filter(item=>{
// if(item.columnName === "BIRTHDAY") {
// console.log(this.$refs.resiSearch.endPickerTime);
// item.columnValue = [this.$refs.resiSearch.endPickerTime,this.$refs.resiSearch.startPickerTime]
// }
// })
// console.log(this.conditions);
let timer = this.$refs.resiSearch.handelWatchStartDate()
console.log(timer,'派发');
let params = {
formCode: "resi_base_info",
pageNo: this.currentPage,
pageSize: this.pageSize,
conditions: this.conditions,
};
// debugger
await this.$http
.post("/epmetuser/icresiuser/listresi", params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
@ -1183,7 +1201,9 @@ export default {
}
})
.catch(() => {
console.log(this.conditions);
return this.$message.error("网络错误");
});
this.tableLoading = false;
},
@ -1315,6 +1335,7 @@ export default {
});
});
this.searchList = res.data;
console.log( this.searchList);
}
})
.catch(() => {
@ -1337,6 +1358,7 @@ export default {
return arr;
},
async getFormList (type) {
// debugger
await this.$http
.post("/oper/customize/icform/getcustomerform", {
formCode: "resi_base_info",
@ -1346,6 +1368,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
console.log(res.data,'res.data');
console.log("获取详情成功getFormList");
let { itemList, groupList, formName } = res.data;
this.formName = formName;
@ -1488,11 +1511,6 @@ export default {
background: #ffffff;
border-color: #0055d7;
}
::v-deep .el-button--primary.is-plain:hover {
color: #fff;
background: #0055d7;
border-color: #0055d7;
}
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
@ -1585,7 +1603,9 @@ export default {
width: calc(100% - 100px);
}
}
::v-deep .el-form-item--medium .el-form-item__label {
padding: 0px;
}
.resi-btns {
margin-top: 20px;
text-align: center;

Loading…
Cancel
Save