merge

Lou

2023-11-08 13cee53e7b48f4edb3dfdd0d19f0927a34b07082

merge

 api/placeExp/placeExp.js

New file
@@ -0,0 +1,27 @@
import http from '@/http/api.js'

export const getSiteMaintenanceData = (params) => {
    return http.request({
        url: 'blade-placeExt/placeExt/page',
        method: 'GET',
        params
    })
}



export const getCheckPlaceExtData = (params) => {
    return http.request({
        url: 'blade-placeExt/placeExt/checkPlaceExt',
        method: 'POST',
        params
    })
}

export const updatePlaceExtData = (data) => {
    return http.request({
        url: 'blade-placeExt/placeExt/updatePlaceExt',
        method: 'POST',
        data
    })
}

 pages.json

@@ -172,6 +172,7 @@
                {
                    "path": "views/rental",
                    "style": {
                        "onReachBottomDistance": 10,
                        "navigationBarTitleText": "出租房管理",
                        "enablePullDownRefresh": false,
                        "navigationBarBackgroundColor": "#fff",
@@ -186,6 +187,25 @@
                        "navigationBarBackgroundColor": "#fff",
                        "navigationBarTextStyle": "black"
                    }
                },
                {
                    "path": "views/cshw",
                    "style": {
                        "onReachBottomDistance": 10,
                        "navigationBarTitleText": "网格任务审核",
                        "enablePullDownRefresh": false,
                        "navigationBarBackgroundColor": "#fff",
                        "navigationBarTextStyle": "black"
                    }
                },
                {
                    "path": "views/examine",
                    "style": {
                        "navigationBarTitleText": "审核",
                        "enablePullDownRefresh": false,
                        "navigationBarBackgroundColor": "#fff",
                        "navigationBarTextStyle": "black"
                    }
                }
            ]
        },

 pages/home/index.vue

@@ -249,7 +249,7 @@
                        style: {

                            background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)',

                        },

                        path: "/subPackage/workbench/views/cscj"

                        path:"/subPackage/workbench/views/cshw"

                    },

                    {

                        icon: "/static/icon/menu-06.png",

@@ -397,6 +397,7 @@
                        this.curSelectSite = dataList[0];

                    }

                    this.curHouseCode = this.curSelectSite.id

                    uni.setStorageSync('curSelectSite', this.curSelectSite)

                }

            },




 subPackage/bs/views/addRepair.vue

@@ -6,7 +6,7 @@
                <text class="f-28 c-aa ml-20">当前小区：</text>
            </view>

            <text class="address f-28">万达华府26栋1903室 万达华府26栋1903室</text>
            <text class="address f-28">{{ curSelectSite.name }}</text>
        </view>
        <view class="content bgc-ff">
            <u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="90"
@@ -75,6 +75,7 @@
                },
                desc: "",
                title: "",
                curSelectSite: {}
            }
        },
        onLoad(option) {
@@ -84,6 +85,9 @@
            })
            this.info.type = option.type
        },
        onShow() {
            this.curSelectSite = uni.getStorageSync('curSelectSite')
        },
        methods: {
            sumitInfo() {
                const that = this

 subPackage/bs/views/rentDetail.vue

@@ -61,15 +61,23 @@
            :popupTitle="selectBusTitle" :dataLists="selectBusList" @cancel="typeShow = false" @submit="typeSelect">

        </select-bus>

        <!--出租时间选择-->

        <u-datetime-picker v-model="currentTime" v-if="rentTimeShow" :closeOnClickOverlay="true" @close="rentTimeShow = false" :show="rentTimeShow" mode="date" @confirm="rentTimeConfirm"

        <u-datetime-picker v-model="currentTime" v-if="rentTimeShow" :closeOnClickOverlay="true"

            @close="rentTimeShow = false" :show="rentTimeShow" mode="date" @confirm="rentTimeConfirm"

            @cancel="rentTimeShow = false"></u-datetime-picker>

        <u-datetime-picker v-model="currentTime" v-if="dueTimeShow" :closeOnClickOverlay="true" @close="dueTimeShow = false" :show="dueTimeShow" mode="date" @confirm="dueTimeConfirm"

        <u-datetime-picker v-model="currentTime" v-if="dueTimeShow" :closeOnClickOverlay="true"

            @close="dueTimeShow = false" :show="dueTimeShow" mode="date" @confirm="dueTimeConfirm"

            @cancel="dueTimeShow = false"></u-datetime-picker>



        <view class="bottom-tools">

            <u-button class="btn-item" @click="addRentForm">再加一人</u-button>

            <u-button class="btn-item" @click="saveOrUpdate">{{ rentId === '' ? "保存" : "确认修改" }}</u-button>

            <u-button class="btn-item" color="#2CD5C0" @click="addRentForm">再加一人</u-button>

            <u-button class="btn-item" type="error" @click="isModelShow = true" v-if="rentId !== ''">删除</u-button>

            <u-button class="btn-item" type="warning" @click=""

                v-if="auditStatus == '0' && currentRole === 'admin'">审核</u-button>

            <u-button class="btn-item" color="linear-gradient(to right, #06B0FD, #027BFE)"

                @click="saveOrUpdate">{{ rentId === '' ? "保存" : "确认修改" }}</u-button>

        </view>

        <u-modal :show="isModelShow" width="auto" :showCancelButton="true" title="提示" content="请确认是否删除当前租户信息"
            @cancel="isModelShow = false" @confirm="deleteRent"></u-modal>

    </view>

</template>



@@ -83,7 +91,8 @@
    } from "@/api/doorplateAddress/doorplateAddress";

    import {

        addHouseRental,

        updateRetalInfo

        updateRetalInfo,
        deleteRentalInfo

    } from '@/api/houseRental/houseRental.js'

    import {

        data

@@ -185,7 +194,10 @@
                typeShow: false,

                houseCode: '',

                rentId: '',
                currentTime: Number(new Date())

                auditStatus: null,

                currentTime: Number(new Date()),
                isModelShow: false,
				
            }

        },

        onLoad(option) {

@@ -388,6 +400,7 @@
                        houseRentalList

                    }

                } = await getHouseRentInfo(this.houseCode)

                this.auditStatus = houseRentalList.auditStatus

                const images = []

                const {

                    houseStatus,

@@ -426,7 +439,32 @@
                        this.$refs.rentform[index].form = item

                    })

                })

            },

            async deleteRent() {

                const {

                    code,

                    data

                } = await deleteRentalInfo(this.rentId)

                if (code !== 200) {

                    uni.showToast({

                        title: "删除失败",

                        icon: "error",

                        duration: 1500

                    })

                    return

            }

                this.isModelShow = false
                uni.showToast({
                    title: '删除成功',
                    icon: 'success',
                    duration: 1000,
                    complete: () => {
                        setTimeout(() => {
                            uni.navigateBack()
                        }, 1000)
                    }
                })

            },

        }

    }

</script>

@@ -512,20 +550,16 @@
            z-index: 999;



            .btn-item {

                margin: 40rpx;

                // margin: 40rpx;

                // margin: 30rpx;

                color: #ffffff;

                font-weight: 700;

                border: 0;

                margin: 30rpx;

                margin-left: 0;



                &:nth-child(1) {

                    flex: 1;

                    background-color: #2CD5C0;

                }



                &:nth-child(2) {

                    flex: 3;

                    background: linear-gradient(to right, #06B0FD, #027BFE);

                    margin-left: 0rpx;

                &:first-child {

                    margin-left: 30rpx;

                }

            }

        }


 subPackage/bs/views/repair.vue

@@ -37,7 +37,7 @@
                    <text class="f-28 c-aa ml-20">当前小区：</text>
                </view>

                <text class="address f-28">万达华府26栋1903室 万达华府26栋1903室</text>
                <text class="address f-28">{{ curSelectSite.name }}</text>
            </view>

            <view class="nav flex flex-wrap j-c-s-b">
@@ -69,6 +69,7 @@
                    total: 0,
                    handle: 0,
                },
                curSelectSite: {},
                navList: [{
                        title: "公共维修",
                        type: 1,
@@ -113,6 +114,7 @@
        },
        onShow() {
            this.getStatistics()
            this.curSelectSite = uni.getStorageSync('curSelectSite')
        },

        methods: {

 subPackage/workbench/components/lineItem.vue

@@ -2,14 +2,16 @@
    <view class="line-item-container" style="margin-bottom: 20rpx;">

        <view v-for="(item, index) in dataInfo" :key="index" class="line-item">
            <view class="text">
            <view class="l">
                {{item.label}}
            </view>
            <view class="r" v-if="!item.useSlot">
                {{item.value}}
            </view>
            </view>

            <view class="r" v-else>
            <view class="r"  v-if="item.useSlot">
                <!-- #ifdef H5-->
                <slot :name="item.useSlot" :scope="item"></slot>
                <!-- #endif -->
@@ -55,7 +57,7 @@

<style scoped lang="scss">
    .line-item-container {
        .line-item {
        .text {
            background-color: #ffffff;
            display: flex;
            justify-content: space-between;
@@ -69,6 +71,9 @@
                color: #969799;
            }
        }
        .r {
            background-color: #ffffff;
        }
    }

    view {

 subPackage/workbench/views/audit.vue

@@ -1,3 +1,4 @@

<template>
    <view>
        <view class="tab">

 subPackage/workbench/views/cscj.vue

@@ -6,21 +6,20 @@
            </view>
            <view class="item">
                <u-form-item @click="showPicker = true" class="form-item" labelWidth="100" label="楼栋:"
                :required="isRequired" :disabled="isDisabled"
                    prop="buildingCode">
                    :required="isRequired" :disabled="isDisabled" prop="buildingCode">

                    <u--input border="none" disabledColor="#ffffff" v-model="form.building" placeholder="请选择">
                    </u--input>
                    <u-icon slot="right" name="arrow-right"></u-icon>
                </u-form-item>

                <u-form-item class="form-item" labelWidth="100" label="场所名称:"
                 :required="isRequiredPlace" :disabled="isDisabled" prop="placeName">
                <u-form-item class="form-item" labelWidth="100" label="场所名称:" :required="isRequiredPlace"

                    :disabled="isDisabled" prop="placeName">

                    <u--input border="none" v-model="form.placeName" placeholder="请输入">
                    </u--input>
                </u-form-item>

                <u-form-item @click="popup" class="form-item" labelWidth="100" label="标签:"
                :required="isRequired" :disabled="isDisabled" prop="label">
                <u-form-item @click="popup" class="form-item" labelWidth="100" label="标签:" :required="isRequired"

                    :disabled="isDisabled" prop="label">

                    <u--input border="none" disabled disabledColor="#ffffff" placeholder="请选择">
                    </u--input>
                    <u-icon slot="right" name="arrow-right"></u-icon>
@@ -95,7 +94,9 @@

            <lineItem :dataInfo="comprehensiveData.scene">
                <template v-slot:pic="{scope}">
                    {{scope.value}}
                    <view class="image" v-if="scope.value !== ''">
                        <u--image @click="imgPreview(scope.value)" width="200rpx" height="200rpx" :src="scope.value"></u--image>
                    </view>

                </template>
            </lineItem>
        </view>
@@ -113,10 +114,10 @@
        </view>

        <view class="item">
            <lineItem :dataInfo="comprehensiveData.basic">
            <lineItem :dataInfo="publicData.basic">

            </lineItem>

            <lineItem :dataInfo="comprehensiveData.scene">
            <lineItem :dataInfo="publicData.scene">

                <template v-slot:pic="{scope}">
                    {{scope.value}}
                </template>
@@ -182,6 +183,7 @@
                    label: "",
                    remark: "",
                    imageUrls: "",
                    placeName: ""

                },
                rules: {
                    'buildingCode': {
@@ -225,6 +227,7 @@
                comprehensiveData: {
                    basic: [{
                            label: "社区名称",
                            name: 'neiName',

                            value: "暂无数据"
                        },
                        {
@@ -242,28 +245,24 @@
                    ],
                    scene: [{
                            label: "场所照片",
                            name: 'imageUrls',

                            value: "",
                            useSlot: "pic",
                        },
                        {
                            label: "采集人",
                            value: "未完善"
                        },
                        {
                            label: "采集时间",
                            value: "未完善"
                        },
                        {
                            label: "场所负责人",
                            name: 'username',

                            value: "未完善",
                        },
                        {
                            label: "采集人",
                            name: 'createUser',

                            value: "未完善"
                        },
                        {
                            label: "采集时间",
                            value: "未完善",
                            name: 'createTime',

                            value: "未完善"

                        },
                        {
                            label: "历史事件",
@@ -274,18 +273,22 @@
                publicData: {
                    basic: [{
                            label: "公安局",
                            name: 'branchName',

                            value: "暂无数据"
                        },
                        {
                            label: "派出所",
                            name: 'localPoliceStationName',

                            value: "暂无数据"
                        },
                        {
                            label: "辖区民警",
                            name: 'policeman',

                            value: "暂无数据"
                        },
                        {
                            label: "联系电话",
                            name: 'policemanPhone',

                            value: "暂无数据"
                        }
                    ],
@@ -378,7 +381,35 @@
                    let arr = buildingNameArr.filter(e => {
                        return e != null || e != ''
                    })
					
                    // 赋值
                    // this.form.placeName = data['placeName']
                    Object.keys(this.form).forEach(key => {
                        if (!data[key]) {
                            this.form[key] = data.place[key]
                        } else {
                            this.form[key] = data[key]
                        }
                    })
					
                    this.form.building = arr.join("")
					
                    Object.keys(this.comprehensiveData).forEach(key => {

                        this.comprehensiveData[key].forEach(item => {

                            if (!data[item.name]) {

                                item.value = data.place[item.name] || '未完善'

                            } else {

                                item.value = data[item.name] || '未完善'

                            }

                        })
                        this.publicData[key].forEach(item => {
                            if (!data[item.name]) {
                                item.value = data.place[item.name] || '未完善'
                            } else {
                                item.value = data[item.name] || '未完善'
                            }
                        })

                    })

                })
            },

@@ -566,7 +597,12 @@
                this.showLabelList = this.showLabelList.filter(e => e.id != label.id)
                this.activeIds = this.activeIds.filter(e => e != label.id)

            }
            },
            imgPreview(value) {
                uni.previewImage({
                    urls: [value],
                })
            },

        }
    }
</script>
@@ -631,6 +667,10 @@
            padding: 40rpx 30rpx;
        }

        .image {
            padding: 20rpx;
        }
		
        .bottom {
            padding: 20rpx;
            background-color: #ffffff;

 subPackage/workbench/views/cshw.vue

New file
@@ -0,0 +1,168 @@
<template>

    <view>

        <u-sticky>

            <view class="tab">

                <view class="tab">

                    <u-tabs :list="tabList" :scrollable="false" :current="tabIndex" @click="changeTab"

                        :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>

                    <view class="search">

                        <u-search placeholder="请输入场所名称" v-model="keyWord" :clearabled="true" :showAction="true"

                            :animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>

                    </view>

                </view>

            </view>

        </u-sticky>

        <view class="list">

            <view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id" @click="pushPage(item.id)">

                <view class="item-title flex a-i-c j-c-s-b mb-20">

                    <text class="f-32 fw">{{ item.placeName ? item.placeName : '场所信息未完善' }}</text>

                    <!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> -->

                    <u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name" :type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>

                    <!-- <u-tag text="审核拒绝" type="error" plain plainFill></u-tag> -->

                </view>

                <view class="item-row flex a-i-c j-c-s-b">

                    <text class="f-28">地址</text>

                    <text class="address f-28 c-66">{{ item.localtion }}</text>

                </view>

                <view class="item-row flex a-i-c j-c-s-b">

                    <text class="f-28">法人信息</text>

                    <text class="f-28 c-66">{{ item.legalPerson }}</text>

                </view>

            </view>

        </view>

        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />

    </view>

</template>



<script>

    import {

        getSiteMaintenanceData

    } from '@/api/placeExp/placeExp.js'

    export default {

        data() {

            return {

                siteList: [],

                pagingParams: {

                    current: 1,

                    size: 10

                },

                tabList: [{

                        name: "待审核",

                        status: 1,
                        type: 'warning'

                    },

                    {

                        name: "审核通过",

                        status: 2,
                        type: 'success'

                    },

                    {

                        name: "审核不通过",

                        status: 3,
                        type: 'error'

                    },

                ],

                tabIndex: 0,

                tabStatus: 1,

                keyWord: '',

                loadingStatus: 'nomore'

            }

        },

        onShow() {
            this.siteList = []

            this.getSiteList()

        },

        onReachBottom() {

            this.pagingParams.current++

            this.getSiteList()

        },

        methods: {

            async getSiteList() {

                this.loadingStatus = 'loadingmore'

                const params = {

                    placeName: this.keyWord,

                    confirmFlag: this.tabStatus

                }

                const res = await getSiteMaintenanceData({

                    ...params,

                    ...this.pagingParams

                })

                const {

                    code,

                    data: {

                        records

                    }

                } = res

                if (code !== 200) {

                    uni.showToast({

                        title: '数据请求失败'

                    })

                    return

                }

                this.siteList = [...this.siteList, ...records]

                this.loadingStatus = 'nomore'

            },

            changeTab(e) {

                this.tabStatus = e.status;

                this.resetParams()

                this.getSiteList()

            },

            searchConfirm() {

                this.resetParams()

                this.getSiteList()

            },

            clearConfirm() {

                this.keyWord = ''

            },

            resetParams() {

                this.siteList = []

                this.pagingParams.current = 1

            },

            findObjValue(value, obj) {

                const res = obj.find(item => {

                    return item.status == value

                })

                return res

            },

            pushPage(id) {

                this.$u.func.globalNavigator('/subPackage/workbench/views/examine?id='+id)

            }

        }

    }

</script>



<style lang="scss">

    page {

        background-color: #F5F5F5;

    }



    .tab {

        background-color: #fff;



        .search {

            padding: 20rpx 70rpx;

        }

    }



    .list {

        margin: 20rpx 30rpx 0;

    }



    .list-item {

        padding: 0 30rpx 20rpx;

        border-radius: 8rpx;



        .item-title {

            padding: 30rpx 0;

            border-bottom: 1px solid #F5F5F5;

        }



        .item-row {

            padding: 10rpx 0;



            .address {

                width: 65%;

            }

        }

    }

</style>

 subPackage/workbench/views/csjl.vue

@@ -1,14 +1,16 @@
<template>

    <view class="container">

        <u-sticky>

        <view class="tabsAndSearch">

            <view class="tabs">

                <u-tabs :list="tabsList" @click="tabClick" :scrollable="false"></u-tabs>

            </view>

            <view class="search">

                <u-search placeholder="请输入场所名称" v-model="iptContext" :clearabled="true" :showAction="true" :animation="true"

                    @search="searchConfirm" @clear="clearConfirm"></u-search>

                    <u-search placeholder="请输入场所名称" v-model="iptContext" :clearabled="true" :showAction="true"

                        :animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>

            </view>

        </view>

        </u-sticky>

        <view class="info-box">

            <view class="records-card" v-for="(records, index) in recordsData" :key="records.id"

                @click="pushPage(records)">

@@ -28,7 +30,7 @@
                </view>

            </view>

        </view>

        <u-loadmore :status="status" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="数据加载完成" line />

        <u-loadmore :status="status" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />

    </view>

</template>



@@ -63,6 +65,7 @@
            }

        },

        onShow() {

            this.recordsData = []

            this.getrRecordList()

        },

        onReachBottom() {

@@ -133,10 +136,9 @@
</script>



<style lang="scss" scoped>

    .container {

        min-height: 100%;

        overflow-y: auto;

    page {

        background-color: #f6f6f6;

    }



        .tabsAndSearch {

            background-color: #fff;

@@ -194,7 +196,6 @@


                &:last-child {

                    margin-bottom: 20rpx;

                }

            }

        }

    }


 subPackage/workbench/views/examine.vue

New file
@@ -0,0 +1,188 @@
<template>

    <view class="container">

        <view class="basic">

            <box-title title="基本信息" class="box-title"></box-title>

            <view class="info">

                <lineItem :dataInfo="basicData"></lineItem>

            </view>

        </view>

        <view class="licence">

            <box-title title="营业执照" class="box-title"></box-title>

            <view class="info">

                <view class="images-box"></view>

            </view>

        </view>

        <view class="planegraph">

            <box-title title="场所平面图" class="box-title"></box-title>

            <view class="info">

                <view class="images-box"></view>

            </view>

        </view>

        <view class="personnel">

            <box-title title="从业人员" class="box-title"></box-title>

            <view class="info">

                <view class="person-box" v-for="(item, index) in personnelData" :key="index">

                    <view class="title">人员信息-#{{ index + 1 }}</view>

                    <line-item :data-info="item"></line-item>

                </view>

            </view>

        </view>

        <view class="examine">

            <box-title title="审核信息" class="box-title"></box-title>

            <view class="info">

                <u-form labelWidth="70" :model="form" ref="form" class="form">

                    <u-form-item label="审核状态" @click="isPickerShow = true" class="form-item">

                        <u-input v-model="form.status" disabled disabledColor="#ffffff" placeholder="请选择审核状态"

                            border="none"></u-input>

                        <u-icon slot="right" name="arrow-right"></u-icon>

                    </u-form-item>

                    <u-form-item label="备注" class="form-item">

                        <u-input v-model="form.remark" border="none"></u-input>

                    </u-form-item>

                </u-form>

            </view>

        </view>

        <view class="bottom-btn">

            <u-button type="primary" @click="submit">提交审核</u-button>

        </view>

        <u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"

            :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>

    </view>

</template>



<script>

    import boxTitle from '@/components/boxTitle/index.vue'

    import lineItem from '../components/lineItem.vue'

    export default {

        components: {

            boxTitle,

            lineItem

        },

        data() {

            return {

                basicData: [{

                        label: '场所名称',

                        value: '未完善'

                    },

                    {

                        label: '法人信息',

                        value: '未完善'

                    },

                    {

                        label: '法人电话',

                        value: '未完善'

                    },

                    {

                        label: '场所位置',

                        value: '未完善'

                    },

                ],

                personnelData: [

                    [{

                            label: '姓名',

                            value: '未完善',

                        },

                        {

                            label: '电话号码',

                            value: '未完善',

                        },

                        {

                            label: '暂住地',

                            value: '未完善',

                        }

                    ],

                    [{

                            label: '姓名',

                            value: '未完善',

                        },

                        {

                            label: '电话号码',

                            value: '未完善',

                        },

                        {

                            label: '暂住地',

                            value: '未完善',

                        }

                    ]

                ],

                form: {

                    status: '未审批',

                    remark: ''

                },

                isPickerShow: false,

                columns: [

                    [{

                        name: '通过',

                        type: 1

                    }, {

                        name: '不通过',

                        type: 2

                    }]

                ]

            }

        },

        methods: {

            handleConfirm(e) {

                this.form.status = e.value[0].name

                this.isPickerShow = false

            },

            submit() {



            }

        }

    }

</script>



<style lang="scss" scoped>

    page {

        background-color: #f6f6f6;

    }



    .container {

        padding-bottom: 130rpx;



        .box-title {

            margin-bottom: 15rpx;

        }



        .info {

			


            .title {

                font-size: 30rpx;
                padding-left: 10rpx;

            }



            .images-box {

                padding: 20rpx;

                min-height: 100rpx;

                background-color: #fff;

            }

        }



        .form {
            background-color: #fff;

            .form-item {

                padding: 0 20rpx;



                &:first-child {

                    border: 1rpx solid #f6f6ff;

                }

            }

        }



        .bottom-btn {

            position: fixed;

            left: 0;

            bottom: 0;

            padding: 20rpx;

            width: calc(100% - 40rpx);

            background-color: #fff;

        }

    }



    /deep/ .u-form-item__body__left__content__label,

    /deep/ .uni-input-input {

        font-size: 30rpx;

    }

</style>

 subPackage/workbench/views/rental.vue

@@ -3,7 +3,7 @@
        <view class="header bgc-ff">

            <view class="filter-box">

                <chenchuang-CCDropDownFilter :filterData='filterData' :defaultIndex='defaultIndex'

                    @ed='handleSelect'></chenchuang-CCDropDownFilter>

                    @onSelected='handleSelect'></chenchuang-CCDropDownFilter>

            </view>

            <view class="search-box">

                <u-search placeholder="请输入租户名" v-model="keyword" :clearabled="true" :showAction="true" :animation="true"

@@ -60,6 +60,7 @@
            </view>

        </view>



        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="已经到底了" line />

    </view>

</template>



@@ -79,19 +80,27 @@
                        },

                        {

                            name: '待审核',

                            value: '0'

                        },

                        {

                            name: '审核通过',

                            value: '1'

                        },

                        {

                            name: '未到期',

                            name: '审核不通过',

                            value: '2'

                        },

                        {

                            name: '未到期',

                            value: '10'

                        },

                        {

                            name: '即将到期',

                            value: '3'

                            value: '20'

                        },

                        {

                            name: '已到期',

                            value: '3'

                            value: '30'

                        }

                    ],

                    [{

@@ -116,7 +125,12 @@
                keyword: "",
                statistics: [],

                tenantList: [],

                status: [{

                loadingStatus: 'nomore',

                pagingParams: {

                    current: 1,

                    size: 10

                },

                tenantStatus: [{

                        name: '未到期',

                        value: 0

                    },

@@ -144,16 +158,34 @@
                })

            }

        },

        // onLoad() {

        //     this.getStatistics()

        //     this.getList()

        // },

        // onShow() {

        //     this.getRentalHouseInfo()

        // },

        onLoad() {

            this.getStatistics()

            this.getList()

        },

        onShow() {

            this.tenantList = []

            this.getRentalHouseInfo()

        },

        onReachBottom() {

            this.pagingParams.current++

            this.getRentalHouseInfo()

        },

        methods: {

            handleSelect(res) {

                console.log('选择res = ' + JSON.stringify(res));

                const [auditStatus, floor] = res

                console.log(auditStatus, floor);

                this.pagingParams = {

                    current: 1,

                    size: 10

                }

                this.tenantList = []

                let params = {}

                if (auditStatus[0].value !== '') {

                    params = {

                        auditStatus: auditStatus[0].value

                    }

                }

                this.getRentalHouseInfo(params)

            },

            getStatistics() {

                getStatistics().then(res => {

@@ -172,14 +204,17 @@
                })

                return res.name

            },

            async getRentalHouseInfo() {

            async getRentalHouseInfo(params = {}) {

                this.loadingStatus = 'loadmore'

                const {

                    code,

                    data: {

                        records

                    }

                } = await getRentalHouseContent({

                    tenantName: this.keyword

                    tenantName: this.keyword,

                    ...this.pagingParams,

                    ...params

                })

                if (code !== 200) {

                    uni.showToast({

@@ -188,7 +223,8 @@
                    })

                    return

                }

                this.tenantList = records

                this.tenantList = [...this.tenantList, ...records]

                this.loadingStatus = 'nomore'

            },

            search() {

                this.getRentalHouseInfo()

@@ -206,6 +242,7 @@
        }

    }

</script>



<style lang="scss">
    page {
        background-color: #F5F5F5;