zhangjiaqing
2026-03-11 a3776347026028bf9fb9cad14094d8dfedaac09b
水电表删除房室号,修复分页问题, 修复车辆取值问题
14个文件已修改
106 ■■■■■ 已修改文件
public/components/property/importMeterWaterFee/importMeterWaterFee.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/config/paginationConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/admin/contractChangeManage/contractChangeManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/admin/expirationContractManage/expirationContractManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/assetImportLog/assetImportLog.js 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/assetImportLogDetail/assetImportLogDetail.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/feeConfigManage/feeConfigManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/listCarFee/listCarFee.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/listOwnerCar/listOwnerCar.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/listOwnerCar/listOwnerCar.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/meterWaterManage/meterWaterManage.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/meterWaterManage/meterWaterManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/staff/systemUser/systemUser.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/importMeterWaterFee/importMeterWaterFee.html
@@ -57,21 +57,7 @@
                                    </select>
                                </div>
                            </div>
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">
                                    <vc:i18n name="抄表类型" namespace="importMeterWaterFee"></vc:i18n>
                                </label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="importMeterWaterFeeInfo.meterType">
                                        <option selected disabled value="">
                                            {{vc.i18n('非必填,请选择抄表类型','importMeterWaterFee')}}
                                        </option>
                                        <option v-for="(item,index) in importMeterWaterFeeInfo.meterTypes" :key="index"
                                                v-bind:value="item.typeId">{{item.typeName}}
                                        </option>
                                    </select>
                                </div>
                            </div>
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">
                                    <vc:i18n name="选择文件" namespace="importMeterWaterFee"></vc:i18n>
public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.js
@@ -75,14 +75,14 @@
                    },
                    function (json, res) {
                        let _data = JSON.parse(json);
                        if (_data.code === 404) {
                            // 处理404错误
                            vc.toast("请求失败,未找到相关数据。请检查缴费信息。"); // 显示提示信息
                        if (_data.code !== 0) {
                            // 处理错误
                            vc.toast(_data.msg || "请求失败,请稍后重试"); // 显示后台返回的错误信息
                            return; // 退出函数
                        }
                        if (!_data.qrCode) {
                            // 处理404错误
                            vc.toast(_data.msg); // 显示提示信息
                            // 处理无二维码的情况
                            vc.toast(_data.msg || "生成支付二维码失败"); // 显示提示信息
                            return; // 退出函数
                        }
                        // console.log('nativeQrcodePayment', _data.data.body);
@@ -210,9 +210,9 @@
                    },
                    function (json, res) {
                        let _data = JSON.parse(json);
                        if (_data.code == 404) {
                            vc.toast(_data.msg);
                            if (_data.data && _data.data.orderId) {
                        if (_data.code !== 0) {
                            vc.toast(_data.msg || "请求失败,请稍后重试");
                            if (_data.code == 404 && _data.data && _data.data.orderId) {
                                $that.payFeeOrderConfirmInfo.orderId = _data.data.orderId;
                                $that.payFeeOrderConfirmInfo.paymentPoolId = _data.data.paymentPoolId;
public/config/paginationConfig.js
@@ -4,7 +4,7 @@
(function (vc) {
    vc.paginationConfig = {
        // 默认每页显示行数
        defaultRows: 20,
        defaultRows: 10,
        // 可选的分页大小
        pageSizes: [10, 20, 50, 100],
        // 默认当前页
public/pages/admin/contractChangeManage/contractChangeManage.js
@@ -3,7 +3,7 @@
 **/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            contractChangeManageInfo: {
public/pages/admin/expirationContractManage/expirationContractManage.js
@@ -3,7 +3,7 @@
 **/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            expirationContractInfo: {
public/pages/property/assetImportLog/assetImportLog.js
@@ -3,7 +3,7 @@
 **/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            assetImportLogInfo: {
@@ -131,9 +131,20 @@
                        var currentCommunity = vc.getCurrentCommunity();
                        console.log('获取到的currentCommunity:', currentCommunity);
                        
                        if (currentCommunity && currentCommunity.communityId) {
                        // 尝试从localStorage直接获取小区信息
                        let localStorageCommunity = JSON.parse(window.localStorage.getItem('hc_currentCommunityInfo'));
                        console.log('从localStorage获取的小区信息:', localStorageCommunity);
                        // 尝试从localStorage获取小区列表
                        let communityList = JSON.parse(window.localStorage.getItem('hc_communityInfos'));
                        console.log('从localStorage获取的小区列表:', communityList);
                        if (currentCommunity && currentCommunity.communityId && currentCommunity.communityId !== '-1') {
                            param.params.communityId = currentCommunity.communityId;
                            console.log('传入的communityId:', currentCommunity.communityId);
                        } else if (localStorageCommunity && localStorageCommunity.communityId) {
                            param.params.communityId = localStorageCommunity.communityId;
                            console.log('从localStorage直接获取并传入的communityId:', localStorageCommunity.communityId);
                        }
                    } else {
                        // 合同管理员账号,强制不传入communityId
public/pages/property/assetImportLogDetail/assetImportLogDetail.js
@@ -3,7 +3,7 @@
**/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            assetImportLogDetailInfo: {
public/pages/property/feeConfigManage/feeConfigManage.js
@@ -8,7 +8,7 @@
        console.error("错误位置:", event.filename, "行号:", event.lineno);
    });
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            feeConfigManageInfo: {
public/pages/property/listCarFee/listCarFee.js
@@ -1,6 +1,6 @@
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            listCarFeeInfo: {
public/pages/property/listOwnerCar/listOwnerCar.html
@@ -124,15 +124,7 @@
    <th data-hide="phone" class="text-center">
        <span>项目名称</span>
    </th> -->
    <th data-hide="phone" class="text-center">
        <span>弄号</span>
    </th>
    <th data-hide="phone" class="text-center">
        <span>门号</span>
    </th>
    <th data-hide="phone" class="text-center">
        <span>室号</span>
    </th>
    <th data-hide="phone" class="text-center">
        <span>联系电话</span>
    </th>
@@ -178,7 +170,7 @@
                            <tr v-for="car in listOwnerCarInfo.ownerCars"
                                :class="{ 'table-danger' : _getCarState(car) == '到期'}">
                                <td class="text-center">
                                    <a :href="'/#/pages/car/carDetail?memberId='+(car.ownerId || car.carId || '')"
                                    <a :href="'/#/pages/car/carDetail?memberId='+(car.memberId || car.ownerId)"
                                        target="_blank">{{car.carNum}}</a>
                                </td>
                                <!-- 新增字段 -->
@@ -188,15 +180,7 @@
<td class="text-center">
    {{vc.getCurrentCommunity().communityName || '-'}}
</td> -->
<td class="text-center">
    {{car.floorNum || '-'}}
</td>
<td class="text-center">
    {{car.unitNum || '-'}}
</td>
<td class="text-center">
    {{car.roomNum || '-'}}
</td>
<td class="text-center">
    {{car.link || '-'}}
</td>
public/pages/property/listOwnerCar/listOwnerCar.js
@@ -1,6 +1,6 @@
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            listOwnerCarInfo: {
@@ -114,7 +114,8 @@
                                carTypeCdName: car.carTypeCdName || '',
                                carTypeName: car.carTypeName || '',
                                carColor: car.carColor || '',
                                ownerId: car.ownerId || '',
                                ownerId: car.ownerId || car.carId || '',
                                memberId: car.memberId || car.ownerId || '',
                                ownerName: car.ownerName || '',
                                link: car.link || '',
                                roomName: car.roomName || '',
public/pages/property/meterWaterManage/meterWaterManage.html
@@ -1,9 +1,9 @@
<div>
    <div class="row">
        <div class="col-md-2 " style="padding-right:0px;height: 95%; overflow-x: hidden; overflow-y: scroll; min-width: 150px;">
        <div class="col-md-1 " style="padding-right:0px;height: 95%; overflow-x: hidden; overflow-y: scroll; min-width: 120px; position: relative; z-index: 10;">
            <vc:create path="property/roomTreeDiv" callBackListener="meterWaterManage"></vc:create>
        </div>
        <div class="col-md-10 margin-top-xs padding-l-0" style="min-width: 800px;">
        <div class="col-md-11 margin-top-xs padding-l-0" style="min-width: 900px;">
            <div class="ibox ">
                <div class="ibox-title">
                    <h5>
@@ -54,7 +54,7 @@
                        <vc:i18n name="抄表信息" namespace="meterWaterManage"></vc:i18n>
                    </h5>
                </div>
                <div class="ibox-content">
                <div class="ibox-content" style="overflow: visible;">
                    <!-- 按钮区域 -->
                    <div style="display: flex; gap: 8px; align-items: center; margin-bottom: 15px; flex-wrap: wrap;">
                        <button type="button" class="btn btn-primary btn-sm" v-if="meterWaterManageInfo.conditions.objId" @click="_openAddMeterWaterModal()">
@@ -78,10 +78,10 @@
                        </button> -->
                    </div>
                    <!-- 表格区域 -->
                    <div class="hc-table-div" style="overflow-x: auto; margin-bottom: 15px;">
                    <div class="hc-table-div" :style="{'width':_computeTableDivWidth()}" style="overflow-x: auto; margin-bottom: 15px;">
                        <table class="table table-stripped table-condensed" data-page-size="15">
                            <thead>
                                <tr>
                                <tr style="white-space: nowrap;">
                                    <th class="text-center">
                                        <vc:i18n name="表ID" namespace="meterWaterManage"></vc:i18n>
                                    </th>
@@ -160,7 +160,7 @@
                                </tr>
                            </thead>
                            <tbody>
                                <tr v-for="meterWater in meterWaterManageInfo.meterWaters">
                                <tr v-for="meterWater in meterWaterManageInfo.meterWaters" style="white-space: nowrap;">
                                    <td class="text-center">{{meterWater.waterId}}</td>
                                    <td class="text-center">{{meterWater.meterTypeName}}</td>
                                    <td class="text-center">{{meterWater.objName}}</td>
@@ -208,9 +208,9 @@
                        </table>
                    </div>
                    <!-- 分页区域 -->
                    <div class="row margin-top-xs">
                    <div class="row margin-top-xs" style="padding-top: 20px; clear: both; margin-bottom: 20px;">
                        <div class="col-sm-12">
                            <div class="float-right">
                            <div style="display: flex; justify-content: center; align-items: center; margin-top: 10px; width: 100%;">
                                <vc:create path="frame/pagination"></vc:create>
                            </div>
                        </div>
public/pages/property/meterWaterManage/meterWaterManage.js
@@ -3,7 +3,7 @@
 **/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            meterWaterManageInfo: {
public/pages/staff/systemUser/systemUser.js
@@ -3,7 +3,7 @@
 **/
(function (vc) {
    var DEFAULT_PAGE = vc.paginationConfig ? vc.paginationConfig.defaultPage : 1;
    var DEFAULT_ROWS = vc.paginationConfig ? vc.paginationConfig.defaultRows : 20;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data: {
            systemUserInfo: {