jialh
2025-07-17 1840271209ad0f77a082696bb6f76f91b7583f64
更新
20个文件已修改
290 ■■■■ 已修改文件
app.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/addMeterWater/addMeterWater.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/addMeterWater/addMeterWater.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/addProxyFee/addProxyFee.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/addProxyFee/addProxyFee.js 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/carCreateFeeAdd/carCreateFeeAdd.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/importMeterWaterFee/importMeterWaterFee.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/importMeterWaterFee/importMeterWaterFee.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/importMeterWaterFee2/importMeterWaterFee2.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/importMeterWaterFee2/importMeterWaterFee2.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/simplifyRoomFee/simplifyRoomFee.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/room/roomMeterQrcode/roomMeterQrcode.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/room/roomMeterQrcode/roomMeterQrcode.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/admin/addContract/addContract.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/admin/addContract/addContract.js 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/fee/feeDetail/feeDetail.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/accountManage/accountManage.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/auditAuthOwner/auditAuthOwner.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/listOwner/listOwner.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/room/room.html 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app.js
@@ -57,14 +57,14 @@
// app.use('/app', proxy('http://192.168.100.109:8008', opts));
// todo 本机 开发用,生产环境请用nginx带来
app.use('/ws', proxy('http://192.168.31.137:8008', opts));
app.use('/callComponent', proxy('http://192.168.31.137:8008', opts));
app.use('/app', proxy('http://192.168.31.137:8008', opts));
// app.use('/ws', proxy('http://192.168.31.137:8008', opts));
// app.use('/callComponent', proxy('http://192.168.31.137:8008', opts));
// app.use('/app', proxy('http://192.168.31.137:8008', opts));
// todo 本机 开发用,生产环境请用nginx带来
// app.use('/ws', proxy('http://47.92.223.85:8008', opts));
// app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
// app.use('/app', proxy('http://47.92.223.85:8008', opts));
app.use('/ws', proxy('http://47.92.223.85:8008', opts));
app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
app.use('/app', proxy('http://47.92.223.85:8008', opts));
//app.listen(3000);
app.use(express.json());
public/components/property/addMeterWater/addMeterWater.html
@@ -3,7 +3,7 @@
        <div class="modal-content">
            <div class="modal-body">
                <h3 class="m-t-none m-b ">
                    <vc:i18n name="添加抄表" namespace="addMeterWater"></vc:i18n>
                    <vc:i18n name="添加抄表11" namespace="addMeterWater"></vc:i18n>
                </h3>
                <div class="ibox-content">
@@ -17,9 +17,25 @@
                                <option selected disabled value="">
                                    {{vc.i18n('必填,请选择费用类型','addMeterWater')}}
                                </option>
                                <option value="888800010015">{{vc.i18n('水费','addMeterWater')}}</option>
                                <option value="888800010016">{{vc.i18n('电费','addMeterWater')}}</option>
                                <option value="888800010009">{{vc.i18n('煤气费','addMeterWater')}}</option>
                                <option value="630000017">{{vc.i18n('代收水费','roomsProxyFee')}}</option>
                                <option value="630000007">{{vc.i18n('电费及管理费','roomsProxyFee')}}</option>
                                <option value="630000009">{{vc.i18n('其他收入','roomsProxyFee')}}</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group row">
                        <label class="col-sm-2 col-form-label">
                            <vc:i18n name="费用子类型" namespace="tempImportRoomFee"></vc:i18n>
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="addMeterWaterInfo.secondaryFeeTypeCd"
                            @change="_changeSecondaryFeeTypeCdz(addMeterWaterInfo.feeTypeCd,addMeterWaterInfo.secondaryFeeTypeCd)">
                                <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','tempImportRoomFee')}}
                                </option>
                                <option v-for="(item,index) in addMeterWaterInfo.secondaryFeeTypeCds" :key="index"
                                    v-bind:value="item.secondaryFeeTypeCd">
                                    {{item.secondaryFeeTypeName}}
                                </option>
                            </select>
                        </div>
                    </div>
public/components/property/addMeterWater/addMeterWater.js
@@ -12,6 +12,8 @@
                curDegrees: '',
                preReadingTime: '',
                curReadingTime: '',
                secondaryFeeTypeCds: [],
                secondaryFeeTypeCd: '',
                remark: '',
                roomId: '',
                objId: '',
@@ -258,13 +260,33 @@
                        vc.message(errInfo);
                    });
            },
            _changeAddMeterWaterFeeTypeCd: function (_feeTypeCd) {
            _changeAddMeterWaterFeeTypeCd:  function (_feeTypeCd){
                $that.addMeterWaterInfo.secondaryFeeTypeCd='';
                $that.addMeterWaterInfo.configId = '';
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.addMeterWaterInfo, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCdz: function (_feeTypeCd,_secondaryFeeTypeCd) {
                var param = {
                    params: {
                        page: 1,
                        row: 20,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        valid: '1'
                    }
@@ -352,6 +374,7 @@
                    curDegrees: '',
                    preReadingTime: '',
                    curReadingTime: '',
                    secondaryFeeTypeCd: '',
                    remark: '',
                    roomId: '',
                    objId: '',
public/components/property/addProxyFee/addProxyFee.html
@@ -14,9 +14,9 @@
                            <select class="custom-select" v-model="addProxyFeeInfo.feeTypeCd" @change="_changeProxyFeeTypeCd(addProxyFeeInfo.feeTypeCd)">
                                <option selected disabled value="">{{vc.i18n('必填,请选择费用类型','addProxyFee')}}
                                </option>
                                <option value="888800010015">{{vc.i18n('水费','addProxyFee')}}</option>
                                <option value="888800010016">{{vc.i18n('电费','addProxyFee')}}</option>
                                <option value="888800010014">{{vc.i18n('其他','addProxyFee')}}</option>
                                <option value="630000017">{{vc.i18n('代收水费','roomsProxyFee')}}</option>
                                <option value="630000007">{{vc.i18n('电费及管理费','roomsProxyFee')}}</option>
                                <option value="630000009">{{vc.i18n('其他收入','roomsProxyFee')}}</option>
                            </select>
                        </div>
                    </div>
@@ -25,11 +25,11 @@
                            <vc:i18n name="费用子类型" namespace="tempImportRoomFee"></vc:i18n>
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="tempImportRoomFeeInfo.secondaryFeeTypeCd"
                            @change="_changeSecondaryFeeTypeCds(tempImportRoomFeeInfo.feeTypeCd,tempImportRoomFeeInfo.secondaryFeeTypeCd)">
                            <select class="custom-select" v-model="addProxyFeeInfo.secondaryFeeTypeCd"
                            @change="_changeSecondaryFeeTypeCds(addProxyFeeInfo.feeTypeCd,addProxyFeeInfo.secondaryFeeTypeCd)">
                                <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','tempImportRoomFee')}}
                                </option>
                                <option v-for="(item,index) in tempImportRoomFeeInfo.secondaryFeeTypeCds" :key="index"
                                <option v-for="(item,index) in addProxyFeeInfo.secondaryFeeTypeCds" :key="index"
                                    v-bind:value="item.secondaryFeeTypeCd">
                                    {{item.secondaryFeeTypeName}}
                                </option>
public/components/property/addProxyFee/addProxyFee.js
@@ -12,6 +12,8 @@
                objName: '',
                feeTypeCd: '',
                feeConfigs: [],
                secondaryFeeTypeCds: [],
                secondaryFeeTypeCd: '',
                amount: '',
                consumption: '',
                configId: '',
@@ -30,10 +32,11 @@
                if (_param.hasOwnProperty("objType")) {
                    $that.addProxyFeeInfo.objType = _param.objType;
                }
                let ownerName = _param.ownerName ? ` _param.roomName + '(' + _param.ownerName + ')'` : _param.roomName;
                $that.addProxyFeeInfo.roomId = _param.roomId;
                $that.addProxyFeeInfo.objId = _param.roomId;
                $that.addProxyFeeInfo.objName = _param.roomName;
                $that.addProxyFeeInfo.ownerName = _param.roomName + '(' + _param.ownerName + ')';
                $that.addProxyFeeInfo.ownerName = ownerName;
                $('#addProxyFeeModel').modal('show');
            });
        },
@@ -200,7 +203,26 @@
                $that.addProxyFeeInfo.amount = '';
                $that.addProxyFeeInfo.consumption = '';
            },
            _changeProxyFeeTypeCd: function(_feeTypeCd) {
            _changeProxyFeeTypeCd:  function (_feeTypeCd){
                $that.addProxyFeeInfo.secondaryFeeTypeCd='';
                $that.addProxyFeeInfo.configId = '';
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.addProxyFeeInfo, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCds: function(_feeTypeCd,_secondaryFeeTypeCd) {
                $that.addProxyFeeInfo.amount = '';
                $that.addProxyFeeInfo.consumption = '';
                var param = {
@@ -209,6 +231,7 @@
                        row: 20,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        computingFormula: '6006',
                        valid: '1'
@@ -228,6 +251,7 @@
                $that.addProxyFeeInfo = {
                    amount: '',
                    consumption: '',
                    secondaryFeeTypeCd: '',
                    remark: '',
                    roomId: '',
                    objId: '',
public/components/property/carCreateFeeAdd/carCreateFeeAdd.js
@@ -205,8 +205,6 @@
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCds: function (_feeTypeCd,_secondaryFeeTypeCd) {
                $that.carCreateFeeAddInfo.configId = '';
public/components/property/importMeterWaterFee/importMeterWaterFee.html
@@ -19,9 +19,25 @@
                                        <option selected disabled value="">
                                            {{vc.i18n('必填,请选择费用类型','importMeterWaterFee')}}
                                        </option>
                                        <option value="888800010015">{{vc.i18n('水费','importMeterWaterFee')}}</option>
                                        <option value="888800010016">{{vc.i18n('电费','importMeterWaterFee')}}</option>
                                        <option value="888800010009">{{vc.i18n('煤气费','importMeterWaterFee')}}</option>
                                        <option value="630000017">{{vc.i18n('代收水费','roomsProxyFee')}}</option>
                                        <option value="630000007">{{vc.i18n('电费及管理费','roomsProxyFee')}}</option>
                                        <option value="630000009">{{vc.i18n('其他收入','roomsProxyFee')}}</option>
                                    </select>
                                </div>
                            </div>
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">
                                    <vc:i18n name="费用子类型" namespace="tempImportRoomFee"></vc:i18n>
                                </label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="importMeterWaterFeeInfo.secondaryFeeTypeCd"
                                    @change="_changeSecondaryFeeTypeCdx(importMeterWaterFeeInfo.feeTypeCd,importMeterWaterFeeInfo.secondaryFeeTypeCd)">
                                        <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','tempImportRoomFee')}}
                                        </option>
                                        <option v-for="(item,index) in importMeterWaterFeeInfo.secondaryFeeTypeCds" :key="index"
                                            v-bind:value="item.secondaryFeeTypeCd">
                                            {{item.secondaryFeeTypeName}}
                                        </option>
                                    </select>
                                </div>
                            </div>
public/components/property/importMeterWaterFee/importMeterWaterFee.js
@@ -6,6 +6,8 @@
                excelTemplate: '',
                configId: '',
                feeConfigs: [],
                secondaryFeeTypeCds: [],
                secondaryFeeTypeCd: '',
                feeTypeCd: '',
                meterTypes: [],
                meterType: ''
@@ -152,6 +154,7 @@
                $that.importMeterWaterFeeInfo = {
                    communityId: vc.getCurrentCommunity().communityId,
                    excelTemplate: '',
                    secondaryFeeTypeCd: '',
                    configId: '',
                    feeConfigs: [],
                    feeTypeCd: '',
@@ -180,13 +183,33 @@
                }
                return true;
            },
            _changeImportMeterWaterFeeTypeCd: function (_feeTypeCd) {
            _changeImportMeterWaterFeeTypeCd:  function (_feeTypeCd){
                $that.importMeterWaterFeeInfo.secondaryFeeTypeCd='';
                $that.importMeterWaterFeeInfo.configId = '';
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.importMeterWaterFeeInfo, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCdx: function(_feeTypeCd,_secondaryFeeTypeCd) {
                var param = {
                    params: {
                        page: 1,
                        row: 20,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        valid: '1'
                    }
public/components/property/importMeterWaterFee2/importMeterWaterFee2.html
@@ -19,9 +19,25 @@
                                        <option selected disabled value="">
                                            {{vc.i18n('必填,请选择费用类型','importMeterWaterFee2')}}
                                        </option>
                                        <option value="888800010015">{{vc.i18n('水费','importMeterWaterFee2')}}</option>
                                        <option value="888800010016">{{vc.i18n('电费','importMeterWaterFee2')}}</option>
                                        <option value="888800010009">{{vc.i18n('煤气费','importMeterWaterFee2')}}</option>
                                        <option value="630000017">{{vc.i18n('代收水费','roomsProxyFee')}}</option>
                                        <option value="630000007">{{vc.i18n('电费及管理费','roomsProxyFee')}}</option>
                                        <option value="630000009">{{vc.i18n('其他收入','roomsProxyFee')}}</option>
                                    </select>
                                </div>
                            </div>
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">
                                    <vc:i18n name="费用子类型" namespace="tempImportRoomFee"></vc:i18n>
                                </label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="importMeterWaterFee2Info.secondaryFeeTypeCd"
                                    @change="_changeSecondaryFeeTypeCdy(importMeterWaterFee2Info.feeTypeCd,importMeterWaterFee2Info.secondaryFeeTypeCd)">
                                        <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','tempImportRoomFee')}}
                                        </option>
                                        <option v-for="(item,index) in importMeterWaterFee2Info.secondaryFeeTypeCds" :key="index"
                                            v-bind:value="item.secondaryFeeTypeCd">
                                            {{item.secondaryFeeTypeName}}
                                        </option>
                                    </select>
                                </div>
                            </div>
public/components/property/importMeterWaterFee2/importMeterWaterFee2.js
@@ -6,6 +6,8 @@
                excelTemplate: '',
                configId: '',
                feeConfigs: [],
                secondaryFeeTypeCds: [],
                secondaryFeeTypeCd: '',
                feeTypeCd: '',
                meterTypes: [],
                meterType: ''
@@ -163,6 +165,7 @@
                    excelTemplate: '',
                    configId: '',
                    feeConfigs: [],
                    secondaryFeeTypeCd: '',
                    feeTypeCd: '',
                    meterTypes: [],
                    meterType: ''
@@ -189,13 +192,33 @@
                }
                return true;
            },
            _changeImportMeterWaterFeeTypeCd2: function (_feeTypeCd) {
            _changeImportMeterWaterFeeTypeCd2:  function (_feeTypeCd){
                $that.importMeterWaterFee2Info.secondaryFeeTypeCd='';
                $that.importMeterWaterFee2Info.configId = '';
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.importMeterWaterFee2Info, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCdy: function(_feeTypeCd,_secondaryFeeTypeCd) {
                var param = {
                    params: {
                        page: 1,
                        row: 20,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        valid: '1'
                    }
public/components/property/simplifyRoomFee/simplifyRoomFee.js
@@ -148,13 +148,13 @@
                return _value;
            },
            _getDeadlineTime: function (_fee) {
                if (_fee.amountOwed == 0 && _fee.endTime == _fee.deadlineTime) {
                if (_fee.amountOwed == 0 && _fee.endTime == _fee.maxEndTime) {
                    return "-";
                }
                if (_fee.state == '2009001') {
                    return "-";
                }
                return vc.dateFormat(_fee.deadlineTime);
                return vc.dateFormat(_fee.maxEndTime);
            },
            _getEndTime: function (_fee) {
                if (_fee.state == '2009001') {
public/components/room/roomMeterQrcode/roomMeterQrcode.html
@@ -16,9 +16,25 @@
                                <option selected disabled value="">
                                    {{vc.i18n('必填,请选择费用类型','roomMeterQrcode')}}
                                </option>
                                <option value="888800010015">{{vc.i18n('水费','roomMeterQrcode')}}</option>
                                <option value="888800010016">{{vc.i18n('电费','roomMeterQrcode')}}</option>
                                <option value="888800010009">{{vc.i18n('煤气费','roomMeterQrcode')}}</option>
                                <option value="630000017">{{vc.i18n('代收水费','roomsProxyFee')}}</option>
                                <option value="630000007">{{vc.i18n('电费及管理费','roomsProxyFee')}}</option>
                                <option value="630000009">{{vc.i18n('其他收入','roomsProxyFee')}}</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group row">
                        <label class="col-sm-2 col-form-label">
                            <vc:i18n name="费用子类型" namespace="tempImportRoomFee"></vc:i18n>
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="roomMeterQrcodeInfo.secondaryFeeTypeCd"
                            @change="_changeSecondaryFeeTypeCds(roomMeterQrcodeInfo.feeTypeCd,roomMeterQrcodeInfo.secondaryFeeTypeCd)">
                                <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','tempImportRoomFee')}}
                                </option>
                                <option v-for="(item,index) in roomMeterQrcodeInfo.secondaryFeeTypeCds" :key="index"
                                    v-bind:value="item.secondaryFeeTypeCd">
                                    {{item.secondaryFeeTypeName}}
                                </option>
                            </select>
                        </div>
                    </div>
public/components/room/roomMeterQrcode/roomMeterQrcode.js
@@ -9,6 +9,8 @@
                objName: '',
                feeTypeCd: '',
                feeConfigs: [],
                secondaryFeeTypeCds: [],
                secondaryFeeTypeCd: '',
                configId: '',
                objType: '3333',
                hasRoom: false,
@@ -90,13 +92,33 @@
              });
              qrcode.makeCode(_url);
            },
            _changeMeterMeterWaterFeeTypeCd: function (_feeTypeCd) {
            _changeMeterMeterWaterFeeTypeCd:  function (_feeTypeCd){
                $that.roomMeterQrcodeInfo.secondaryFeeTypeCd='';
                $that.roomMeterQrcodeInfo.configId = '';
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.roomMeterQrcodeInfo, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCds: function(_feeTypeCd,_secondaryFeeTypeCd) {
                var param = {
                    params: {
                        page: 1,
                        row: 20,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        valid: '1'
                    }
@@ -138,6 +160,7 @@
                    objId: '',
                    objName: '',
                    feeTypeCd: '',
                    secondaryFeeTypeCd: '',
                    feeConfigs: [],
                    configId: '',
                    objType: '3333',
public/pages/admin/addContract/addContract.html
@@ -349,7 +349,7 @@
                                            </div>
                                            <input type="file" class="custom-file-input form-control"
                                                name="excelTemplate" style="width: 11%;opacity: 1;"
                                                v-on:change="getFile($event,index)" accept=".png,.pdf,.jpg">
                                                v-on:change="getFile($event,index)" accept=".png,.pdf,.jpg,.doc,.docx">
                                            <label
                                                class="col-sm-5 col-form-label padding-lr-sm text-right">{{item.fileRealName}}</label>
                                            <div>
public/pages/admin/addContract/addContract.js
@@ -531,7 +531,7 @@
                let _fileName = $that.addContractInfo.tempfile.name;
                let _suffix = _fileName.substring(_fileName.lastIndexOf('.') + 1);
                if (!$that.checkFileType(_suffix.toLowerCase())) {
                    vc.toast('操作失败,请上传图片、PDF格式的文件');
                    vc.toast('操作失败,请上传图片、PDF或Word格式的文件');
                    return;
                }
                let param = new FormData();
@@ -561,13 +561,14 @@
                    });
            },
            checkFileType: function (fileType) {
                const acceptTypes = ['png', 'pdf', 'jpg'];
                for (var i = 0; i < acceptTypes.length; i++) {
                    if (fileType === acceptTypes[i]) {
                        return true;
                    }
                }
                return false;
                const acceptTypes = ['png', 'pdf', 'jpg', 'doc', 'docx'];
                return acceptTypes.includes(fileType);
                // for (var i = 0; i < acceptTypes.length; i++) {
                //     if (fileType === acceptTypes[i]) {
                //         return true;
                //     }
                // }
                // return false;
            },
            _changeContractPartyA: function () {
                let _partyA = $that.addContractInfo.partyA;
public/pages/fee/feeDetail/feeDetail.js
@@ -19,7 +19,7 @@
                startTime: '',
                batchId: '',
                endTime: '',
                deadlineTime: '',
                maxEndTime: '',
                amountOwed: '',
                attrs: [],
                _currentTab: 'feeDetailHisFee',
@@ -86,13 +86,13 @@
            },
            _getDeadlineTime: function (_fee) {
                if (_fee.amountOwed == 0 && _fee.endTime == _fee.deadlineTime) {
                if (_fee.amountOwed == 0 && _fee.endTime == _fee.maxEndTime) {
                    return "-";
                }
                if (_fee.state == '2009001') {
                    return "-";
                }
                return _fee.deadlineTime;
                return _fee.maxEndTime;
            },
            _getEndTime: function (_fee) {
                if (_fee.state == '2009001') {
public/pages/property/accountManage/accountManage.html
@@ -102,8 +102,8 @@
                            <tr v-for="account in accountManageInfo.accounts">
                                <td class="text-center">{{account.acctId}}</td>
                                <td class="text-center">{{account.acctName}}</td>
                                <td class="text-center">{{account.idCard}}</td>
                                <td class="text-center">{{account.link}}</td>
                                <td class="text-center">{{account.idCard || '-'}}</td>
                                <td class="text-center">{{account.link || '-'}}</td>
                                <td class="text-center">{{account.acctTypeName}}</td>
                                <td class="text-center">{{account.amount}}</td>
                                <td class="text-center">{{account.roomName || '无'}}</td>
public/pages/property/auditAuthOwner/auditAuthOwner.html
@@ -110,7 +110,7 @@
                                    <div>{{appUser.appUserName}}</div>
                                    <div v-if="appUser.ownerId">({{appUser.ownerId}})</div>
                                </td>
                                <td class="text-center">{{appUser.link}}</td>
                                <td class="text-center">{{appUser.link || '-'}}</td>
                                <td class="text-center">{{appUser.roomName || '-'}}</td>
                                <td class="text-center">{{appUser.ownerTypeCdName || '-'}}</td>
                                <td class="text-center">{{appUser.idCard || '-'}}</td>
public/pages/property/listOwner/listOwner.html
@@ -167,7 +167,7 @@
                                    {{owner.idCard || '-'}}
                                </td>
                                <td class="text-center">
                                    {{owner.link}}
                                    {{owner.link || '-'}}
                                </td>
                                <td class="text-center">
                                    {{owner.concactLink || '-'}}
public/pages/property/room/room.html
@@ -201,13 +201,20 @@
                                        <span><vc:i18n name="层" namespace="room"></vc:i18n></span>
                                    </div>
                                </td>
                                <td class="text-center hand" v-if="room.ownerName">
                                <td class="text-center hand" v-if="room.ownerName&&room.link">
                                    <div class="hc-td">
                                        <a target="_blank" :href="'/#/pages/owner/ownerDetail?ownerId='+room.ownerId">
                                            {{room.ownerName}}({{room.link}})
                                        </a>
                                    </div>
                                </td>
                                <td class="text-center hand" v-if="room.ownerName&&!room.link">
                                    <div class="hc-td">
                                        <a target="_blank" :href="'/#/pages/owner/ownerDetail?ownerId='+room.ownerId">
                                            {{room.ownerName}}
                                        </a>
                                    </div>
                                </td>
                                <td class="text-center" v-else>
                                    <div class="hc-td textAuto">-</div>
                                </td>