jialh
2025-08-28 c8d4411b2192adfd1fac192dcd607dc44a54c93d
更新
7个文件已修改
94 ■■■■■ 已修改文件
public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/simplifyRoomFee/simplifyRoomFee.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/assetImportLogDetail/assetImportLogDetail.html 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/assetImportLogDetail/assetImportLogDetail.js 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/owePayFeeOrder/owePayFeeOrder.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/payFeeOrder/payFeeOrder.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/payFeeOrder/payFeeOrder.js 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.js
@@ -52,6 +52,11 @@
                    },
                    function (json, res) {
                        let _data = JSON.parse(json);
                        if (_data.code === 404) {
                            // 处理404错误
                            vc.toast("请求失败,未找到相关数据。请检查缴费信息。"); // 显示提示信息
                            return; // 退出函数
                        }
                        // console.log('nativeQrcodePayment', _data.data.body);
                        // const data = JSON.parse(_data.data.body);
                        // $that.qrcodeUrl = data.qr_code;
public/components/property/simplifyRoomFee/simplifyRoomFee.js
@@ -177,7 +177,7 @@
                _fee.roomName = $that.simplifyRoomFeeInfo.roomName;
                _fee.builtUpArea = $that.simplifyRoomFeeInfo.builtUpArea;
                // vc.jumpToPage('/#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
                vc.jumpToPage('/#/pages/property/payFeeOrder?feeId=' + _fee.feeId);
                vc.jumpToPage('/#/pages/property/payFeeOrder?feeId=' + _fee.feeId + '&monthCount=' + _fee.monthCount );
            },
            _editFee: function (_fee) {
                // 计费结束时间
public/pages/property/assetImportLogDetail/assetImportLogDetail.html
@@ -45,6 +45,9 @@
                                        <th class="text-center">
                                            <vc:i18n name="描述" namespace="assetImportLogDetail"></vc:i18n>
                                        </th>
                                        <th class="text-center">
                                            <vc:i18n name="操作" namespace="assetImportLogDetail"></vc:i18n>
                                        </th>
                                    </tr>
                                </thead>
                                <tbody>
@@ -61,6 +64,14 @@
                                                {{log.message}}
                                            </div>
                                        </td>
                                        <td class="text-center" >
                                            <div class="btn-group">
                                                <button class="btn-white btn btn-xs"
                                                        v-on:click="_openDelRoomModel(log.content)">
                                                    <span><vc:i18n name="详情" namespace="assetImportLogDetail"></vc:i18n></span>
                                                </button>
                                            </div>
                                        </td>
                                    </tr>
                                </tbody>
                                <tfoot>
@@ -71,6 +82,24 @@
                                    </tr>
                                </tfoot>
                            </table>
                            <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
                                <div class="modal-dialog" role="document">
                                    <div class="modal-content">
                                        <div class="modal-header">
                                            <h5 class="modal-title" id="detailModalLabel">日志详情</h5>
                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                                                <span aria-hidden="true">&times;</span>
                                            </button>
                                        </div>
                                        <div class="modal-body">
                                            <pre style="font-size: 1.2em;">{{ logDetails }}</pre>
                                        </div>
                                        <div class="modal-footer">
                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!-- 分页 -->
                            <vc:create path="frame/pagination"></vc:create>
                        </div>
public/pages/property/assetImportLogDetail/assetImportLogDetail.js
@@ -31,8 +31,9 @@
                moreCondition: false,
                logId: '',
                logType: '',
                state: ''
            }
                state: '',
            },
            logDetails: ''
        },
        _initMethod: function() {
            $that.assetImportLogDetailInfo.logId = vc.getParam('logId');
@@ -52,6 +53,19 @@
            });
        },
        methods: {
            _openDelRoomModel: function(content) {
                // 解析 JSON 字符串
                try {
                    this.logDetails = JSON.parse(content); // 假设 this.logDetails 是用于存储模态框内容的数据模型
                } catch (e) {
                    console.error('无法解析内容: ', e);
                    this.logDetails = '内容无法解析';
                }
                // 打开模态框
                $('#detailModal').modal('show');
            },
            _listAssetImportLogDetails: function(_page, _rows) {
                var param = {
                    params: {
public/pages/property/owePayFeeOrder/owePayFeeOrder.js
@@ -142,7 +142,7 @@
                    // Fill in necessary parameters for generating the payment QR code
                    communityId: vc.getCurrentCommunity().communityId,
                    feeIds: $that.owePayFeeOrderInfo.selectPayFeeIds,
                    roomId: $that.owePayFeeOrderInfo.payObjId,
                    // roomId: $that.owePayFeeOrderInfo.payObjId,
                    business: 'oweFee',
                };
                
public/pages/property/payFeeOrder/payFeeOrder.html
@@ -174,7 +174,7 @@
                                    {{item}}{{vc.i18n('个月','payFeeOrder')}}
                                </option>
                                <option value="-102">{{vc.i18n('自定义周期','payFeeOrder')}}</option>
                                <option value="-101">{{vc.i18n('自定义金额','payFeeOrder')}}</option>
                                <!-- <option value="-101">{{vc.i18n('自定义金额','payFeeOrder')}}</option> -->
                                <option value="-103">{{vc.i18n('自定义结束时间','payFeeOrder')}}</option>
                                <option value="-105">{{vc.i18n('自定义时间段','payFeeOrder')}}</option>
                            </select>
public/pages/property/payFeeOrder/payFeeOrder.js
@@ -16,7 +16,7 @@
                payEndDate: '',
                maxEndTime: '',
                startTime: '',
                monthCount: 0,
                feeFlag: '',
                feePrice: 0.00,
                tempCycles: '',
@@ -78,6 +78,7 @@
        _initMethod: function () {
            $that.payFeeOrderInfo.feeId = vc.getParam('feeId');
            $that.payFeeOrderInfo.isContractFee = vc.getParam('isContractFee');
            $that.payFeeOrderInfo.monthCount = vc.getParam('monthCount'); // 提取 monthCount
            $that._initCustEndDate();
            $that.listAndComputeFeeInfo();
        },
@@ -116,7 +117,9 @@
                _param.receivedAmount = $that.payFeeOrderInfo.receivedAmount;
                vc.emit('prestoreAccount2', 'openAddModalWithParams', _param)
            });
            vc.on('payFeeOrder', 'initData', function (_param) {
                console.log('=======_param==========', _param);
                // 重新赋值下拉列表
                $that.payFeeOrderInfo.paymentCycles = [];
                for (let _index = 1; _index < 7; _index++) {
@@ -136,20 +139,33 @@
                    $that.payFeeOrderInfo.custEndTime = _value;
                    let start = Date.parse(new Date($that.payFeeOrderInfo.endTime))
                    let end = Date.parse(new Date($that.payFeeOrderInfo.custEndTime))
                    let deadline = Date.parse(new Date($that.payFeeOrderInfo.maxEndTime)); // 获取费用截止时间
                    if (start - end >= 0) {
                        vc.toast("结束时间必须大于起始时间")
                        $that.payFeeOrderInfo.custEndTime = '';
                        return;
                    }
                    if (end > deadline) { // 检查结束时间是否大于费用截止时间
                        vc.toast("结束时间不能大于费用截止时间");
                        $that.payFeeOrderInfo.custEndTime = ''; // 清空选择
                        return;
                    }
                    $that.listAndComputeFeeInfo(103)
                });
                vc.initDate('customStartTime', function (_value) {
                    $that.payFeeOrderInfo.customStartTime = _value;
                    let start = Date.parse(new Date($that.payFeeOrderInfo.endTime))
                    let end = Date.parse(new Date($that.payFeeOrderInfo.customStartTime))
                    let deadline = Date.parse(new Date($that.payFeeOrderInfo.maxEndTime));
                    if (start - end > 0) {
                        vc.toast("缴费开始时间必须大于起始时间")
                        $that.payFeeOrderInfo.customStartTime = '';
                        return;
                    }
                    if ($that.payFeeOrderInfo.customEndTime && end > deadline) { // 结合结束时间检查
                        vc.toast("缴费开始时间不能晚于费用截止时间");
                        $that.payFeeOrderInfo.customStartTime = ''; // 清空选择
                        return;
                    }
                    if ($that.payFeeOrderInfo.customEndTime) {
@@ -160,9 +176,15 @@
                    $that.payFeeOrderInfo.customEndTime = _value;
                    let start = Date.parse(new Date($that.payFeeOrderInfo.customStartTime))
                    let end = Date.parse(new Date($that.payFeeOrderInfo.customEndTime))
                    let deadline = Date.parse(new Date($that.payFeeOrderInfo.maxEndTime));
                    if (start - end >= 0) {
                        vc.toast("缴费开始时间必须大于缴费结束时间")
                        $that.payFeeOrderInfo.customEndTime = '';
                        return;
                    }
                    if (end > deadline) { // 检查自定义结束时间是否大于费用截止时间
                        vc.toast("结束时间不能大于费用截止时间");
                        $that.payFeeOrderInfo.customEndTime = ''; // 清空选择
                        return;
                    }
                    if ($that.payFeeOrderInfo.customStartTime) {
@@ -322,6 +344,11 @@
                if (_cycles == '') {
                    return;
                }
                if (this.payFeeOrderInfo.tempCycles === '-102' && parseInt(_cycles) > parseInt(this.payFeeOrderInfo.monthCount)) {
                    vc.toast(`自定义周期不能大于 ${this.payFeeOrderInfo.monthCount} 个月`);
                    this.payFeeOrderInfo.cycles = ''; // 重置输入
                    return;
                }
                $that.listAndComputeFeeInfo(_cycles);
            },
            /**
@@ -404,6 +431,13 @@
                    param,
                    function (json, res) {
                        let listRoomData = JSON.parse(json);
                        // 检查是否有 data
                        if (!listRoomData || !listRoomData.data) {
                            console.error('无效的返回数据:', listRoomData);
                            vc.toast('返回的数据无效,请稍后重试。');
                            return;
                        }
                        if (listRoomData.data.hasOwnProperty('custEndTime')) {
                            delete listRoomData.data.custEndTime
                        }