采购-物品信息，费用-业主车辆，房产-房屋管理等页面修改

jialh

2025-07-21 0d3281012d65ab0cee6d74d99d2f2d9ac245583d

采购-物品信息，费用-业主车辆，房产-房屋管理等页面修改

 public/components/common/addResourceStore/addResourceStore.html

@@ -20,7 +20,7 @@
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.resCode" type="text"
                                   :placeholder="vc.i18n('必填，请填写物品编码','addResourceStore')" class="form-control">
                                   :placeholder="vc.i18n('选填，请填写物品编码','addResourceStore')" class="form-control">
                        </div>
                    </div>
                    <div class="form-group row">
@@ -31,7 +31,7 @@
                            <select class="custom-select" v-model="addResourceStoreInfo.parentRstId"
                                    @change="resourceStoreTypesOnChangeAdd">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择物品类型','addResourceStore')}}
                                    {{vc.i18n('选填，请选择物品类型','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.resourceStoreTypes" :key="index"
                                        v-bind:value="item.rstId">{{item.name}}
@@ -45,7 +45,7 @@
                            <select class="custom-select" v-model="addResourceStoreInfo.rstId"
                                    @change="sonResourceStoreTypesOnChangeAdd">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择二级分类','addResourceStore')}}
                                    {{vc.i18n('选填，请选择二级分类','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.sonResourceStoreTypes" :key="index"
                                        v-bind:value="item.rstId">{{item.name}}
@@ -60,7 +60,7 @@
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="addResourceStoreInfo.unitCode">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择物品单位','addResourceStore')}}
                                    {{vc.i18n('选填，请选择物品单位','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.unitCodes" :key="index"
                                        v-bind:value="item.statusCd">{{item.name}}
@@ -73,7 +73,7 @@
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="addResourceStoreInfo.isFixed">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择是否是固定物品','addResourceStore')}}
                                    {{vc.i18n('选填，请选择是否是固定物品','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.isFixeds" :key="index"
                                        v-bind:value="item.statusCd">{{item.name}}
@@ -101,7 +101,7 @@
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="addResourceStoreInfo.shId">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择仓库','addResourceStore')}}
                                    {{vc.i18n('选填，请选择仓库','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.storehouses" :key="index"
                                        v-bind:value="item.shId">{{item.shName}}
@@ -115,14 +115,14 @@
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.price" type="text"
                                   :placeholder="vc.i18n('必填，请填写物品采购参考价格','addResourceStore')" class="form-control">
                                   :placeholder="vc.i18n('选填，请填写物品采购参考价格','addResourceStore')" class="form-control">
                        </div>
                        <label class="col-sm-2 col-form-label text-right">
                            <vc:i18n name="警告库存" namespace="addResourceStore"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.warningStock" type="text"
                                   :placeholder="vc.i18n('必填，请填写警告库存','addResourceStore')" class="form-control">
                                   :placeholder="vc.i18n('选填，请填写警告库存','addResourceStore')" class="form-control">
                        </div>
                    </div>
                    <div class="form-group row">
@@ -132,7 +132,7 @@
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="addResourceStoreInfo.miniUnitCode">
                                <option selected disabled value="">
                                    {{vc.i18n('必填，请选择物品最小计量单位','addResourceStore')}}
                                    {{vc.i18n('选填，请选择物品最小计量单位','addResourceStore')}}
                                </option>
                                <option v-for="(item,index) in addResourceStoreInfo.unitCodes" :key="index"
                                        v-bind:value="item.statusCd">{{item.name}}
@@ -145,7 +145,7 @@
                        </label>
                        <div class="col-sm-4 text-right">
                            <input v-model.trim="addResourceStoreInfo.miniUnitStock" type="text"
                                   :placeholder="vc.i18n('必填，请填写最小计量单位数量','addResourceStore')" class="form-control">
                                   :placeholder="vc.i18n('选填，请填写最小计量单位数量','addResourceStore')" class="form-control">
                        </div>
                    </div>
                    <div class="form-group row">
@@ -154,7 +154,7 @@
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.outLowPrice" type="text"
                                   :placeholder="vc.i18n('必填，请填写物品最小计量单位，最低收费标准','addResourceStore')"
                                   :placeholder="vc.i18n('选填，请填写物品最小计量单位，最低收费标准','addResourceStore')"
                                   class="form-control">
                        </div>
                        <label class="col-sm-2 col-form-label text-right">
@@ -162,7 +162,7 @@
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.outHighPrice" type="text"
                                   :placeholder="vc.i18n('必填，请填写物品最小计量单位，最高收费标准','addResourceStore')"
                                   :placeholder="vc.i18n('选填，请填写物品最小计量单位，最高收费标准','addResourceStore')"
                                   class="form-control" @change="decideAdd()">
                        </div>
                    </div>
@@ -172,7 +172,7 @@
                        </label>
                        <div class="col-sm-4">
                            <input v-model.trim="addResourceStoreInfo.stock" type="text"
                                   :placeholder="vc.i18n('必填，请填写出入库存','addResourceStore')" class="form-control">
                                   :placeholder="vc.i18n('选填，请填写出入库存','addResourceStore')" class="form-control">
                        </div>
                        <label class="col-sm-2 col-form-label text-right">
                            <vc:i18n name="备注" namespace="addResourceStore"></vc:i18n>

 public/components/common/addResourceStore/addResourceStore.js

@@ -17,7 +17,7 @@
                flag: '',
                resName: '',
                resCode: '',
                price: '',
                price: '0',
                outLowPrice: '0',
                outHighPrice: '0',
                showMobile: 'N',
@@ -78,91 +78,91 @@
                            errInfo: "物品名称长度为2至100"
                        }
                    ],
                    'addResourceStoreInfo.parentRstId': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "物品类型不能为空"
                        }
                    ],
                    'addResourceStoreInfo.rstId': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "二级分类不能为空"
                        }
                    ],
                    'addResourceStoreInfo.unitCode': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "单位不能为空"
                        }
                    ],
                    'addResourceStoreInfo.isFixed': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "是否是固定物品不能为空"
                        }
                    ],
                    // 'addResourceStoreInfo.parentRstId': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "物品类型不能为空"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.rstId': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "二级分类不能为空"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.unitCode': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "单位不能为空"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.isFixed': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "是否是固定物品不能为空"
                    //     }
                    // ],
                    'addResourceStoreInfo.resCode': [
                        {
                            limit: "maxLength",
                            param: "50",
                            errInfo: "物品编码不能超过50位"
                        },
                        {
                            limit: "required",
                            param: "",
                            errInfo: "物品编码不能为空"
                        }
                        // {
                        //     limit: "required",
                        //     param: "",
                        //     errInfo: "物品编码不能为空"
                        // }
                    ],
                    'addResourceStoreInfo.shId': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "仓库不能为空"
                        }
                    ],
                    'addResourceStoreInfo.price': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "物品价格不能为空"
                        },
                        {
                            limit: "money",
                            param: "",
                            errInfo: "物品价格格式错误"
                        }
                    ],
                    'addResourceStoreInfo.warningStock': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "警告库存不能为空"
                        },
                        {
                            limit: "min",
                            param: "0",
                            errInfo: "警告库存最小为零"
                        }
                    ],
                    'addResourceStoreInfo.miniUnitCode': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "最小计量单位不能为空"
                        }
                    ],
                    'addResourceStoreInfo.miniUnitStock': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "最小计量单位数量不能为空"
                        }
                    ],
                    // 'addResourceStoreInfo.shId': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "仓库不能为空"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.price': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "物品价格不能为空"
                    //     },
                    //     {
                    //         limit: "money",
                    //         param: "",
                    //         errInfo: "物品价格格式错误"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.warningStock': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "警告库存不能为空"
                    //     },
                    //     {
                    //         limit: "min",
                    //         param: "0",
                    //         errInfo: "警告库存最小为零"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.miniUnitCode': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "最小计量单位不能为空"
                    //     }
                    // ],
                    // 'addResourceStoreInfo.miniUnitStock': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "最小计量单位数量不能为空"
                    //     }
                    // ],
                    'addResourceStoreInfo.description': [
                        {
                            limit: "maxLength",
@@ -170,19 +170,19 @@
                            errInfo: "物品描述不能超过200位"
                        }
                    ],
                    'addResourceStoreInfo.showMobile': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "手机端显示不能为空"
                        }
                    ],
                    // 'addResourceStoreInfo.showMobile': [
                    //     {
                    //         limit: "required",
                    //         param: "",
                    //         errInfo: "手机端显示不能为空"
                    //     }
                    // ],
                    'addResourceStoreInfo.outLowPrice': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "最低收费标准不能为空"
                        },
                        // {
                        //     limit: "required",
                        //     param: "",
                        //     errInfo: "最低收费标准不能为空"
                        // },
                        {
                            limit: "money",
                            param: "",
@@ -190,11 +190,11 @@
                        }
                    ],
                    'addResourceStoreInfo.outHighPrice': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "最高收费标准不能为空"
                        },
                        // {
                        //     limit: "required",
                        //     param: "",
                        //     errInfo: "最高收费标准不能为空"
                        // },
                        {
                            limit: "money",
                            param: "",

 public/pages/fee/roomCreatePayFee/roomCreatePayFee.html

@@ -28,6 +28,22 @@
                                </select>
                            </div>
                            <label class="col-sm-2 col-form-label text-right">
                                <vc:i18n name="费用子类型" namespace="roomCreatePayFee"></vc:i18n>
                            </label>
                            <div class="col-sm-4">
                                <select class="custom-select" v-model="roomCreatePayFeeInfo.secondaryFeeTypeCd"
                                    @change="_changeSecondaryFeeTypeCdx(roomCreatePayFeeInfo.feeTypeCd,roomCreatePayFeeInfo.secondaryFeeTypeCd)">
                                    <option selected disabled value="">{{vc.i18n('非必填，请选择费用子类型','roomCreateFeeAdd')}}
                                    </option>
                                    <option v-for="(item,index) in roomCreatePayFeeInfo.secondaryFeeTypeCds" :key="index"
                                        v-bind:value="item.secondaryFeeTypeCd">
                                        {{item.secondaryFeeTypeName}}
                                    </option>
                                </select>
                            </div>
                        </div>
                        <div class="form-group row">
                            <label class="col-sm-2 col-form-label text-right">
                                <vc:i18n name="收费项目" namespace="roomCreatePayFee"></vc:i18n>
                            </label>
                            <div class="col-sm-4">
@@ -42,7 +58,6 @@
                                </select>
                            </div>
                        </div>

                        <div class="form-group row">
                            <label class="col-sm-2 col-form-label text-right">
                                <vc:i18n name="计费起始时间" namespace="roomCreatePayFee"></vc:i18n>

 public/pages/fee/roomCreatePayFee/roomCreatePayFee.js

@@ -4,6 +4,8 @@
            roomCreatePayFeeInfo: {
                feeTypeCds: [],
                feeConfigs: [],
                secondaryFeeTypeCd: '',
                secondaryFeeTypeCds: [],
                remark: '',
                floorId: '',
                communityId: vc.getCurrentCommunity().communityId,
@@ -112,6 +114,32 @@
                    });
            },
            _changeFeeTypeCdX: function (_feeTypeCd) {
                $that.roomCreatePayFeeInfo.secondaryFeeTypeCd=''
                let param = {
                    params: {
                        feeTypeCd: _feeTypeCd,
                    }
                };
                vc.http.apiGet('/secondaryFeeTypeCdGl.list.show', param,
                    function (json, res) {
                        let result = JSON.parse(json);
                        if (result.length ) {
                            $that.$set($that.roomCreatePayFeeInfo, 'secondaryFeeTypeCds', result);
                        } else {
                            $that.$set($that.roomCreatePayFeeInfo, 'secondaryFeeTypeCds', [{
                                secondaryFeeTypeCd: "",
                                secondaryFeeTypeName: "无关联子类型，请直接选择收费项目"
                            }]);
                        }
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');
                        vc.toast(errInfo);
                    }
                );
                $that._changeSecondaryFeeTypeCdx(_feeTypeCd, '');
            },
            _changeSecondaryFeeTypeCdx: function (_feeTypeCd,_secondaryFeeTypeCd) {
                // 押金默认开始时间为当前时间，结束时间+1月
                if (_feeTypeCd == '888800010006' || _feeTypeCd == '888800010014') {
                    $that.roomCreatePayFeeInfo.startTime = vc.dateFormat(new Date());
@@ -124,6 +152,7 @@
                        row: 500,
                        communityId: vc.getCurrentCommunity().communityId,
                        feeTypeCd: _feeTypeCd,
                        secondaryFeeTypeCd: _secondaryFeeTypeCd,
                        isDefault: 'F',
                        valid: '1'
                    }

 public/pages/property/hireParkingSpace/hireParkingSpace.html

@@ -103,7 +103,7 @@
                </label>
                <div class="col-sm-3">
                    <input v-model="hireParkingSpaceInfo.psName" disabled type="text"
                        :placeholder="vc.i18n('必填，请选择车位','hireParkingSpace')" class="form-control">
                        :placeholder="vc.i18n('选填，请选择车位','hireParkingSpace')" class="form-control">
                </div>
                <div class="col-sm-1">
                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchParkingSpaceModel()">选择车位

 public/pages/property/listOwnerCar/listOwnerCar.html

@@ -192,7 +192,7 @@
                                    {{car.areaNum}}-{{car.num}}
                                </td>
                                <td v-else class="text-center">
                                    车位已释放
                                    --
                                </td>
                                <td class="text-center" v-if="car.leaseType == 'H' || car.leaseType == 'S'">
                                    {{car.startTime}}</br>~{{car.endTime}}