jialh
2025-07-16 fc67e9f26317b73613dd7f79a0f9ffd0b331e09b
更新
8个文件已修改
109 ■■■■■ 已修改文件
app.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/addOwner/addOwner.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/editOwner/editOwner.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/floorUnitTree/floorUnitTree.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/pages/property/listOwner/listOwner.html 10 ●●●● 补丁 | 查看 | 原始文档 | 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/addOwner/addOwner.js
@@ -67,13 +67,6 @@
                            errInfo: "身份证格式不对"
                        }
                    ],
                    'addOwnerInfo.sex': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "性别不能为空"
                        }
                    ],
                    'addOwnerInfo.remark': [
                        {
                            limit: "maxLength",
public/components/property/editOwner/editOwner.js
@@ -65,13 +65,6 @@
                            errInfo: "名称长度必须在2位至64位"
                        }
                    ],
                    'editOwnerInfo.sex': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "性别不能为空"
                        }
                    ],
                    'editOwnerInfo.link': [
                        {
                            limit: "required",
public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js
@@ -122,6 +122,7 @@
                    params: {
                        page: 1,
                        row: 100,
                        carCreateFee:true,
                        communityId: vc.getCurrentCommunity().communityId,
                        isDefault:'F'
                    }
public/components/property/floorUnitTree/floorUnitTree.js
@@ -154,11 +154,12 @@
                            continue;
                        }
                        if (!_includeMenu) {
                            let unitDisplayName = _units[_pIndex].unitName ? `${_units[_pIndex].unitNum}(${_units[_pIndex].unitName})` : _units[_pIndex].unitNum;
                            let _menuItem = {
                                id: 'u_' + _units[_pIndex].unitId,
                                unitId: _units[_pIndex].unitId,
                                // text: _units[_pIndex].unitNum + "单元",
                                text: _units[_pIndex].unitNum + '(' + _units[_pIndex].unitName + ')',
                                text: unitDisplayName,
                                icon: "/img/unit.png"
                            };
                            _children.push(_menuItem);
public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -12,8 +12,8 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model.trim="roomCreateFeeAddInfo.locationTypeCdName" disabled="disabled"
                                   type="text" :placeholder="vc.i18n('必填,请填写收费范围','roomCreateFeeAdd')"
                                   class="form-control"/>
                                type="text" :placeholder="vc.i18n('必填,请填写收费范围','roomCreateFeeAdd')"
                                class="form-control" />
                        </div>
                    </div>
                    <div class="form-group row">
@@ -22,14 +22,30 @@
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="roomCreateFeeAddInfo.feeTypeCd"
                                    @change="_changeFeeTypeCdX(roomCreateFeeAddInfo.feeTypeCd)">
                                @change="_changeFeeTypeCdX(roomCreateFeeAddInfo.feeTypeCd)">
                                <option selected disabled value="">
                                    {{vc.i18n('必填,请选择费用类型','roomCreateFeeAdd')}}
                                </option>
                                <!--item.statusCd !='888800010008' &&-->
                                <option v-for="(item,index) in roomCreateFeeAddInfo.feeTypeCds" :key="index"
                                        v-bind:value="item.statusCd" v-if="item.statusCd !='888800010017'">
                                    v-bind:value="item.statusCd" v-if="item.statusCd !='888800010017'">
                                    {{item.name}}
                                </option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group row">
                        <label class="col-sm-2 col-form-label">
                            <vc:i18n name="费用子类型" namespace="roomCreateFeeAdd"></vc:i18n>
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="roomCreateFeeAddInfo.secondaryFeeTypeCd"
                                @change="_changeSecondaryFeeTypeCdx(roomCreateFeeAddInfo.feeTypeCd,roomCreateFeeAddInfo.secondaryFeeTypeCd)">
                                <option selected disabled value="">{{vc.i18n('必填,请选择费用子类型','roomCreateFeeAdd')}}
                                </option>
                                <option v-for="(item,index) in roomCreateFeeAddInfo.secondaryFeeTypeCds" :key="index"
                                    v-bind:value="item.secondaryFeeTypeCd">
                                    {{item.secondaryFeeTypeName}}
                                </option>
                            </select>
                        </div>
@@ -40,12 +56,12 @@
                        </label>
                        <div class="col-sm-10">
                            <select class="custom-select" v-model="roomCreateFeeAddInfo.configId"
                                    @change="_roomCreateFeeAddIfOnceFee(roomCreateFeeAddInfo.configId)">
                                @change="_roomCreateFeeAddIfOnceFee(roomCreateFeeAddInfo.configId)">
                                <option selected disabled value="">
                                    {{vc.i18n('必填,请选择收费项目','roomCreateFeeAdd')}}
                                </option>
                                <option v-for="(item,index) in roomCreateFeeAddInfo.feeConfigs" :key="index"
                                        v-bind:value="item.configId">{{item.feeName}}
                                    v-bind:value="item.configId">{{item.feeName}}
                                </option>
                            </select>
                        </div>
@@ -56,7 +72,7 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model.trim="roomCreateFeeAddInfo.amount" type="text"
                                   :placeholder="vc.i18n('必填,请填写收费金额','roomCreateFeeAdd')" class="form-control">
                                :placeholder="vc.i18n('必填,请填写收费金额','roomCreateFeeAdd')" class="form-control">
                        </div>
                    </div>
                    <div class="form-group row">
@@ -65,8 +81,8 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model="roomCreateFeeAddInfo.startTime" type="text"
                                   :placeholder="vc.i18n('必填,请填写计费起始时间','roomCreateFeeAdd')"
                                   class="form-control roomCreateFeeStartTime">
                                :placeholder="vc.i18n('必填,请填写计费起始时间','roomCreateFeeAdd')"
                                class="form-control roomCreateFeeStartTime">
                        </div>
                    </div>
                    <!-- 显示条件:1.不是押金 roomCreateFeeAddInfo.feeTypeCd != '888800010006' && 2.不是其他费用 3.不是周期性费用 -->
@@ -76,8 +92,8 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model="roomCreateFeeAddInfo.endTime" type="text"
                                   :placeholder="vc.i18n('必填,请填写计费结束时间','roomCreateFeeAdd')"
                                   class="form-control roomCreateFeeEndTime">
                                :placeholder="vc.i18n('必填,请填写计费结束时间','roomCreateFeeAdd')"
                                class="form-control roomCreateFeeEndTime">
                        </div>
                    </div>
                    <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
@@ -86,7 +102,7 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model.trim="roomCreateFeeAddInfo.rateCycle" type="text"
                                   :placeholder="vc.i18n('必填,请填写递增周期,请填写月份','roomCreateFeeAdd')" class="form-control ">
                                :placeholder="vc.i18n('必填,请填写递增周期,请填写月份','roomCreateFeeAdd')" class="form-control ">
                        </div>
                    </div>
                    <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
@@ -95,7 +111,7 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model.trim="roomCreateFeeAddInfo.rate" type="text"
                                   :placeholder="vc.i18n('必填,请填写递增率','roomCreateFeeAdd')" class="form-control ">
                                :placeholder="vc.i18n('必填,请填写递增率','roomCreateFeeAdd')" class="form-control ">
                        </div>
                    </div>
                    <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
@@ -104,8 +120,8 @@
                        </label>
                        <div class="col-sm-10">
                            <input v-model="roomCreateFeeAddInfo.rateStartTime" type="text"
                                   :placeholder="vc.i18n('必填,请填写递增开始时间','roomCreateFeeAdd')"
                                   class="form-control addRoomRateStartTime">
                                :placeholder="vc.i18n('必填,请填写递增开始时间','roomCreateFeeAdd')"
                                class="form-control addRoomRateStartTime">
                        </div>
                    </div>
                    <div class="ibox-content">
@@ -113,7 +129,7 @@
                            <i class="fa fa-check"></i>&nbsp;提交
                        </button>
                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
                                data-dismiss="modal">
                            data-dismiss="modal">
                            <i class="fa fa-times"></i>&nbsp;取消
                        </button>
                    </div>
public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -4,6 +4,8 @@
            roomCreateFeeAddInfo: {
                feeTypeCds: [],
                feeConfigs: [],
                secondaryFeeTypeCd: '',
                secondaryFeeTypeCds: [],
                locationTypeCd: '',
                locationObjId: '',
                floorId: '',
@@ -194,6 +196,24 @@
                $that.roomCreateFeeAddInfo.feeTypeCds = _feeTypeCds;
            },
            _changeFeeTypeCdX: function (_feeTypeCd) {
                $that.roomCreateFeeAddInfo.secondaryFeeTypeCd=''
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        $that.$set($that.roomCreateFeeAddInfo, 'secondaryFeeTypeCds', result);
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
            },
            _changeSecondaryFeeTypeCdx: function (_feeTypeCd,_secondaryFeeTypeCd) {
                // 押金默认开始时间为当前时间,结束时间+1月
                if (_feeTypeCd == '888800010006' || _feeTypeCd == '888800010014') {
                    $that.roomCreateFeeAddInfo.startTime = vc.dateFormat(new Date());
@@ -206,6 +226,7 @@
                        row: 500,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        state: 'Y'
                    }
public/pages/property/listOwner/listOwner.html
@@ -154,8 +154,14 @@
                                <td class="text-center">
                                    {{owner.personRoleName}}
                                </td>
                                <td class="text-center">
                                    {{owner.sex == 0 ? '男' : '女'}}
                                <td class="text-center" v-if="owner.sex==''">
                                    {{'-'}}
                                </td>
                                <td class="text-center" v-else-if="owner.sex==0">
                                    {{'男'}}
                                </td>
                                <td class="text-center" v-else>
                                    {{'女'}}
                                </td>
                                <td class="text-center">
                                    {{owner.idCard || '-'}}