优化代码

public/components/property/simplifyCarFee/simplifyCarFee.html

@@ -10,13 +10,13 @@
         </div>
         <div class="col-lg-6 text-right" v-if="simplifyCarFeeInfo.carId">
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openBatchPayCarFeeModal()">
-                批量缴费
+                <vc:i18n name="批量缴费" namespace="simplifyCarFee"></vc:i18n>
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openSimplifyCarAddMeterWaterModal()">
-                水电抄表
+                <vc:i18n name="水电抄表" namespace="simplifyCarFee"></vc:i18n>
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openSimplifyCarCreateFeeAddModal()">
-                创建费用
+                <vc:i18n name="创建费用" namespace="simplifyCarFee"></vc:i18n>
             </button>
         </div>
     </div>
@@ -24,16 +24,36 @@
         <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
                 <tr>
-                    <th class="text-center"><vc:i18n name="费用项目" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="费用标识" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="费用类型" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="应收金额" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="建账时间" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="计费起始时间" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="计费结束时间" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="说明" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="状态" namespace="simplifyCarFee"></vc:i18n></th>
-                    <th class="text-center"><vc:i18n name="操作" namespace="simplifyCarFee"></vc:i18n></th>
+                    <th class="text-center">
+                        <vc:i18n name="费用项目" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="费用标识" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="费用类型" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="应收金额" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="建账时间" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="计费起始时间" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="计费结束时间" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="说明" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="状态" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="操作" namespace="simplifyCarFee"></vc:i18n>
+                    </th>
                 </tr>
             </thead>
             <tbody>
@@ -46,18 +66,22 @@
                     <td class="text-center">{{_getEndTime(fee)}}</td>
                     <td class="text-center">{{_getDeadlineTime(fee)}}</td>
                     <td class="text-center" v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' " :title="_simplifyCarGetFeeOwnerInfo(fee.feeAttrs)">
-                        <div><vc:i18n name="上期度数" namespace="simplifyCarFee"></vc:i18n>：{{fee.preDegrees}}</div>
-                        <div><vc:i18n name="本期度数" namespace="simplifyCarFee"></vc:i18n>：{{fee.curDegrees}}</div>
-                        <div><vc:i18n name="单价" namespace="simplifyCarFee"></vc:i18n>：{{fee.squarePrice}}</div>
-                        <div><vc:i18n name="附加费" namespace="simplifyCarFee"></vc:i18n>：{{fee.additionalAmount}}</div>
+                        <div><span><vc:i18n name="上期度数" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.preDegrees}}</div>
+                        <div><span><vc:i18n name="本期度数" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.curDegrees}}</div>
+                        <div><span><vc:i18n name="单价" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.squarePrice}}</div>
+                        <div><span><vc:i18n name="附加费" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.additionalAmount}}</div>
                     </td>
                     <td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'" :title="_simplifyCarGetFeeOwnerInfo(fee.feeAttrs)">
-                        <div><vc:i18n name="算法" namespace="simplifyCarFee"></vc:i18n>：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
-                        <div><vc:i18n name="用量" namespace="simplifyCarFee"></vc:i18n>：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
+                        <div>
+                            <span><vc:i18n name="算法" namespace="simplifyCarFee"></vc:i18n></span>：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
+                        <div>
+                            <span><vc:i18n name="用量" namespace="simplifyCarFee"></vc:i18n></span>：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
                     </td>
                     <td class="text-center" v-else :title="_simplifyCarGetFeeOwnerInfo(fee.feeAttrs)">
-                        <div><vc:i18n name="单价" namespace="simplifyCarFee"></vc:i18n>：{{fee.squarePrice}}</div>
-                        <div><vc:i18n name="固定费" namespace="simplifyCarFee"></vc:i18n>：{{fee.additionalAmount}}</div>
+                        <div>
+                            <span><vc:i18n name="单价" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.squarePrice}}</div>
+                        <div>
+                            <span><vc:i18n name="固定费" namespace="simplifyCarFee"></vc:i18n></span>：{{fee.additionalAmount}}</div>
                     </td>
                     <td class="text-center">{{fee.stateName}}</td>
                     <td class="text-right">
@@ -77,11 +101,13 @@
         </table>
         <div class="row">
             <div class="col-sm-5">
-                <div> <vc:i18n name="注意" namespace="simplifyCarFee"></vc:i18n>： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</div>
-                <div> <vc:i18n name="应收金额" namespace="simplifyCarFee"></vc:i18n> 为-1 一般为费用项公式设置出错请检查</div>
+                <div>
+                    注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</div>
+                <div>
+                    应收金额 为-1 一般为费用项公式设置出错请检查</div>
             </div>
             <div class="col-sm-2">
-                <span> <vc:i18n name="欠费小计" namespace="simplifyCarFee"></vc:i18n>：{{simplifyCarFeeInfo.totalAmount}}</span>
+                <span> 欠费小计：{{simplifyCarFeeInfo.totalAmount}}</span>
             </div>
             <div class="col-sm-5 float-right">
                 <vc:create namespace="simplifyCarFee" path="frame/paginationPlus"></vc:create>
@@ -89,4 +115,4 @@
         </div>
     </div>
 
-</div>
+</div>

public/pages/common/enterCommunity/enterCommunity.html

@@ -8,7 +8,7 @@
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-white btn-sm" v-on:click="_showHcUse()">
-                            商用流程
+                            <vc:i18n name="商用流程" namespace="enterCommunity"></vc:i18n>
                         </button>
                     </div>
                 </div>
@@ -165,4 +165,4 @@
     <!-- <vc:create path="common/storeEnterCommunity"></vc:create>
     <vc:create path="common/storeExitCommunity"></vc:create> -->
     <vc:create path="common/editCommunityArea"></vc:create>
-</div>
+</div>

public/pages/property/simplifyAcceptance/simplifyAcceptance.html

@@ -17,7 +17,7 @@
             </select>
         </div>
         <div class="col-lg-4 padding-lr-0 margin-left-xs">
-            <input class="form-control" v-bind:placeholder="simplifyAcceptanceInfo.searchPlaceholder" v-model="simplifyAcceptanceInfo.searchValue" @keyup.enter="_doSearch()" />
+            <input class="form-control" v-bind:placeholder="vc.i18n(simplifyAcceptanceInfo.searchPlaceholder, 'simplifyAcceptance')" v-model="simplifyAcceptanceInfo.searchValue" @keyup.enter="_doSearch()" />
         </div>
         <div class="col-lg-1 padding-lr-0 margin-left-sm">
             <button type="button" class="form-control btn btn-primary" @click="_doSearch()"><vc:i18n name="查询" namespace="simplifyAcceptance"></vc:i18n></button>
@@ -276,4 +276,4 @@
     <vc:create path="property/searchRoom" emitChooseRoom="simplifyAcceptance" emitLoadData="list" roomFlag="1" showSearchCondition="false"></vc:create>
     <vc:create path="property/editMachineTranslate"></vc:create>
 
-</div>
+</div>

public/vcCore/vc-en.js

@@ -95,7 +95,7 @@
         "allocationStoreRoomManage": { "调拨记录": "transfer record", "流程管理中设置": "setting in process management", "状态": "status", "查询条件": "query condition", "物品调拨流程": "item transfer process", "请输入申请人姓名": "Please enter the applicantname", "申请调拨": "Apply for transfer", "详情": "Details", "查询": "Inquiry", "请输入申请人": "Please enter applicant", "请输入申请": "Please enter the application", "请选择调拨开始时间": "Please select the transfer start time", "重置": "Reset", "调拨": "Transfer", "申请人": "Applicant", "操作": "Operation", "请选择调拨结束时间": "Please select the transfer end time", "申请": "Apply", "注意": "Note", "请选择类型": "Please select a type", "时间": "Time", "导出": "Export", "请选择调拨状态": "Please select a transfer status", "流程图": "Flowchart", "类型": "Type", "取消调拨": "Cancel Allocation" },
         "allocationStoreRoomDetailed": { "调拨数量": "Allocation Quantity", "状态": "Status", "查询条件": "Query Condition", "必填": "Required", "调拨申请": "Transfer Application", "请选择物品规格": "Please select the item specification", "被调仓库原库存": "Original inventory of the transferred wareRoom", "查询": "Inquiry", "请输入申请人": "Please enter the applicant", "重置": "Reset", "请输入物品名称": "Please enter the item name", "调拨明细": "Transfer Details", "目标仓库": "Target WareRoom", "请输入调拨申请": "Please enter the transfer application", "申请人": "Applicant", "是否是固定物品": "Whether it is a fixed item Item", "物品规格": "Item Specification", "物品类型": "Item Type", "被调仓库": "Transfer WareRoom", "请选择类型": "Please select a type", "物品名称": "Item name", "时间": "Time", "导出": "Export", "请选择二级分类": "Please select a secondary category", "物品": "Item", "调拨说明": "Transfer Instruction", "请选择物品类型": "Please select the item type", "请选择调拨状态": "Please select the transfer status", "请输入物品": "Please enter the item" },
         "owePayFeeOrder": { "房屋": "Room", "打印收据": "print receipt", "元": "yuan", "计费结束时间": "billing end time", "缴费成功": "payment success", "费用类型": "fee type", "缴费": "payment", "备注": "remarks", "支付方式": "payment method", "确定收费": "determined charge", "必填": "required", "关闭": "closed", "欠费金额": "Arrears Amount", "计费起始时间": "Billing Start Time", "可填": "Fillable", "费用项目": "Expense Item", "费用标识": "Fee ID", "收费确认": "Charge Confirmation", "返回": "Return", "费用": "Fee", "金额": "Amount", "缴费提示": "Payment Reminder" },
-        "simplifyAcceptance": { "绑定记录": "Binding Record", "投诉单": "Complaint Form", "室内面积": "Indoor Area", "门禁同步": "Access Control Synchronization", "道闸同步": "Barrier synchronization", "业主身份证": "Owner ID card", "业主姓名": "Owner name", "房屋类型": "Room type", "查询": "Inquiry", "抄表记录": "Meter reading record", "商铺号": "Shop No.", "交房": "Delivery room", "入住日期": "Check-in date", "业主备注": "Ownerremarks", "选择房屋": "select Room", "业主名称": "owner name", "业主合同": "owner contract", "联系电话": "contact number", "商铺编号": "shop number", "车辆信息": "Vehicle", "业主电话": "Owner Phone", "租金": "Rent", "成员身份证": "Member ID", "房屋编号": "Room ID", "家庭成员": "Room Member", "房屋备注": "Room Notes", "房屋状态": "Room Status", "修改房屋": "Modify Room", "停车费用": "Parking Fees", "退房": "Check out", "身份证": "ID card", "房屋费用": "Housing cost", "性别": "Gender", "房屋面积": "Housing area", "报修单": "repair report", "更多操作": "more operations", "业主编号": "owner number", "成员手机号": "member phone number", "合同号": "contract number", "房屋号": "Room Number", "修改业主": "Modify Owner", "户型": "Unit Type", "补打收据": "Receipt for reprinting", "车牌号": "License plate number", "成员姓名": "Member name" },
+        "simplifyAcceptance": { "请输入业主车牌号": "Please enter the owner's license plate number", "请输入业主身份证": "Please enter owner ID", "请输入业主手机号": "Please enter the owner's mobile number", "请输入业主名称": "Please enter owner name", "请输入房屋编号 楼栋-单元-房屋 如1-1-1": "Please enter the house number Building-Unit-House Such as 1-1-1", "绑定记录": "Binding Record", "投诉单": "Complaint Form", "室内面积": "Indoor Area", "门禁同步": "Access Control Synchronization", "道闸同步": "Barrier synchronization", "业主身份证": "Owner ID card", "业主姓名": "Owner name", "房屋类型": "Room type", "查询": "Inquiry", "抄表记录": "Meter reading record", "商铺号": "Shop No.", "交房": "Delivery room", "入住日期": "Check-in date", "业主备注": "Ownerremarks", "选择房屋": "select Room", "业主名称": "owner name", "业主合同": "owner contract", "联系电话": "contact number", "商铺编号": "shop number", "车辆信息": "Vehicle", "业主电话": "Owner Phone", "租金": "Rent", "成员身份证": "Member ID", "房屋编号": "Room ID", "家庭成员": "Room Member", "房屋备注": "Room Notes", "房屋状态": "Room Status", "修改房屋": "Modify Room", "停车费用": "Parking Fees", "退房": "Check out", "身份证": "ID card", "房屋费用": "Housing cost", "性别": "Gender", "房屋面积": "Housing area", "报修单": "repair report", "更多操作": "more operations", "业主编号": "owner number", "成员手机号": "member phone number", "合同号": "contract number", "房屋号": "Room Number", "修改业主": "Modify Owner", "户型": "Unit Type", "补打收据": "Receipt for reprinting", "车牌号": "License plate number", "成员姓名": "Member name" },
         "carAddParkingSpace": { "起租时间": "Rental time", "结租时间": "Rental closing time", "请填写备注信息": "Please fill in the remark", "提交": "Submit", "车牌号": "License plate number", "车辆信息": "vehicle", "备注": "remarks", "必填": "required" },
         "machineManage": { "操作": "operation", "开门": "opening", "状态": "status", "查询条件": "query condition", "心跳时间": "heartbeat time", "设备信息": "device", "请选择设备类型": "please select a device type", "添加设备": "Add device", "查询": "Inquiry", "请输入设备": "Please input device", "设备编码": "Device code", "设备名称": "Device name", "时间": "time", "请输入设备名称": "please enter the device name", "设备位置": "device location", "方向": "direction", "请输入设备编码": "please enter the device code", "变更": "change", "修改设备": "modify device", "删除设备": "delete device", "设备类型": "device type", "重启设备": "reboot device" },
         "parkingBoxManage": { "是否收费": "Whether to charge", "控制台": "Console", "修改": "Modify", "操作": "Operation", "查询条件": "Query condition", "否": "No", "临时车进场": "Temporary Car Entry", "共享岗亭": "Shared Post Box", "备注": "Remarks", "岗亭信息": "Post Box", "删除": "delete", "是": "yes", "停车场": "parking lot", "查询": "inquiry", "请选择临时车进场": "please select a temporary car to enter", "岗亭名称": "postbox name", "黄牌车进场": "yellow license vehicle approaching", "请输入岗亭名称": "please enter the postbox name", "请输入岗亭编号": "please input Post Box Number", "岗亭编号": "Post Box Number", "蓝牌车进场": "Blue car entering the field" },
@@ -591,7 +591,6 @@
         "editTempCarFeeConfig": { "电动车": "Electric Vehicle", "修改标准": "Modify Standard", "开始时间": "Start Time", "标准名称": "Standard Name", "三轮车": " Tricycle", "取消": "Cancel", "车辆类型": "Vehicle Type", "必填": "Required", "收费规则": "Charging Rules", "结束时间": "End Time", "家用小汽车": "family car", "停车场": "parking lot" },
         "deletePrivilegeGroup": { "请确认您的操作": "Please confirm your operation", "删除权限组同时会删除权限组下的所有权限": "Deleting a privilege group will also delete all privileges under the privilege group", "点错了": "Wrong click", "确认删除": "Confirm delete" },
         "addInspectionItem": { "选填": "optional", "添加": "add", "取消": "cancel", "备注": "remark", "巡检项目": "inspection item", "必填": "required" },
-        "indexArrears": { "待办已办": "Todo done" },
         "simplifyOwnerAccessContol": { "设备编码": "device code", "指令": "command", "设备名称": "device name", "对象名称": "object name", "同步时间": "sync time", "操作": "action", "重新同步": "resync", "对象类型": "object type", "状态": "status", "说明": "description" },
         "applyRoomDiscountRecord": { "房屋": "house", "上传图片": "upload image", "上传视频": "upload video", "状态": "status", "否": "no", "备注": "Remarks", "请填写备注": "Please fill in the remarks", "验房跟踪": "Home Inspection Tracking", "必填": "Required", "请选择是否违规": "Please select whether Violation", "是否违规": "Is a violation", "是": "Yes" },
         "addBusinessDatabus": { "业务类型": "business type", "适配器": "adapter", "状态": "status", "停用": "deactivated", "顺序": "sequence", "添加": "add", "名称": "name", "在用": "in use", "必填": "required" },