Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -830,5 +830,155 @@
   "projectclassificationlaborosttatistics": "Project classification labor cost statistics",
   "projectmanhourcoststatistics": "Project labor cost statistics",
   "statistical": "statistics",
-  "zong-ji": "total"
+  "zong-ji": "total",
+  "businesstriisallowed": "business trip report",
+  "businesstriplist": "business trip list",
+  "businessstatistics": "travel statistics",
+  "mbusinesstrip": "my business trip",
+  "businesstriApprovalProcess": "Travel approval process",
+  "travelreason": "business trip",
+  "car": "car",
+  "departurecity": "departure city",
+  "destinationcity": "destination city",
+  "plane": "airplane",
+  "ship": "ship",
+  "traffictools": "Transportation",
+  "train": "train",
+  "roundtrip": "One way round trip",
+  "backandforth": "round trip",
+  "oneway": "One Way",
+  "automaticcalculation": "Automatic calculation",
+  "businessstate": "business trip status",
+  "morethantendays": "more than 10 days",
+  "pleaseselectbusinesstraveler": "Please select a traveler",
+  "traveldays": "business trip days",
+  "travelnote": "business trip notes",
+  "businesspersonnel": "Traveler",
+  "detailsbusinessrip": "Business trip details",
+  "trip": "journey",
+  "applytime": "application time",
+  "endtimeofbusinesstrip": "business trip end time",
+  "starttimeofbusinessrip": "business trip start time",
+  "nostatisticsonbusinesstripsatpresent": "No travel statistics",
+  "approvalprocessforbusiness": "Business trip approval process for direct staff",
+  "cumulativebusinesstripdays": "Cumulative travel days",
+  "projectLeader": "Project manager",
+  "onewayroundtrip": "One way round trip",
+  "projectAssociationInformation": "Project related information",
+  "rselatedprojects": "Associated project",
+  "addinganAssociatedItem": "Add related items",
+  "addedormodifiedassociateditems": "Add/Modify Associated Items",
+  "synchronizationperiodfromstaplecannotexceedsevendays": "Sync from DingTalk The time period cannot exceed seven days",
+  "saelectdestinationcity": "Please select destination city",
+  "selectanendtime": "Please select an end time",
+  "selectastarttime": "Please select a start time",
+  "selectyourdeparturecity": "Please select the departure city",
+  "synchronous": "Synchronize",
+  "yourbusinesstrip": "Please enter the reason for your business trip",
+  "projectassociate": "Please select an item to link",
+  "selectaenddate": "Please select an end date",
+  "selectastartdate": "Please select a start date",
+  "cannotbesynchronized": "The time period for synchronizing messages from DingTalk cannot exceed seven days",
+  "tripStatistics": "Business trip statistics export",
+  "applicationissuccessful": "Successful application",
+  "Immediatelyadd": "Add it now",
+  "addingroles": "Add role",
+  "pleaseenterakeyworforquery": "Please enter a keyword query",
+  "roleauthorization": "Role Permissions",
+  "jiao-se": "Role",
+  "mo-ren-jiao-se": "- (default role)",
+  "modifyingDefaultRole": "Modify the default role",
+  "Immediatelychange": "Edit now",
+  "assignpermissions": "assign permissions",
+  "editingtherole": "edit role",
+  "exportpermission": "export permission",
+  "administratorcannotbeedited": "The super administrator is a fixed default role and cannot be edited",
+  "charactername": "Role Name",
+  "defaultrole": "default role",
+  "defaultroleforimportingpeople": "* Set default roles when importing people",
+  "gong-neng": "Function",
+  "operationwilldelete": "This action will delete",
+  "quanxianshuju": "Permissions Data Sheet",
+  "shifujuxu": "role, continue?",
+  "employeehourlywage": "Employee hourly wage entry method settings",
+  "methodsa": "Method 1: Enter the monthly cost and automatically calculate the hourly salary",
+  "suitableforfulltimeemployees": "(Suitable for full-time corporate employees)",
+  "dailyworkinghours": "Normal working hours per day",
+  "workingdayspermonth": "Average working days per month",
+  "hoursreporteperday": "Lock the upper limit of daily reporting hours",
+  "imitillingtime": "Fill in the time limit",
+  "lockingworkinghours": "Lock working hours",
+  "chargedtocost": "Overtime hours charged to cost",
+  "hourscanbereported": "Reportable overtime hours",
+  "workSettings": "Overtime settings",
+  "bei-gong-zi": "double salary",
+  "employeeworkinghours": "Employee working hours reporting method settings",
+  "reportintheafternoon": "All day/morning/afternoon convenient reporting",
+  "settheduration": "Please set the duration",
+  "timeemployees": "(Suitable for hourly workers and part-time workers who are paid on time)",
+  "visittwo": "Method 2: Enter the hourly salary directly",
+  "addTian": "Add to",
+  "afternoontime": "afternoon time",
+  "chooseyourownhours": "Choose your own working hours",
+  "daylong": "full day",
+  "filledinadvance": "Can be filled in in advance",
+  "filltime": "fill time",
+  "instructions": "(Note: The system administrator is not limited by the filling time when filling out the daily report for the employee)",
+  "missingfill": "Daily reminder missed filling on the day",
+  "missingfills": "Daily reminder missed yesterday",
+  "morningtime": "morning time",
+  "owntimeframe": "Choose your own time frame",
+  "personneltoset": "Don't remind people settings",
+  "pointintime": "any point in time",
+  "reminderSettings": "Fill in the reminder settings",
+  "remindermethod": "Please select a reminder method",
+  "remindertext": "reminder text",
+  "remindertime": "reminder time",
+  "settingrestPeriod": "Set a break time period",
+  "showthesample": "Show example",
+  "timeproportionally": "Prorated time",
+  "timesetting": "Employee fill in daily report time setting",
+  "dailyreview": "Daily automatic review time limit:",
+  "dang-tian": "the day",
+  "dyas": "diva",
+  "oneday": "the next day",
+  "shreeday": "day three",
+  "timelydate": "Employee fills out the date and time",
+  "afteritisenabled": "After opening, the system can classify the labor cost according to the field data.",
+  "dailyfilling": "Custom Daily Filling List",
+  "datamaintenance": "data maintenance",
+  "fieldnames": "Field Name",
+  "parametermandatory": "Is it required",
+  "dailyfillingvalue": "Custom daily report value",
+  "afterthisunctionisenabled": "After opening, the value can be counted by project, department and person",
+  "additionalinformation": "After opening, employees can fill in additional information",
+  "eachdepartment": "The reviewer is the direct leader of each department",
+  "fillingtext": "Custom daily report text",
+  "importauditing": "Whether to enable import auditing",
+  "maintenanceDatalist": "Maintain data list",
+  "maximum": "maximum value",
+  "maximumvaluelimit": "Whether to enable the maximum limit",
+  "addData": "Add data",
+  "xin-zeng-shi-jian-duan": "Add time period",
+  "xiu-gai": "Revise",
+  "keywordfiltering": "Enter keywords to filter",
+  "canbefilled": "Only fill in the current month",
+  "donlimit": "not limited",
+  "lastlastmonth": "Can be filled up to the previous month",
+  "lastmonth": "Can be filled up to last month",
+  "newspaperwithin": "Daily newspapers can be filled within 7 days",
+  "previousdaydaily": "You can fill in the daily newspaper 1 day before",
+  "afternoonworkinghours": "Please enter the working hours in the afternoon",
+  "dayworkinghours": "Please select full working hours",
+  "morningworkinghours": "Please enter the working hours in the morning",
+  "addsuccessful": "Added successfully",
+  "cannotbedeleted": "This data is in use and cannot be deleted",
+  "customDailyFillingList": "Please enter the field name of [Custom Daily Filling List]",
+  "customDailyFillingLists": "Please enter the field name of [Custom Daily Report Value]",
+  "customDailyFillingListss": "Please enter the field name of [Custom Daily Filling Text]",
+  "overtimepay": "Please set several times the salary for overtime",
+  "qing-xuan-ze-shi-jian-duan": "Please select a time period",
+  "shu-ju-ma": "data?",
+  "takethisone": "sure you want this",
+  "wu-fa-shan-chu-1": "Can't delete 1"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -830,5 +830,155 @@
   "departmenthourscoststatistics": "部门工时成本统计",
   "statistical": "统计",
   "otalhourscost": "工时成本总计",
-  "zong-ji": "总计"
+  "zong-ji": "总计",
+  "businesstriisallowed": "出差填报",
+  "businesstriplist": "出差列表",
+  "mbusinesstrip": "我的出差",
+  "businessstatistics": "出差统计",
+  "businesstriApprovalProcess": "出差审批流程",
+  "travelreason": "出差事由",
+  "traffictools": "交通工具",
+  "plane": "飞机",
+  "train": "火车",
+  "car": "汽车",
+  "ship": "轮船",
+  "departurecity": "出发城市",
+  "destinationcity": "目的城市",
+  "roundtrip": "单程往返",
+  "oneway": "单程",
+  "backandforth": "往返",
+  "traveldays": "出差天数",
+  "automaticcalculation": "自动计算",
+  "travelnote": "出差备注",
+  "pleaseselectbusinesstraveler": "请选择出差人员",
+  "businessstate": "出差状态",
+  "morethantendays": "10天以上",
+  "businesspersonnel": "出差人员",
+  "detailsbusinessrip": "出差详情",
+  "trip": "行程",
+  "applytime": "申请时间",
+  "starttimeofbusinessrip": "出差开始时间",
+  "endtimeofbusinesstrip": "出差结束时间",
+  "nostatisticsonbusinesstripsatpresent": "暂无出差统计",
+  "cumulativebusinesstripdays": "累计出差天数",
+  "approvalprocessforbusiness": "直属人员出差审批流程",
+  "projectLeader": "项目负责人",
+  "onewayroundtrip": "单程/往返",
+  "projectAssociationInformation": "项目关联信息",
+  "rselatedprojects": "关联项目",
+  "addinganAssociatedItem": "新增关联项目",
+  "addedormodifiedassociateditems": "新增/修改关联项目",
+  "synchronizationperiodfromstaplecannotexceedsevendays": "从钉钉同步 时间段不能超过七天",
+  "synchronous": "同步",
+  "yourbusinesstrip": "请输入出差事由",
+  "selectyourdeparturecity": "请选择出发城市",
+  "saelectdestinationcity": "请选择目的城市",
+  "selectastarttime": "请选择开始时间",
+  "selectanendtime": "请选择结束时间",
+  "selectastartdate": "请选择开始日期",
+  "selectaenddate": "请选择结束日期",
+  "projectassociate": "请选择要关联的项目",
+  "tripStatistics": "出差统计导出",
+  "cannotbesynchronized": "从钉钉同步消息时间段不能超过七天",
+  "applicationissuccessful": "申请成功",
+  "roleauthorization": "角色权限",
+  "pleaseenterakeyworforquery": "请输入关键字查询",
+  "addingroles": "添加角色",
+  "Immediatelyadd": "立即添加",
+  "modifyingDefaultRole": "修改默认角色",
+  "jiao-se": "角色",
+  "mo-ren-jiao-se": "- (默认角色)",
+  "editingtherole": "编辑角色",
+  "Immediatelychange": "立即修改",
+  "assignpermissions": "分配权限",
+  "exportpermission": "导出权限",
+  "gong-neng": "功能",
+  "charactername": "角色名称",
+  "defaultrole": "默认角色",
+  "defaultroleforimportingpeople": "*设置导入人员时的默认角色",
+  "administratorcannotbeedited": "超级管理员为固定的默认角色无法编辑",
+  "operationwilldelete": "此操作将删除",
+  "shifujuxu": "角色, 是否继续?",
+  "quanxianshuju": "权限数据表",
+  "employeehourlywage": "员工时薪录入方式设置",
+  "methodsa": "方式一: 录入月成本，自动计算时薪",
+  "suitableforfulltimeemployees": "(适合企业全职员工)",
+  "workingdayspermonth": "平均每月工作天数",
+  "dailyworkinghours": "每日正常工作时长",
+  "lockingworkinghours": "锁定工作时长",
+  "hoursreporteperday": "锁定每日填报工时的上限",
+  "imitillingtime": "填报时长上限",
+  "workSettings": "加班设置",
+  "hourscanbereported": "可填报加班时长",
+  "chargedtocost": "加班工时记入成本",
+  "bei-gong-zi": "倍工资",
+  "visittwo": "方式二：直接录入时薪",
+  "timeemployees": "(适合计时发放酬劳的小时工，兼职员工)",
+  "employeeworkinghours": "员工工作时长上报方式设置",
+  "reportintheafternoon": "全天/上午/下午便捷上报",
+  "settheduration": "请设置时长",
+  "daylong": "全天时长",
+  "morningtime": "上午时长",
+  "afternoontime": "下午时长",
+  "chooseyourownhours": "自行选择工作时长",
+  "showthesample": "展示样例",
+  "owntimeframe": "自行选择时间范围",
+  "pointintime": "任意时间点",
+  "settingrestPeriod": "设置休息时间段",
+  "timeproportionally": "按比例分配时间",
+  "reminderSettings": "填报提醒设置",
+  "remindertime": "提醒时间",
+  "remindermethod": "请选择提醒方式",
+  "missingfill": "每日提醒当天漏填",
+  "missingfills": "每日提醒昨天漏填",
+  "remindertext": "提醒文本",
+  "personneltoset": "不提醒人员设置",
+  "addTian": "添加",
+  "timesetting": "员工填报日报时间设置",
+  "filltime": "补填时间",
+  "instructions": "(说明：系统管理员为员工代填日报时不受补填时间的限制)",
+  "filledinadvance": "可提前填报",
+  "timelydate": "员工填报及时日",
+  "dang-tian": "当天",
+  "oneday": "第二天",
+  "shreeday": "第三天",
+  "dailyreview": "日报自动审核时限：",
+  "dyas": "天后",
+  "dailyfilling": "自定义日报填报列表",
+  "afteritisenabled": "开启后系统可按该字段数据进行分类统计工时成本",
+  "parametermandatory": "是否为必填项",
+  "fieldnames": "字段名称",
+  "datamaintenance": "数据维护",
+  "dailyfillingvalue": "自定义日报填报数值",
+  "afterthisunctionisenabled": "开启后可按项目，部门和人员统计该数值",
+  "maximumvaluelimit": "是否开启最大值限制",
+  "maximum": "最大值",
+  "fillingtext": "自定义日报填报文本",
+  "additionalinformation": "开启后可员工可额外填写该信息",
+  "importauditing": "是否开启导入审核",
+  "eachdepartment": "审核人为各部门直属领导",
+  "maintenanceDatalist": "维护数据列表",
+  "addData": "新增数据",
+  "xin-zeng-shi-jian-duan": "新增时间段",
+  "xiu-gai": "修改",
+  "keywordfiltering": "输入关键字进行过滤",
+  "donlimit": "不限制",
+  "canbefilled": "仅可补填当月",
+  "lastmonth": "可补填到上个月",
+  "lastlastmonth": "可补填到上上月",
+  "newspaperwithin": "可补填7天内日报",
+  "previousdaydaily": "可补填前1天日报",
+  "dayworkinghours": "请选择全天工作时长",
+  "morningworkinghours": "请输入上午工作时长",
+  "afternoonworkinghours": "请输入下午工作时长",
+  "qing-xuan-ze-shi-jian-duan": "请选择时间段",
+  "takethisone": "确定要这条",
+  "shu-ju-ma": "数据吗?",
+  "wu-fa-shan-chu-1": "无法删除1",
+  "cannotbedeleted": "该数据正在使用，无法删除",
+  "addsuccessful": "添加成功",
+  "customDailyFillingList": "请输入[自定义日报填报列表]的字段名称",
+  "customDailyFillingLists": "请输入[自定义日报填报数值]的字段名称",
+  "customDailyFillingListss": "请输入[自定义日报填报文本]的字段名称",
+  "overtimepay": "请设置加班几倍工资"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -1,37 +1,37 @@
 <template>
 <section>
     <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff" v-if="!isDingding">
-        <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>出差管理</h3>
+        <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>{{ $t('navigation.evectionManagement') }}</h3>
         <el-divider ></el-divider>
         <el-col :span="12">
             <el-menu default-active="1" class="el-menu-vertical-demo" @select="staffs" background-color="#ffffff" text-color="#666666" active-text-color="#20A0FF" style="width:100%">
                 <el-menu-item index="1" v-if="permissions.awayOfficeFil">
                     <i class="iconfont firerock-icontianbao"></i>
-                    <span slot="title">出差填报</span>
+                    <span slot="title">{{ $t('businesstriisallowed') }}</span>
                 </el-menu-item>
                 <el-submenu index="2" v-if="permissions.awayOfficeAll">
                     <template slot="title">
                         <i class="iconfont firerock-iconbaoxiaodan"></i>
-                        <span>{{"出差列表"}}</span>
+                        <span>{{ $t('businesstriplist') }}</span>
                     </template>
                     <!-- 导航切换 -->
-                    <el-menu-item index="2-1" v-if="permissions.awayOfficeAll"><p @click="bills(false, 2)">全部</p></el-menu-item>
-                    <el-menu-item index="2-2" v-if="permissions.awayOfficeAudit && !isDingding"><p @click="bills(true, 1)">待审核</p></el-menu-item>
+                    <el-menu-item index="2-1" v-if="permissions.awayOfficeAll"><p @click="bills(false, 2)">{{ $t('all') }}</p></el-menu-item>
+                    <el-menu-item index="2-2" v-if="permissions.awayOfficeAudit && !isDingding"><p @click="bills(true, 1)">{{ $t('state.WaitingAudit') }}</p></el-menu-item>
                 </el-submenu>
                 <el-menu-item index="3" @click="bills(false, 2)" v-if="!permissions.awayOfficeAll">
                     <i class="iconfont firerock-iconbaoxiaodan"></i>
-                    <span slot="title">我的出差</span>
+                    <span slot="title">{{ $t('mbusinesstrip') }}</span>
                 </el-menu-item>
                 <el-menu-item index="4" v-if="permissions.awayOfficeStatistical">
                     <template slot="title">
                         <i class="iconfont firerock-icontianbao"></i>
-                        <span slot="title">出差统计</span>
+                        <span slot="title">{{ $t('businessstatistics') }}</span>
                     </template>
                 </el-menu-item>
                 <el-menu-item index="5" v-if="permissions.awayOfficeProcess">
                     <template slot="title">
                         <i class="iconfont firerock-iconliucheng"></i>
-                        <span slot="title">出差审批流程</span>
+                        <span slot="title">{{ $t('businesstriApprovalProcess') }}</span>
                     </template>
                 </el-menu-item>
             </el-menu>
@@ -40,19 +40,19 @@
 
     <div class="contents">
         <div ref="headine" class="headine" v-if="!displayTable">
-        <h3 ref="headHe" style="padding-left: 220px">出差填报</h3>
+        <h3 ref="headHe" style="padding-left: 220px">{{ $t('businesstriisallowed') }}</h3>
         </div>
         <!-- 出差填报 -->
         <div class="tops" v-if="!displayTable && apk == 0">
             <div class="ctons">
                 <el-form ref="addformAO" v-loading="formloading" :model="addform" label-width="80px" :rules="formrules" style="width:700px">
                     <!-- 出差事由 -->
-                    <el-form-item label="出差事由" prop="reason" style="width:100%">
+                    <el-form-item :label="$t('travelreason')" prop="reason" style="width:100%">
                         <el-input v-model="addform.reason" style="width: 555px" maxlength="25" type="text" show-word-limit></el-input>
                     </el-form-item>
                     <!-- 维度选择添加 -->
-                        <el-form-item label="投入项目" style="width:300px;margin-right:30px" prop="projectId">
-                            <el-select style="width:100%" @change="getwuduList(1)" v-model="addform.projectId" filterable clearable placeholder="请选择投入项目" >
+                        <el-form-item :label="$t('screening.inputProject')" style="width:300px;margin-right:30px" prop="projectId">
+                            <el-select style="width:100%" @change="getwuduList(1)" v-model="addform.projectId" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                                 <el-option
                                 v-for="item in projectList"
                                 :key="item.id"
@@ -65,7 +65,7 @@
                         v-if="addform.projectId != null && wuduData.customDegreeActive == 1"
                         style="width:300px;margin-right:30px"
                         prop="degreeId">
-                            <el-select style="width:100%" v-model="addform.degreeId" filterable clearable placeholder="请选择" >
+                            <el-select style="width:100%" v-model="addform.degreeId" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                                 <el-option
                                 v-for="item in wuduList"
                                 :key="item.id"
@@ -76,18 +76,18 @@
                         </el-form-item>
                         <!-- <span>行程</span> -->
                         <!-- 交通工具 -->
-                        <el-form-item label="交通工具" style="width:100%">
+                        <el-form-item :label="$t('traffictools')" style="width:100%">
                             <el-radio-group v-model="addform.way">
-                                <el-radio :label="0">飞机</el-radio>
-                                <el-radio :label="1">火车</el-radio>
-                                <el-radio :label="2">汽车</el-radio>
-                                <el-radio :label="3">轮船</el-radio>
-                                <el-radio :label="4">其他</el-radio>
+                                <el-radio :label="0">{{ $t('plane') }}</el-radio>
+                                <el-radio :label="1">{{ $t('train') }}</el-radio>
+                                <el-radio :label="2">{{ $t('car') }}</el-radio>
+                                <el-radio :label="3">{{ $t('ship') }}</el-radio>
+                                <el-radio :label="4">{{ $t('leave.other') }}</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <!-- 出发城市 -->
-                        <el-form-item label="出发城市" style="width:300px;margin-right:30px" prop="cityFrom">
-                            <el-select style="width:100%" v-model="addform.cityFrom" filterable clearable placeholder="请选择出发城市" >
+                        <el-form-item :label="$t('departurecity')" style="width:300px;margin-right:30px" prop="cityFrom">
+                            <el-select style="width:100%" v-model="addform.cityFrom" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                                 <el-option
                                 v-for="item in cityList"
                                 :key="item.value"
@@ -97,8 +97,8 @@
                             </el-select>
                         </el-form-item>
                         <!-- 目的城市 -->
-                        <el-form-item label="目的城市" style="width:300px" prop="cityTo">
-                            <el-select style="width:100%" v-model="addform.cityTo" filterable clearable placeholder="请选择目的城市">
+                        <el-form-item :label="$t('destinationcity')" style="width:300px" prop="cityTo">
+                            <el-select style="width:100%" v-model="addform.cityTo" filterable clearable :placeholder="$t('defaultText.pleaseChoose')">
                                 <el-option
                                 v-for="item in cityList"
                                 :key="item.value"
@@ -108,10 +108,10 @@
                             </el-select>
                         </el-form-item>
                         <!-- 开始时间 -->
-                        <el-form-item label="开始时间" style="width:300px;margin-right:30px" prop="startDate">
+                        <el-form-item :label="$t('starttimes')" style="width:300px;margin-right:30px" prop="startDate">
                             <el-date-picker
                             type="date"
-                            placeholder="开始日期"
+                            :placeholder="$t('time.startDate')"
                             value-format="yyyy-MM-dd"
                             v-model="addform.startDate"
                             style="width:100%"
@@ -119,10 +119,10 @@
                             </el-date-picker>
                         </el-form-item>
                         <!-- 结束时间 -->
-                        <el-form-item label="结束时间" style="width:300px" prop="endDate">
+                        <el-form-item :label="$t('time.endTime')" style="width:300px" prop="endDate">
                             <el-date-picker
                             type="date"
-                            placeholder="结束日期"
+                            :placeholder="$t('time.endDate')"
                             value-format="yyyy-MM-dd"
                             v-model="addform.endDate"
                             style="width:100%"
@@ -130,24 +130,24 @@
                             </el-date-picker>
                         </el-form-item>
                         <!-- 单程/往返 -->
-                        <el-form-item label="单程往返" style="width:300px;margin-right:30px">
+                        <el-form-item :label="$t('roundtrip')" style="width:300px;margin-right:30px">
                             <el-radio-group v-model="addform.goBack">
-                                <el-radio :label="0">单程</el-radio>
-                                <el-radio :label="1">往返</el-radio>
+                                <el-radio :label="0">{{ $t('oneway') }}</el-radio>
+                                <el-radio :label="1">{{ $t('backandforth') }}</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <!-- 出差天数 -->
-                        <el-form-item label="出差天数" style="width:300px">
-                            <el-input type="number" placeholder="自动计算" v-model="addform.dayCount" min="0" style="width:100%"></el-input>
+                        <el-form-item :label="$t('traveldays')" style="width:300px">
+                            <el-input type="number" :placeholder="$t('automaticcalculation')" v-model="addform.dayCount" min="0" style="width:100%"></el-input>
                         </el-form-item>
                         <!-- 出差备注 -->
-                        <el-form-item label="出差备注" style="width:635px">
+                        <el-form-item :label="$t('travelnote')" style="width:635px">
                             <el-input type="textarea" v-model="addform.remark" :rows="3" style="width: 100%" maxlength="100" show-word-limit></el-input>
                         </el-form-item>
                 </el-form>
                 <div>
                     <p style="width:635px;text-align:center;">
-                        <el-button type="primary" @click="formsubmit('formrules')" size="mini">提交</el-button>
+                        <el-button type="primary" @click="formsubmit('formrules')" size="mini">{{ $t('btn.submit') }}</el-button>
                     </p>
                 </div>
             </div>
@@ -157,7 +157,7 @@
             <div class="ctons">
         <!-- 出差列表筛选 -->
                 <div class="flex">
-                    <div><el-select v-model="ownerIds" placeholder="请选择出差人员" clearable @change="billss(1)" style="width: 140px" size="small" filterable="true">
+                    <div><el-select v-model="ownerIds" :placeholder="$t('pleaseselectbusinesstraveler')" clearable @change="billss(1)" style="width: 140px" size="small" filterable="true">
                             <el-option
                             v-for="item in users"
                             :key="item.id"
@@ -165,55 +165,55 @@
                             :value="item.id">
                             </el-option>
                     </el-select></div>
-                    <div><span style="color: #606266">交通工具</span>
-                        <el-select v-model="type" placeholder="请选择交通工具" clearable @change="billss(1)" style="width: 140px;" size="small" filterable="true">
-                            <el-option label="飞机" :value="0"></el-option>
-                            <el-option label="火车" :value="1"></el-option>
-                            <el-option label="汽车" :value="2"></el-option>
-                            <el-option label="轮船" :value="3"></el-option>
-                            <el-option label="其他" :value="4"></el-option>
+                    <div><span style="color: #606266">{{ $t('traffictools') }}</span>
+                        <el-select v-model="type" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="billss(1)" style="width: 140px;" size="small" filterable="true">
+                            <el-option :label="$t('plane')" :value="0"></el-option>
+                            <el-option :label="$t('train')" :value="1"></el-option>
+                            <el-option :label="$t('car')" :value="2"></el-option>
+                            <el-option :label="$t('ship')" :value="3"></el-option>
+                            <el-option :label="$t('leave.other')" :value="4"></el-option>
                         </el-select>
                     </div>
-                    <div><span style="color: #606266">出差状态</span>
-                        <el-select :disabled="falg" v-model="code" placeholder="请选择出差状态" clearable @change="billss(1)" size="small" style="width: 140px" filterable="true">
-                            <el-option label="审核通过" :value="0"></el-option>
-                            <el-option label="待审核" :value="1"></el-option>
-                            <el-option label="驳回" :value="2"></el-option>
-                            <el-option label="已撤销" :value="3"></el-option>
+                    <div><span style="color: #606266">{{ $t('businessstate') }}</span>
+                        <el-select :disabled="falg" v-model="code" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="billss(1)" size="small" style="width: 140px" filterable="true">
+                            <el-option :label="$t('state.approved')" :value="0"></el-option>
+                            <el-option :label="$t('state.WaitingAudit')" :value="1"></el-option>
+                            <el-option :label="$t('btn.rejected')" :value="2"></el-option>
+                            <el-option :label="$t('state.undone')" :value="3"></el-option>
                         </el-select>
                         
                     </div>
-                    <div><span style="color: #606266">时间段</span>
-                        <el-date-picker v-model="createDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="billss(1)" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable style="width:280px"></el-date-picker>
+                    <div><span style="color: #606266">{{ $t('message.period') }}</span>
+                        <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="billss(1)" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px"></el-date-picker>
                     </div>
                     <div style="line-height: 32px;margin: 0 20px;">
-                        <el-checkbox v-model="isOverTendays" @change="checkboxChange">10天以上</el-checkbox>
+                        <el-checkbox v-model="isOverTendays" @change="checkboxChange">{{ $t('morethantendays') }}</el-checkbox>
                     </div>
                     <!-- 从钉钉同步按钮,只有钉钉的用户并且有查看全部权限的管理员才有同步按钮 -->
                     <div style="margin: 0 0 0 20px" v-if="userComLis.dingdingUserid != null && permissions.awayOfficeAll">
-                        <el-button size="small" type="primary" @click="dingdingClick()" >从钉钉同步</el-button>
+                        <el-button size="small" type="primary" @click="dingdingClick()" >{{ $t('synchronizefromStaple') }}</el-button>
                     </div>
                     <div style="margin: 0 0 0 20px" v-if="userComLis.dingdingUserid != null">
-                        <el-button size="small" type="primary" @click="dingdingListExport()" >导出</el-button>
+                        <el-button size="small" type="primary" @click="dingdingListExport()" >{{ $t('export.export') }}</el-button>
                     </div>
                 </div>
         <!-- 出差列表 -->
                 <el-table :data="tableList" style="width: 100%" height="90%" :loading="tableListLoading">
-                    <el-table-column prop="ownerName" label="出差人员" width="100" fixed="left" align="center">
+                    <el-table-column prop="ownerName" :label="$t('businesspersonnel')" width="100" fixed="left" align="center">
                         <template slot-scope="scope">
                             <span :style="scope.row.dayCount >= 10 ? 'color:#e62412' : ''">{{scope.row.ownerName}}</span>
                         </template>
                     </el-table-column>
                     <!-- <el-table-column prop="reason" label="出差事由" width="150" header-align="center"></el-table-column> -->
-                    <el-table-column label="出差天数" width="120" align="center">
+                    <el-table-column :label="$t('traveldays')" width="120" align="center">
                         <template slot-scope="scope">
-                            <div><span :style="scope.row.dayCount >= 10 ? 'color:#e62412' : ''">{{scope.row.dayCount}}天</span></div>
+                            <div><span :style="scope.row.dayCount >= 10 ? 'color:#e62412' : ''">{{scope.row.dayCount}}{{ $t('time.day') }}</span></div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="出差详情" width="600" align="center">
+                    <el-table-column :label="$t('detailsbusinessrip')" width="600" align="center">
                         <template slot-scope="scope">
                             <div v-for="item in scope.row.projectList" :key="item.projectId" class="detailsScope">
-                                <span>{{item.startDate + '至' + item.endDate}}</span><span>{{item.projectName}}</span><span>{{item.degreeName}}</span>
+                                <span>{{item.startDate + $t('other.to') + item.endDate}}</span><span>{{item.projectName}}</span><span>{{item.degreeName}}</span>
                             </div>
                         </template>
                     </el-table-column>
@@ -222,38 +222,38 @@
                             <span v-for="item in scope.row.projectList" :key="item.projectId">{{item.degreeName == null ? '' : item.degreeName + '\u3000'}}</span>
                         </template>
                     </el-table-column> -->
-                    <el-table-column label="交通工具" width="120" align="center">
+                    <el-table-column :label="$t('traffictools')" width="120" align="center">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.way == 0">飞机</span>
-                            <span v-if="scope.row.way == 1">火车</span>
-                            <span v-if="scope.row.way == 2">汽车</span>
-                            <span v-if="scope.row.way == 3">轮船</span>
-                            <span v-if="scope.row.way == 4">其他</span>
+                            <span v-if="scope.row.way == 0">{{ $t('plane') }}</span>
+                            <span v-if="scope.row.way == 1">{{ $t('train') }}</span>
+                            <span v-if="scope.row.way == 2">{{ $t('car') }}</span>
+                            <span v-if="scope.row.way == 3">{{ $t('ship') }}</span>
+                            <span v-if="scope.row.way == 4">{{ $t('leave.other') }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="行程" width="120" align="center" v-if="!isDingding">
+                    <el-table-column :label="$t('trip')" width="120" align="center" v-if="!isDingding">
                         <template slot-scope="scope">{{scope.row.cityFrom + '-' + scope.row.cityTo}}</template>
                     </el-table-column>
-                    <el-table-column prop="indate" label="申请时间" width="150" align="center" v-if="!isDingding"></el-table-column>
+                    <el-table-column prop="indate" :label="$t('applytime')" width="150" align="center" v-if="!isDingding"></el-table-column>
                     
-                    <el-table-column prop="startDate" label="出差开始时间" width="150"></el-table-column>
-                    <el-table-column prop="endDate" label="出差结束时间" width="150"></el-table-column>
-                    <el-table-column prop="status" label="状态" width="100">
+                    <el-table-column prop="startDate" :label="$t('starttimeofbusinessrip')" width="150"></el-table-column>
+                    <el-table-column prop="endDate" :label="$t('endtimeofbusinesstrip')" width="150"></el-table-column>
+                    <el-table-column prop="status" :label="$t('state.states')" width="100">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.status == 0">审核通过</span>
-                            <span v-if="scope.row.status == 1" style="color: orange">待审核</span>
-                            <span v-if="scope.row.status == 2" style="color: red">驳回</span>
-                            <span v-if="scope.row.status == 3" style="color: #666666">撤销</span>
+                            <span v-if="scope.row.status == 0">{{ $t('state.approved') }}</span>
+                            <span v-if="scope.row.status == 1" style="color: orange">{{ $t('state.WaitingAudit') }}</span>
+                            <span v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}</span>
+                            <span v-if="scope.row.status == 3" style="color: #666666">{{ $t('btn.undo') }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="remark" label="备注" width="200">
+                    <el-table-column prop="remark" :label="$t('bei-zhu')" width="200">
                         <template slot-scope="scope">
-                            <el-popover placement="top-start" title="标题" width="200" trigger="hover" :content="scope.row.remark">
+                            <el-popover placement="top-start" :title="$t('biao-ti')" width="200" trigger="hover" :content="scope.row.remark">
                                 <div slot="reference" class="apls">{{scope.row.remark}}</div>
                             </el-popover>
                         </template>
                     </el-table-column>
-                    <el-table-column v-if="!isDingding" :label="isAuditList ? '审核' : '操作'" width="180" fixed="right" >
+                    <el-table-column v-if="!isDingding" :label="isAuditList ? $t('other.audit') : $t('operation')" width="180" fixed="right" >
                         <template slot-scope="scope">
                             <div v-if="isAuditList">
                                 <el-button icon="el-icon-check" circle size="mini" @click="approve(scope.row)"></el-button>
@@ -265,7 +265,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column v-if="isDingding" label="操作" width="150" fixed="right">
+                    <el-table-column v-if="isDingding" :label="$t('operation')" width="150" fixed="right">
                         <template slot-scope="scope">
                             <el-button icon="iconfont firerock-iconguanlian" circle size="mini" @click="DingdingEditor(scope.row)"></el-button>
                             <el-button v-if="permissions.awayOfficeDelete" icon="el-icon-delete" circle size="mini" @click="deleteOfDingding(scope.row)"></el-button>
@@ -291,19 +291,19 @@
             <div class="ctons">
             <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
                 <div style="display: inline-block;width: 350px">
-                    <el-input style="float:left;" v-model="searchWord" class="input-with-select" placeholder="请输入人员搜索" clearable="true" size="small">
+                    <el-input style="float:left;" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
                         <el-button slot="append" @click="statistical()" icon="el-icon-search"></el-button>
                     </el-input>
                 </div>
                 <div style="display: inline-block;width: 700px;margin-left: 100px">
-                    <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">时间段</span>
+                    <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">{{ $t('message.period') }}</span>
                     <el-date-picker
                         size="small"
                         v-model="searchDates"
                         type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
+                        :range-separator="$t('other.to')"
+                        :start-placeholder="$t('time.startDate')"
+                        :end-placeholder="$t('time.endDate')"
                         @change="statistical()"
                         :clearable="false"
                         value-format="yyyy-MM-dd">
@@ -314,30 +314,30 @@
             <!-- <div style="margin-top: 30px"> -->
             <div>
                 <el-table key="apk2is4" v-loading="loading" :data="statisticalList" height="780px" style="width: 99%">
-                    <el-table-column prop="ownerName" label="姓名" width="300">
+                    <el-table-column prop="ownerName" :label="$t('lable.name')" width="300">
                         <template slot-scope="scope">
                             <div v-if="scope.row.ownerName">
                             {{scope.row.ownerName}}
                             </div>
                             <div v-else>
-                            <span>暂无出差统计</span>
+                            <span>{{ $t('nostatisticsonbusinesstripsatpresent') }}</span>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="departmentName" label="部门" width="300">
+                    <el-table-column prop="departmentName" :label="$t('lable.department')" width="300">
                         <!-- <template slot-scope="scope">
                             {{scope.row.departmentName}}/天
                         </template> -->
                     </el-table-column>
-                    <el-table-column prop="dayCount" label="累计出差天数" width="300">
+                    <el-table-column prop="dayCount" :label="$t('cumulativebusinesstripdays')" width="300">
                         <template slot-scope="scope">
-                            {{scope.row.dayCount}}天
+                            {{scope.row.dayCount}}{{ $t('time.day') }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="详情" width="300">
+                    <el-table-column :label="$t('details')" width="300">
                         <template slot-scope="scope">
                             <!-- {{scope.row.timeDays}} -->
-                            <el-button size="mini" @click="viewDetails(1,scope.row)">查看详情</el-button>
+                            <el-button size="mini" @click="viewDetails(1,scope.row)">{{ $t('Checkthedetails') }}</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -357,73 +357,73 @@
                 <el-col :span="18" >
                     <el-scrollbar style="height:100%;border:1px solid #dddddd;margin-right:20px;" >
                         <div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
-                            <div style="padding:5px;color:#333;" v-if="depData != null">设置 &lt;<span style="color:#20a0ff;">{{depData.label}}&gt;</span> 直属人员出差审批流程
-                                <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" content="仅适用于当前部门的直属人员，子部门人员的审批流程需要单独设置" placement="top-start">
+                            <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">{{depData.label}}&gt;</span> {{ $t('approvalprocessforbusiness') }}
+                                <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" :content="$t('onlyapplicabletotheimmediatestaffofthecurrentdepartment')" placement="top-start">
                                     <i class="el-icon-question"></i>
                                 </el-tooltip>
                             </div>
-                            <div style="padding:5px;" v-if="depData == null">请选择部门</div>
+                            <div style="padding:5px;" v-if="depData == null">{{ $t('qing-xuan-ze-bu-men') }}</div>
                             <div style="width:100%;margin:0 auto;text-align: center; margin-top:50px;" v-if="depData != null">
-                                <span>员工填报</span>
+                                <span>{{ $t('employeeisallowed') }}</span>
                                 <icon class="iconfont firerock-iconright"></icon>
                                 <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(0)"></icon>
                                 <icon class="iconfont firerock-iconright"></icon>
                                 <span v-for="(item, index) in dataArray" :key="item.seq" >
                                     <el-button type="primary" v-if="item.auditorType == 1" @click="editNodeDialog(index, item)">{{item.auditDeptName}}</el-button>
-                                    <el-button type="primary" v-if="item.auditorType == 0" >项目负责人</el-button>
+                                    <el-button type="primary" v-if="item.auditorType == 0" >{{ $t('projectLeader') }}</el-button>
                                     <el-button type="primary" v-if="item.auditorType == 2" @click="editNodeDialog(index, item)">{{item.userName}}</el-button>
                                     <icon class="iconfont firerock-iconright"></icon>
                                     <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(index+1)"></icon>
                                     <icon class="iconfont firerock-iconright"></icon>
                                 </span>
                                 <icon class="iconfont firerock-iconApp_New_Line" style="color:#20A0FF;"></icon>
-                                审批完成
+                                {{ $t('approvaltocomplete') }} 
                             </div>
                             <div style="width:100%;margin:0 auto;margin-bottom:30px;position: absolute;bottom: 0px;text-align: center; ">
-                                <el-button type="primary" @click="submitInsert">保存</el-button>
+                                <el-button type="primary" @click="submitInsert">{{ $t('save') }}</el-button>
                             </div>
                         </div>
                     </el-scrollbar>
                 </el-col>
             </div>
-            <el-dialog  title="请选择审批人" v-if="dialogVisible" :visible.sync="dialogVisible"  width="460px">
+            <el-dialog  :title="$t('pleaseselectapprover')" v-if="dialogVisible" :visible.sync="dialogVisible"  width="460px">
                 <el-form label-width="140px">
-                    <el-form-item label="选择部门/指定人员" >
-                        <el-cascader filterable ref="deptCascader" v-model="curDeptId" placeholder="请选择部门/指定人员" style="width: 100%" @change="chooseDept" :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
+                    <el-form-item :label="$t('selectdepartmentsdesignatepersonnel')" >
+                        <el-cascader filterable ref="deptCascader" v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept" :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button type="default" @click="deleteNode" v-if="!isAdd" style="float:left;">删除</el-button>
-                    <el-button type="primary" @click="addNode" >确定</el-button>
+                    <el-button type="default" @click="deleteNode" v-if="!isAdd" style="float:left;">{{ $t('btn.delete') }}</el-button>
+                    <el-button type="primary" @click="addNode" >{{ $t('btn.determine') }}</el-button>
                 </div>
             </el-dialog>
         </div>
     </div>
     <!-- 编辑框 -->
-    <el-dialog title="出差详情" v-if="editDialog" :visible.sync="editDialog" width="1000px">
+    <el-dialog :title="$t('detailsbusinessrip')" v-if="editDialog" :visible.sync="editDialog" width="1000px">
         <!-- <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemFormRules"> -->
         <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemRules">
-            <el-form-item label="出差人员" prop="ownerName"  style="width: 300px;display: inline-block;">
+            <el-form-item :label="$t('businesspersonnel')" prop="ownerName"  style="width: 300px;display: inline-block;">
                 <span>{{editItemForm.ownerName}}</span>
             </el-form-item>
-            <el-form-item label="单程/往返" prop="goBack" style="width: 300px;display: inline-block;">
+            <el-form-item :label="$t('onewayroundtrip')" prop="goBack" style="width: 300px;display: inline-block;">
                 <el-radio-group v-model="editItemForm.goBack">
-                    <el-radio :label="0">单程</el-radio>
-                    <el-radio :label="1">往返</el-radio>
+                    <el-radio :label="0">{{ $t('oneway') }}</el-radio>
+                    <el-radio :label="1">{{ $t('backandforth') }}</el-radio>
                 </el-radio-group>
             </el-form-item>
             <!-- 交通工具 -->
-            <el-form-item label="交通工具" style="width:100%">
+            <el-form-item :label="$t('traffictools')" style="width:100%">
                 <el-radio-group v-model="editItemForm.way">
-                    <el-radio :label="0">飞机</el-radio>
-                    <el-radio :label="1">火车</el-radio>
-                    <el-radio :label="2">汽车</el-radio>
-                    <el-radio :label="3">轮船</el-radio>
-                    <el-radio :label="4">其他</el-radio>
+                    <el-radio :label="0">{{ $t('plane') }}</el-radio>
+                    <el-radio :label="1">{{ $t('train') }}</el-radio>
+                    <el-radio :label="2">{{ $t('car') }}</el-radio>
+                    <el-radio :label="3">{{ $t('ship') }}</el-radio>
+                    <el-radio :label="4">{{ $t('leave.other') }}</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="投入项目" style="width:300px;margin-right:30px;display:inline-block;" prop="projectId">
-                <el-select style="width:100%" @change="getwuduList(0)" v-model="editItemForm.projectId" filterable clearable placeholder="请选择投入项目" >
+            <el-form-item :label="$t('screening.inputProject')" style="width:300px;margin-right:30px;display:inline-block;" prop="projectId">
+                <el-select style="width:100%" @change="getwuduList(0)" v-model="editItemForm.projectId" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                     <el-option
                     v-for="item in projectList"
                     :key="item.id"
@@ -436,7 +436,7 @@
             v-if="editItemForm.projectId != null && wuduData.customDegreeActive == 1"
             style="width:300px;margin-right:30px;display:inline-block;"
             prop="degreeName">
-                <el-select style="width:100%" v-model="editItemForm.degreeId" filterable clearable placeholder="请选择" >
+                <el-select style="width:100%" v-model="editItemForm.degreeId" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                     <el-option
                     v-for="item in wuduList"
                     :key="item.id"
@@ -445,8 +445,8 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="出发城市" style="width:300px;margin-right:30px;display: inline-block;" prop="cityFrom">
-                <el-select style="width:100%" v-model="editItemForm.cityFrom" filterable clearable placeholder="请选择出发城市" >
+            <el-form-item :label="$t('departurecity')" style="width:300px;margin-right:30px;display: inline-block;" prop="cityFrom">
+                <el-select style="width:100%" v-model="editItemForm.cityFrom" filterable clearable :placeholder="$t('defaultText.pleaseChoose')" >
                     <el-option
                     v-for="item in cityList"
                     :key="item.value"
@@ -456,8 +456,8 @@
                 </el-select>
             </el-form-item>
             <!-- 目的城市 -->
-            <el-form-item label="目的城市" style="width:300px;display: inline-block;" prop="cityTo">
-                <el-select style="width:100%" v-model="editItemForm.cityTo" filterable clearable placeholder="请选择目的城市">
+            <el-form-item label="$t('destinationcity')" style="width:300px;display: inline-block;" prop="cityTo">
+                <el-select style="width:100%" v-model="editItemForm.cityTo" filterable clearable :placeholder="$t('defaultText.pleaseChoose')">
                     <el-option
                     v-for="item in cityList"
                     :key="item.value"
@@ -466,10 +466,10 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="开始时间" style="width:300px;margin-right:30px;display:inline-block;" prop="startDate">
+            <el-form-item :label="$t('starttimes')" style="width:300px;margin-right:30px;display:inline-block;" prop="startDate">
                 <el-date-picker
                 type="date"
-                placeholder="开始日期"
+                :placeholder="$t('time.startDate')"
                 value-format="yyyy-MM-dd"
                 v-model="editItemForm.startDate"
                 style="width:100%"
@@ -477,59 +477,59 @@
                 </el-date-picker>
             </el-form-item>
             <!-- 结束时间 -->
-            <el-form-item label="结束时间" style="width:300px;display:inline-block;" prop="endDate">
+            <el-form-item :label="$t('time.endTime')" style="width:300px;display:inline-block;" prop="endDate">
                 <el-date-picker
                 type="date"
-                placeholder="结束日期"
+                :placeholder="$t('time.endDate')"
                 value-format="yyyy-MM-dd"
                 v-model="editItemForm.endDate"
                 style="width:100%"
                 @change="datechg2(0)">
                 </el-date-picker>
             </el-form-item>
-            <el-form-item label="出差天数" style="width:300px">
-                <el-input type="number" placeholder="自动计算" v-model="editItemForm.dayCount" min="0" style="width:100%"></el-input>
+            <el-form-item :label="$t('traveldays')" style="width:300px">
+                <el-input type="number" :placeholder="$t('automaticcalculation')" v-model="editItemForm.dayCount" min="0" style="width:100%"></el-input>
             </el-form-item>
-            <el-form-item label="备注" style="width: 100%">
+            <el-form-item :label="$t('bei-zhu')" style="width: 100%">
                 <el-input type="textarea" v-model="editItemForm.remark" :rows="3" style="width: 62%" maxlength="100" show-word-limit></el-input>
             </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="editDialog = false">取 消</el-button>
-            <el-button type="primary" @click="determine()">确 定</el-button>
+            <el-button @click="editDialog = false">{{ $t('btn.cancel') }}</el-button>
+            <el-button type="primary" @click="determine()">{{ $t('btn.determine') }}</el-button>
         </span>
     </el-dialog>
 
     <!-- 出差统计查看详情 -->
-    <el-dialog title="出差详情" :visible.sync="seeDialog" width="1000px">
+    <el-dialog :title="$t('detailsbusinessrip')" :visible.sync="seeDialog" width="1000px">
         <el-table :data="detailsData" style="width:100%" height="400" v-loading="detailsloading">
             <!-- <el-table-column prop="date" label="日期" width="150"></el-table-column>
             <el-table-column prop="name" label="姓名" width="200"></el-table-column>
             <el-table-column prop="address" label="地址"></el-table-column> -->
-            <el-table-column prop="ownerName" label="出差人员" width="100" fixed="left"></el-table-column>
-            <el-table-column prop="reason" label="出差事由" width="150" header-align="center"></el-table-column>
-            <el-table-column prop="projectName" label="投入项目" width="150" align="center"></el-table-column>
-            <el-table-column label="交通工具" width="120" align="center">
+            <el-table-column prop="ownerName" :label="$t('businesspersonnel')" width="100" fixed="left"></el-table-column>
+            <el-table-column prop="reason" :label="$t('travelreason')" width="150" header-align="center"></el-table-column>
+            <el-table-column prop="projectName" :label="$t('screening.inputProject')" width="150" align="center"></el-table-column>
+            <el-table-column :label="$t('traffictools')" width="120" align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.way == 0">飞机</span>
-                    <span v-if="scope.row.way == 1">火车</span>
-                    <span v-if="scope.row.way == 2">汽车</span>
-                    <span v-if="scope.row.way == 3">轮船</span>
-                    <span v-if="scope.row.way == 4">其他</span>
+                    <span v-if="scope.row.way == 0">{{ $t('plane') }}</span>
+                    <span v-if="scope.row.way == 1">{{ $t('train') }}</span>
+                    <span v-if="scope.row.way == 2">{{ $t('car') }}</span>
+                    <span v-if="scope.row.way == 3">{{ $t('ship') }}</span>
+                    <span v-if="scope.row.way == 4">{{ $t('leave.other') }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="行程" width="120" align="center">
+            <el-table-column :label="$t('trip')" width="120" align="center">
                 <template slot-scope="scope">{{scope.row.cityFrom + '-' + scope.row.cityTo}}</template>
             </el-table-column>
-            <el-table-column prop="indate" label="申请时间" width="150" align="center"></el-table-column>
-            <el-table-column label="出差天数" width="80" align="center">
-                <template slot-scope="scope"><div>{{scope.row.dayCount}}天</div></template>
+            <el-table-column prop="indate" :label="$t('applytime')" width="150" align="center"></el-table-column>
+            <el-table-column :label="$t('traveldays')" width="80" align="center">
+                <template slot-scope="scope"><div>{{scope.row.dayCount}}{{ $t('time.day') }}</div></template>
             </el-table-column>
-            <el-table-column prop="startDate" label="出差开始时间" width="150" align="center"></el-table-column>
-            <el-table-column prop="endDate" label="出差结束时间" width="150" align="center"></el-table-column>
-            <el-table-column prop="remark" label="备注" width="200">
+            <el-table-column prop="startDate" :label="$t('starttimeofbusinessrip')" width="150" align="center"></el-table-column>
+            <el-table-column prop="endDate" :label="$t('endtimeofbusinesstrip')" width="150" align="center"></el-table-column>
+            <el-table-column prop="remark" :label="$t('bei-zhu')" width="200">
                 <template slot-scope="scope">
-                    <el-popover placement="top-start" title="标题" width="200" trigger="hover" :content="scope.row.remark">
+                    <el-popover placement="top-start" title="$t('biao-ti')" width="200" trigger="hover" :content="scope.row.remark">
                         <div slot="reference" class="apls">{{scope.row.remark}}</div>
                     </el-popover>
                 </template>
@@ -549,50 +549,50 @@
     </el-dialog>
 
     <!-- 钉钉环境交互效果切换 -->
-    <el-dialog title="项目关联信息" v-if="DingdingEditDialog" :close-on-click-modal="false" :visible.sync="DingdingEditDialog" width="800px" customClass="customWidth">
+    <el-dialog :title="$t('projectAssociationInformation')" v-if="DingdingEditDialog" :close-on-click-modal="false" :visible.sync="DingdingEditDialog" width="800px" customClass="customWidth">
         
         <el-table :data="relationList" :loading="DingdingTableLoading">
-            <el-table-column label="时间段">
+            <el-table-column :label="$t('message.period')">
                 <template slot-scope="scope">
-                    <span>{{scope.row.startDate + '至' + scope.row.endDate}}</span>
+                    <span>{{scope.row.startDate + $t('other.to') + scope.row.endDate}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="关联项目" prop="projectName" show-overflow-tooltip></el-table-column>
+            <el-table-column :label="$t('rselatedprojects')" prop="projectName" show-overflow-tooltip></el-table-column>
             <el-table-column :label="wuduData.customDegreeName" prop="degreeName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="操作" width="150">
+            <el-table-column :label="$t('operation')" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" @click="DingdingAddorMod(scope.row)">编辑</el-button>
-                    <el-button size="small" type="danger" @click="DingdingDelete(scope.row)">删除</el-button>
+                    <el-button size="small" type="primary" @click="DingdingAddorMod(scope.row)">{{ $t('bian-ji') }}</el-button>
+                    <el-button size="small" type="danger" @click="DingdingDelete(scope.row)">{{ $t('btn.delete') }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="DingdingEditDialog = false">关闭</el-button>
-            <el-button type="primary" @click="DingdingAddorMod()">新增关联项目</el-button>
+            <el-button type="primary" @click="DingdingEditDialog = false">{{ $t('Shutdown') }}</el-button>
+            <el-button type="primary" @click="DingdingAddorMod()">{{ $t('addinganAssociatedItem') }}</el-button>
         </div>
 
-        <el-dialog append-to-body title="新增/修改关联项目" v-if="appendAddorModDialog" :visible.sync="appendAddorModDialog" width="700px" customClass="customWidth">
+        <el-dialog append-to-body :title="$t('addedormodifiedassociateditems')" v-if="appendAddorModDialog" :visible.sync="appendAddorModDialog" width="700px" customClass="customWidth">
             <el-form label-width="100" :inline="true" style="margin-top:20px" :model="relationItem" :rules="relationItemRules" ref="relationItemForm">
-                <el-form-item label="开始日期" prop="startDate">
+                <el-form-item :label="$t('time.startDate')" prop="startDate">
                     <el-date-picker
                     style="width:220px"
                     v-model="relationItem.startDate"
                     value-format="yyyy-MM-dd"
                     type="date"
                     @change="datechg3(1)"
-                    placeholder="请选择日期"></el-date-picker>
+                    :placeholder="$t('defaultText.pleaseChoose')"></el-date-picker>
                 </el-form-item>
-                <el-form-item label="结束日期" prop="endDate" style="margin-left:35px">
+                <el-form-item :label="$t('time.endDate')" prop="endDate" style="margin-left:35px">
                     <el-date-picker
                     style="width:220px"
                     v-model="relationItem.endDate"
                     value-format="yyyy-MM-dd"
                     type="date"
                     @change="datechg3(0)"
-                    placeholder="请选择日期"></el-date-picker>
+                    :placeholder="$t('defaultText.pleaseChoose')"></el-date-picker>
                 </el-form-item><br>
-                <el-form-item label="关联项目" prop="projectId">
-                    <el-select v-model="relationItem.projectId" placeholder="请选择项目" @change="getwuduList(2)" style="width:220px" filterable >
+                <el-form-item :label="$t('rselatedprojects')" prop="projectId">
+                    <el-select v-model="relationItem.projectId" :placeholder="$t('defaultText.pleaseChoose')" @change="getwuduList(2)" style="width:220px" filterable >
                         <el-option
                         v-for="item in projectList"
                         :key="item.id"
@@ -601,7 +601,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="wuduData.customDegreeName" prop="degreeId" style="margin-left:44.5px">
-                    <el-select v-model="relationItem.degreeId" :placeholder="'请选择' + wuduData.customDegreeName" style="width:220px">
+                    <el-select v-model="relationItem.degreeId" :placeholder="$t('defaultText.pleaseChoose') + wuduData.customDegreeName" style="width:220px">
                         <el-option
                         v-for="item in wuduList"
                         :key="item.id"
@@ -611,30 +611,30 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="appendAddorModDialog = false">取消</el-button>
-                <el-button type="primary" @click="appendAddorModSure('relationItemForm')">提交</el-button>
+                <el-button @click="appendAddorModDialog = false">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="appendAddorModSure('relationItemForm')">{{ $t('btn.submit') }}</el-button>
             </div>
         </el-dialog>
     </el-dialog>
     <!-- 点击钉钉同步弹窗 -->
-    <el-dialog title="从钉钉同步" :visible.sync="synchronizationDaying" width="480px" :before-close="handleClose">
+    <el-dialog :title="$t('synchronizefromStaple')" :visible.sync="synchronizationDaying" width="480px" :before-close="handleClose">
         <div>
             <div class="dingdingtongbu">
-                <span>选择人员</span>
-                <el-select v-model="ownerIdsId" placeholder="请选择人员" style="width:280px" size="small" filterable="true">
+                <span>{{ $t('screening.selectPeople') }}</span>
+                <el-select v-model="ownerIdsId" :placeholder="$t('pleaseselectpersonnel')" style="width:280px" size="small" filterable="true">
                     <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="dingdingtongbu" style="margin-top: 20px">
-                <span>时间段</span>
-                <el-date-picker v-model="createDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable style="width:280px"></el-date-picker>
-                <span style="width: 300px;color: #E6A23C;font-size: 10px;padding-left: 105px;margin-top: 10px"> <i class="el-icon-warning-outline"></i> 从钉钉同步 时间段不能超过七天</span>
+                <span>{{ $t('message.period') }}</span>
+                <el-date-picker v-model="createDateList" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px"></el-date-picker>
+                <span style="width: 300px;color: #E6A23C;font-size: 10px;padding-left: 105px;margin-top: 10px"> <i class="el-icon-warning-outline"></i> {{ $t('synchronizationperiodfromstaplecannotexceedsevendays') }}</span>
             </div>
         </div>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="synchronizationDaying = false">取 消</el-button>
-            <el-button type="primary" @click="listSynchronize()" :loading="synchronizeLoading">同 步</el-button>
+            <el-button @click="synchronizationDaying = false">{{ $t('btn.cancel') }}</el-button>
+            <el-button type="primary" @click="listSynchronize()" :loading="synchronizeLoading">{{ $t('synchronous') }}</el-button>
         </span>
     </el-dialog>
 </section>
@@ -678,17 +678,17 @@ export default {
                 wuduId:null      //维度id
             },
             formrules:{
-                reason:[{ required: true, message: "请输入出差事由", trigger: "blur" }],
-                cityFrom:[{ required: true, message: "请选择出发城市", trigger: "blur" }],
-                cityTo:[{ required: true, message: "请选择目的城市", trigger: "blur" }],
-                startDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }],
-                endDate:[{ required: true, message: "请选择结束时间", trigger: "blur" }]
+                reason:[{ required: true, message: this.$t('yourbusinesstrip'), trigger: "blur" }],
+                cityFrom:[{ required: true, message: this.$t('selectyourdeparturecity'), trigger: "blur" }],
+                cityTo:[{ required: true, message: this.$t('saelectdestinationcity'), trigger: "blur" }],
+                startDate:[{ required: true, message: this.$t('selectastarttime'), trigger: "blur" }],
+                endDate:[{ required: true, message: this.$t('selectanendtime'), trigger: "blur" }]
             },
             editItemRules:{
-                cityFrom:[{ required: true, message: "请选择出发城市", trigger: "blur" }],
-                cityTo:[{ required: true, message: "请选择目的城市", trigger: "blur" }],
-                startDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }],
-                endDate:[{ required: true, message: "请选择结束时间", trigger: "blur" }]
+                cityFrom:[{ required: true, message: this.$t('selectyourdeparturecity'), trigger: "blur" }],
+                cityTo:[{ required: true, message: this.$t('saelectdestinationcity'), trigger: "blur" }],
+                startDate:[{ required: true, message: this.$t('selectastarttime'), trigger: "blur" }],
+                endDate:[{ required: true, message: this.$t('selectanendtime'), trigger: "blur" }]
             },
             cityList:[],
             cityList2:[],
@@ -762,9 +762,9 @@ export default {
                 degreeId: null
             },
             relationItemRules: {
-                startDate:[{required: true,message: '请选择开始日期',trigger: 'change'}],
-                endDate:[{required: true,message: '请选择结束日期',trigger: 'change'}],
-                projectId:[{required: true,message: '请选择要关联的项目',trigger: 'change'}],
+                startDate:[{required: true,message: this.$t('selectastartdate'),trigger: 'change'}],
+                endDate:[{required: true,message: this.$t('selectaenddate'),trigger: 'change'}],
+                projectId:[{required: true,message: this.$t('projectassociate'),trigger: 'change'}],
             },
             relationItemTemporaryDate: {},
             synchronizeLoading: false,
@@ -813,7 +813,7 @@ export default {
                 if(res.code == 'ok'){
                     var filePath = res.data;
                     const a = document.createElement('a'); // 创建a标签
-                    a.setAttribute('download', '出差统计导出.xls');// download属性
+                    a.setAttribute('download', this.$t('tripStatistics')+'.xls');// download属性
                     a.setAttribute('href', filePath);// href链接
                     a.click(); //自执行点击事件
                     a.remove();
@@ -837,13 +837,13 @@ export default {
             this.billss(1)
         },
         deleteOfDingding(e) {
-            this.$confirm("确认要删除吗?", "提示", {}).then(() => {
+            this.$confirm(this.$t('deleteit'), this.$t('other.prompts'), {}).then(() => {
                 this.http.post('/business-trip/delete', {id:e.id},
                 res => {
                     if (res.code == "ok") {
                         this.billss();
                         this.$message({
-                            message: '删除成功',
+                            message: this.$t('message.successfullyDeleted'),
                             type: "success"
                         });
                     } else {
@@ -909,7 +909,7 @@ export default {
                         this.synchronizeLoading = false
                         this.synchronizationDaying = false
                         this.$message({
-                            message: '同步成功',
+                            message: this.$t('synchronoussuccess'),
                             type: 'success'
                         })
                         // this.ownerIdsId = ''
@@ -931,7 +931,7 @@ export default {
                 })
             } else {
                 this.$message({
-                    message: '从钉钉同步消息时间段不能超过七天',
+                    message: this.$t('cannotbesynchronized'),
                     type: 'warning'
                 });
             }
@@ -1018,9 +1018,9 @@ export default {
         },
         DingdingDelete(row){
             console.log('row',this.relationItem);
-            this.$confirm('是否确认删除？','提示',{
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(this.$t('doyouwanttodeleteit'),this.$t('other.prompts'),{
+                confirmButtonText: this.$t('btn.determine'),
+                cancelButtonText: this.$t('btn.cancel'),
                 type: 'warning'
             }).then(()=>{
                 this.http.post('/bustrip-project/delete',{
@@ -1164,7 +1164,7 @@ export default {
                         if (res.code == "ok") {
                             this.formloading = false
                             this.$message({
-                                message: "申请成功",
+                                message: this.$t('applicationissuccessful'),
                                 type: "success"
                             })
                             this.addform = {
@@ -1328,13 +1328,13 @@ export default {
 
         // 操作 - 删除
         deletes(e) {
-            this.$confirm("确认要删除吗?", "提示", {}).then(() => {
+            this.$confirm(this.$t('deleteit'), this.$t('other.prompts'), {}).then(() => {
                 this.http.post('/business-trip/delete', {id:e.id},
                 res => {
                     if (res.code == "ok") {
                         this.getTableList();
                         this.$message({
-                            message: '删除成功',
+                            message: this.$t('message.successfullyDeleted'),
                             type: "success"
                         });
                     } else {
@@ -1392,7 +1392,7 @@ export default {
                             this.editDialog = false
                             this.billss()
                             this.$message({
-                                message: '修改成功',
+                                message: this.$t('message.modifyTheSuccess'),
                                 type: 'success'
                             })
                         } else {
@@ -1513,8 +1513,8 @@ export default {
                     var list = res.data , list1 = JSON.parse(JSON.stringify(res.data));
                     this.sdata = list;
                     this.soption = [
-                        {value: 1 , label : "部门" , children : this.changeArr(list1)},
-                        {value: 2 , label : "指定人员",children : this.susers}
+                        {value: 1 , label : this.$t('lable.department') , children : this.changeArr(list1)},
+                        {value: 2 , label : this.$t('designatedpersonnel'),children : this.susers}
                     ]
                 } else {
                     this.$message({
@@ -1615,7 +1615,7 @@ export default {
                 this.listLoading = false;
                 if (res.code == "ok") {
                     this.$message({
-                        message: '保存成功',
+                        message: this.$t('savesuccess'),
                         type: "success"
                     });
                 } else {

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -3,37 +3,37 @@
       <!-- 表头 -->
       <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
           <el-form :inline="true" style="width: 87%">
-              <el-form-item label="角色权限">
+              <el-form-item :label="$t('roleauthorization')">
               </el-form-item>
               <el-form-item >
                   <div>
-                  <el-input style="float:left;" v-model="keyword" class="input-with-select" placeholder="请输入关键字查询" clearable="true">
+                  <el-input style="float:left;" v-model="keyword" class="input-with-select" :placeholder="$t('pleaseenterakeyworforquery')" clearable="true">
                       <el-button slot="append"  @click="mohu" @clear="mohus" icon="el-icon-search"></el-button>
                   </el-input>
                   </div>
               </el-form-item>
               <el-form-item style="float: right">
-                  <el-link type="primary" :underline="false" @click="handleAdd('添加角色', '立即添加')">添加角色</el-link>
-                  <el-link type="primary" :underline="false" @click="modify()" style="margin-left: 20px;">修改默认角色</el-link>
+                  <el-link type="primary" :underline="false" @click="handleAdd($t('addingroles'), $t('Immediatelyadd'))">{{ $t('addingroles') }}</el-link>
+                  <el-link type="primary" :underline="false" @click="modify()" style="margin-left: 20px;">{{ $t('modifyingDefaultRole') }}</el-link>
                   <!-- <el-link type="primary" :underline="false" @click="exportAuthority()" style="margin-left:20px">导出所有权限</el-link> -->
               </el-form-item>
           </el-form>
       </el-col>
       <!-- 表格 -->
       <el-table :data="tableData" style="width: 100%" height="615">
-        <el-table-column prop="rolename" label="角色" align="center">
+        <el-table-column prop="rolename" :label="$t('jiao-se')" align="center">
             <template slot-scope="scope">
-              {{scope.row.rolename}} <span v-if="scope.row.isDefault == 1" style="color: #909399;"> - (默认角色)</span>
+              {{scope.row.rolename}} <span v-if="scope.row.isDefault == 1" style="color: #909399;"> {{ $t('mo-ren-jiao-se') }}</span>
             </template>
         </el-table-column>
-        <el-table-column prop="roleDescribe" label="描述"></el-table-column>
-        <el-table-column prop="date" label="操作">
+        <el-table-column prop="roleDescribe" :label="$t('other.describe')"></el-table-column>
+        <el-table-column prop="date" :label="$t('operation')">
             <template slot-scope="scope">
                 <div>
-                    <el-button size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)" :style="scope.row.rolename != '超级管理员' ? '' : 'visibility:hidden;'">编辑角色</el-button>
-                    <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename" v-if="scope.row.rolename !='超级管理员' || (scope.row.rolename =='超级管理员' && user.roleName == '超级管理员')">分配权限</el-button>
-                    <el-button size="small" @click="exportAuthority(scope.row)" >导出权限</el-button>
-                    <el-button type="danger" size="small" @click="deteHand(scope.row)" v-if="scope.row.rolename != '超级管理员'">删除</el-button>
+                    <el-button size="small" @click="handleAdd($t('editingtherole'), $t('Immediatelychange'), scope.row)" :style="scope.row.rolename != $t('role.superAdministrator') ? '' : 'visibility:hidden;'">{{ $t('editingtherole') }}</el-button>
+                    <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename" v-if="scope.row.rolename !=$t('role.superAdministrator') || (scope.row.rolename ==$t('role.superAdministrator') && user.roleName == $t('role.superAdministrator'))">{{ $t('assignpermissions') }}</el-button>
+                    <el-button size="small" @click="exportAuthority(scope.row)" >{{ $t('exportpermission') }}</el-button>
+                    <el-button type="danger" size="small" @click="deteHand(scope.row)" v-if="scope.row.rolename != $t('role.superAdministrator')">{{ $t('btn.delete') }}</el-button>
                 </div>
             </template>
         </el-table-column>
@@ -51,7 +51,7 @@
             ></el-pagination>
         </el-col> -->
         <!-- 分配权限弹窗 -->
-        <el-dialog :title="'分配权限 - '+roleName" :visible.sync="dialogVisible" width="764px" :before-close="handleClose">
+        <el-dialog :title="$t('assignpermissions') +' - '+roleName" :visible.sync="dialogVisible" width="764px" :before-close="handleClose">
             <div class="quanxians">
                 <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input> -->
                 <!-- <el-tree :data="data" show-checkbox node-key="id" :filter-node-method="filterNode" ref="tree" :default-expanded-keys="[2, 3]" :default-checked-keys="[5]" :props="defaultProps"> </el-tree> -->
@@ -75,7 +75,7 @@
                       <ul v-if="mainMenu.children && mainMenu.useState">
                         <li v-for="subMenu in mainMenu.children" :key="subMenu.id">
                         <el-checkbox :label="subMenu.name" name="type" v-model="subMenu.checked" style="font-weight:bold;" @change="subChange(subMenu)"></el-checkbox>
-                            <span v-if="subMenu.functionList && subMenu.functionList.length > 0" style="margin-right:10px;margin-left:10px;">(功能:  
+                            <span v-if="subMenu.functionList && subMenu.functionList.length > 0" style="margin-right:10px;margin-left:10px;">({{ $t('gong-neng') }} :
                               <el-checkbox v-for="fun in subMenu.functionList" :key="fun.id" :label="fun.name" name="type" v-model="fun.checked" @change="funChange(fun)"></el-checkbox>)</span>
                         </li>
                       </ul>
@@ -85,39 +85,39 @@
                 </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="saveList()">保存</el-button>
+              <el-button type="primary" @click="saveList()">{{ $t('save') }}</el-button>
             </span>
         </el-dialog>
         <!-- 添加角色弹窗 -->
         <el-dialog :title="titles" :visible.sync="addDialogVisible" width="600px" :before-close="handleClose">
             <div>
                 <el-form ref="form" :rules="rules" :model="form" label-width="80px">
-                    <el-form-item label="角色名称" prop="rolename">
+                    <el-form-item :label="$t('charactername')" prop="rolename">
                         <el-input v-model="form.rolename" clearable></el-input>
                     </el-form-item>
-                    <el-form-item label="描述">
+                    <el-form-item :label="$t('other.describe')">
                         <el-input type="textarea" v-model="form.roleDescribe" maxlength="25" show-word-limit clearable></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button style="float: right" type="primary" @click="onSubmit('form')">确定</el-button>
+                        <el-button style="float: right" type="primary" @click="onSubmit('form')">{{ $t('btn.determine') }}</el-button>
                     </el-form-item>
                 </el-form>
             </div>
         </el-dialog>
         <!-- 修改默认角色弹窗 -->
-        <el-dialog title="默认角色" :visible.sync="defaultRole" width="400px" :before-close="handleClose">
+        <el-dialog :title="$t('defaultrole')" :visible.sync="defaultRole" width="400px" :before-close="handleClose">
             <div>
               <el-form label-width="80px">
-                <el-form-item label="默认角色">
-                  <el-select v-model="roleId" placeholder="请选择默认角色">
+                <el-form-item :label="$t('defaultrole')">
+                  <el-select v-model="roleId" :placeholder="$t('defaultText.pleaseChoose')">
                       <el-option v-for="item in auseList" :key="item.id" :label="item.rolename" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
-                <div class="daoru"><span type="info" style="color:#999">*设置导入人员时的默认角色</span></div>
+                <div class="daoru"><span type="info" style="color:#999">{{ $t('defaultroleforimportingpeople') }}</span></div>
               </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="determine()">确 定</el-button>
+              <el-button type="primary" @click="determine()">{{ $t('btn.determine') }}</el-button>
             </span>
         </el-dialog>
   </div>
@@ -148,7 +148,7 @@ export default {
         moduleList: [],
         roles: '',
         titles: '',
-        addTil: '立即添加',
+        addTil: this.$t('Immediatelyadd'),
         keyword: '',
         auseList: [],
         defaultRole: false,
@@ -156,7 +156,7 @@ export default {
         roleName: '',
         rules: {
           rolename: [{
-            required: true, message: '请输入角色名称', trigger: 'blur'
+            required: true, message: this.$t('peaseenterthe'), trigger: 'blur'
           }]
         }
     };
@@ -187,7 +187,7 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.$message({
-                    message: '操作成功',
+                    message: this.$t('operationissuccessful'),
                     type: "success"
                 });
                 this.defaultRole = false
@@ -288,8 +288,8 @@ export default {
         return data.label.indexOf(value) !== -1;
       },
         handleAdd(tex, tel, id) {
-          if(id && id.rolename == '超级管理员'){
-            this.$message('超级管理员为固定的默认角色无法编辑');
+          if(id && id.rolename == this.$t('role.superAdministrator')){
+            this.$message(this.$t('administratorcannotbeedited'));
             return
           }
           this.titles = tex
@@ -339,9 +339,9 @@ export default {
          
       },
       deteHand(item) {
-        this.$confirm('此操作将删除('+item.rolename+')角色, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(this.$t('operationwilldelete')+'('+item.rolename+')'+this.$t('shifujuxu'), this.$t('other.prompts'), {
+          confirmButtonText: this.$t('btn.determine'),
+          cancelButtonText: this.$t('btn.cancel'),
           type: 'warning'
         }).then(() => {
           this.http.post('/permission/deleteRole', {
@@ -350,7 +350,7 @@ export default {
           res => {
               if (res.code == "ok") {
                 this.$message({
-                      message: '删除成功',
+                      message: this.$t('message.successfullyDeleted'),
                       type: "success"
                   });
                 this.getRole()
@@ -442,7 +442,7 @@ export default {
           res => {
               if (res.code == "ok") {
                 this.$message({
-                      message: '操作成功',
+                      message: this.$t('operationissuccessful'),
                       type: "success"
                   });
                 this.getRole()
@@ -467,7 +467,7 @@ export default {
         },res => {
           if(res.code == 'ok'){
             var a = document.createElement('a');
-            a.download = "权限数据表.xls";
+            a.download = this.$t('quanxianshuju')+ ".xls";
             a.href = res.data;
             a.click();
           }else{

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -2,80 +2,78 @@
     <section >
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;position:sticky;top:0;z-index:1002">
             <el-form :inline="true">
-                <el-form-item label="系统基础设置">
+                <el-form-item :label="$t('navigation.basicSystemSettings')">
                 </el-form-item>
                 <el-form-item  style="float:right">
-                    <el-button  type="primary" @click="submitInsert" :loading="addLoading">保存</el-button>
+                    <el-button  type="primary" @click="submitInsert" :loading="addLoading">{{ $t('save') }}</el-button>
                 </el-form-item>
             </el-form>
         </el-col>
-        <p style="padding-top:80px;margin: 0 0 10px 10px;color:#666;">员工时薪录入方式设置</p>
+        <p style="padding-top:80px;margin: 0 0 10px 10px;color:#666;">{{ $t('employeehourlywage') }}</p>
         <div class="panel" style="height:190px;margin-left:20px;margin-right:20px;">
-        <el-radio v-model="timeType.hourCostInputType" :label="0" style="width:100%;margin-left:10px;">方式一: 录入月成本，自动计算时薪<span class="tip">(适合企业全职员工)</span>
+        <el-radio v-model="timeType.hourCostInputType" :label="0" style="width:100%;margin-left:10px;">{{ $t('methodsa') }}<span class="tip">{{ $t('suitableforfulltimeemployees') }}</span>
             <el-form ref="form0" :inline="true" :model="timeType" label-width="150px" style="margin-top:10px;">
-            <el-form-item label="平均每月工作天数" prop="monthDays">
+            <el-form-item :label="$t('workingdayspermonth')" prop="monthDays">
             <el-input v-model="timeType.monthDays"  type="number" style="width:120px;"></el-input>
-            天
+            {{ $t('time.day') }} 
             </el-form-item>    
-            <el-form-item label="每日正常工作时长" prop="allday">
-                <el-select v-model="timeType.allday" placeholder="请选择工作时长" style="width:120px;" @change="timeAlldayChange">
+            <el-form-item :label="$t('dailyworkinghours')" prop="allday">
+                <el-select v-model="timeType.allday" :placeholder="$t('defaultText.pleaseSelectWorkingHours')" style="width:120px;" @change="timeAlldayChange">
                     <el-option v-for="item in times" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
                 </el-select>
-                小时
-                
-                <span class="lockworktime"><el-checkbox v-model="timeType.lockWorktime" @change="lockChange" label="锁定工作时长" />
-                
-                <el-tooltip effect="dark" content="锁定每日填报工时的上限" placement="top-start">
+                {{ $t('time.hour') }} 
+                <span class="lockworktime"><el-checkbox v-model="timeType.lockWorktime" @change="lockChange" :label="$t('lockingworkinghours')" />
+                <el-tooltip effect="dark" :content="$t('hoursreporteperday')" placement="top-start">
                     <i class="el-icon-question" style="color:#606266"></i>
                 </el-tooltip>
-                <span style="margin-left:25px">填报时长上限</span>
+                <span style="margin-left:25px">{{ $t('imitillingtime') }}</span>
                 <el-select :disabled="timeType.lockWorktime" v-model="timeType.maxReportTime" type="number" style="width:120px;margin-left:10px">
                     <el-option v-for="item in maxReportTimeRange" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
-                </el-select><span style="margin-left:5px;color:#409eff">小时</span>
+                </el-select><span style="margin-left:5px;color:#409eff">{{ $t('time.hour') }}</span>
                 </span>
                 
             </el-form-item><br>
-            <el-form-item label="加班设置" prop="allday" v-if="!timeType.lockWorktime">
-                <el-checkbox v-model="timeType.fillOvertime" label="可填报加班时长" />
+            <el-form-item :label="$t('workSettings')" prop="allday" v-if="!timeType.lockWorktime">
+                <el-checkbox v-model="timeType.fillOvertime" :label="$t('hourscanbereported')" />
                 <template v-if="timeType.fillOvertime">
-                <el-checkbox v-model="timeType.payOvertime" label="加班工时记入成本" />
+                <el-checkbox v-model="timeType.payOvertime" :label="$t('chargedtocost')" />
                 <!-- <el-checkbox v-model="timeType.doubleOvertime" label="加班双倍成本" :disabled="!timeType.payOvertime"/> -->
-                <el-input v-model="timeType.overtimeRatio" placeholder="" clearable style="width: 100px;margin: 0 10px 0 20px" v-if="timeType.payOvertime" @keyup.native="timeType.overtimeRatio = oninput(timeType.overtimeRatio, 1)"></el-input> <span v-if="timeType.payOvertime">倍工资</span>
+                <el-input v-model="timeType.overtimeRatio" placeholder="" clearable style="width: 100px;margin: 0 10px 0 20px" v-if="timeType.payOvertime" @keyup.native="timeType.overtimeRatio = oninput(timeType.overtimeRatio, 1)"></el-input> <span v-if="timeType.payOvertime">{{ $t('bei-gong-zi') }}</span>
                 </template>
             </el-form-item>
             </el-form>
             
         </el-radio>
-        <el-radio v-model="timeType.hourCostInputType" :label="1" style="width:100%;margin-left:10px;">方式二：直接录入时薪<span class="tip">(适合计时发放酬劳的小时工，兼职员工)</span></el-radio>
+        <el-radio v-model="timeType.hourCostInputType" :label="1" style="width:100%;margin-left:10px;">{{ $t('visittwo') }}<span class="tip">{{ $t('timeemployees') }}</span></el-radio>
         </div>
         <!--设置时长样式内容-->
-        <p style="margin-left:10px;color:#666;">员工工作时长上报方式设置</p>
+        <p style="margin-left:10px;color:#666;">{{ $t('employeeworkinghours') }}</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="6" >
         <!-- 上下午固定时长-->
         <div class="panel" >
-        <el-radio v-model="timeType.type" :label="0" style="width:100%">全天/上午/下午便捷上报
+        <el-radio v-model="timeType.type" :label="0" style="width:100%">{{ $t('reportintheafternoon') }}
         <el-form  ref="form1" :model="timeType" :rules="rules" label-width="5rem" style="color:#333;">
         <el-form-item>
         </el-form-item>  
-        <span style="color:#999;display:block;line-height:2rem;margin:1rem 0;">请设置时长</span>
-        <el-form-item label="全天时长" prop="allday">
-            <el-select v-model="timeType.allday" placeholder="请选择工作时长" style="width:120px;" @change="timeChange">
+        <span style="color:#999;display:block;line-height:2rem;margin:1rem 0;">{{ $t('settheduration') }}</span>
+        <el-form-item :label="$t('daylong')" prop="allday">
+            <el-select v-model="timeType.allday" placeholder="$t('defaultText.pleaseChoose')" style="width:120px;" @change="timeChange">
                 <el-option v-for="item in times" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
             </el-select>
-            小时
-        </el-form-item>
-        <el-form-item label="上午时长" prop="am" >
-            <el-select v-model="timeType.am" placeholder="请选择工作时长" style="width:120px;" @change="timeChange">
+            {{ $t('time.hour') }} 
+            </el-form-item>
+        <el-form-item :label="$t('morningtime')" prop="am" >
+            <el-select v-model="timeType.am" placeholder="$t('defaultText.pleaseChoose')" style="width:120px;" @change="timeChange">
                 <el-option v-for="item in halfTime" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
             </el-select>
-            小时
+            {{ $t('time.hour') }} 
         </el-form-item>
-        <el-form-item label="下午时长" prop="pm" >
-            <el-select v-model="timeType.pm" disabled placeholder="请选择工作时长" style="width:120px;" >
+        <el-form-item :label="$t('afternoontime')" prop="pm" >
+            <el-select v-model="timeType.pm" disabled placeholder="$t('defaultText.pleaseChoose')" style="width:120px;" >
                 <el-option v-for="item in halfTime" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
             </el-select>
-            小时
+            {{ $t('time.hour') }} 
         </el-form-item>
         </el-form>
         </el-radio>
@@ -84,16 +82,16 @@
         <!-- 选择小时数样式 -->
         <el-col :span="6">   
         <div class="panel">
-        <el-radio v-model="timeType.type" :label="1">自行选择工作时长
+        <el-radio v-model="timeType.type" :label="1">{{ $t('chooseyourownhours') }}
         <el-form  class="sample" style="color:#333;">
         <p style="color:#999;display:block;line-height:2rem">
-            展示样例
+            {{ $t('showthesample') }} 
         </p>
-        <el-form-item label="工作时长">
+        <el-form-item :label="$t('screening.workTime')">
             <el-select v-model="selectTime" style="width:120px">
                 <el-option v-for="item in timeRange" :key="item" :value="item.toFixed(1)">{{item.toFixed(1)}}</el-option>
             </el-select>
-            小时
+            {{ $t('time.hour') }} 
         </el-form-item>
         
         </el-form>
@@ -104,13 +102,13 @@
         <!--选择时间段样式 -->
         <el-col :span="6">  
         <div  class="panel" >
-            <el-radio v-model="timeType.type" :label="2">自行选择时间范围
+            <el-radio v-model="timeType.type" :label="2">{{ $t('owntimeframe') }}
             <el-form class="sample" style="color:#333;">
             <p style="color:#999;display:block;line-height:2rem">
-            展示样例
+            {{ $t('showthesample') }} 
             </p>
             
-            <el-form-item label="开始时间">
+            <el-form-item :label="$t('starttimes')">
                <el-time-picker
                style="width:160px;"
                     v-model="startTime"
@@ -119,10 +117,10 @@
                         end: '18:30'
                     }"
                     format="HH:mm"
-                    placeholder="任意时间点">
+                    :placeholder="$t('pointintime')">
                 </el-time-picker>
             </el-form-item>
-            <el-form-item label="结束时间">
+            <el-form-item :label="$t('time.endTime')">
                <el-time-picker
                style="width:160px;"
                             v-model="endTime"
@@ -132,13 +130,13 @@
                                 minTime: startTime
                             }"
                             format="HH:mm"
-                            placeholder="任意时间点">
+                            :placeholder="$t('pointintime')">
                         </el-time-picker>
             </el-form-item>
             </el-form>
             </el-radio> 
             <div v-if="timeType.type == 2">
-                <el-link :underline="false" type="primary" @click="setupRest">设置休息时间段</el-link>
+                <el-link :underline="false" type="primary" @click="setupRest">{{ $t('settingrestPeriod') }}</el-link>
                 <div style="padding: 10px 2px;">
                 <el-tag style="margin: 0 8px 8px 0;" size="small" type="info" v-for="item in restList" :key="item.id">{{item.startTime + '-' + item.endTime}}</el-tag>
                 </div>
@@ -149,16 +147,16 @@
         <!--选择按比例分配样式 -->
         <el-col :span="6">  
         <div  class="panel" >
-            <el-radio v-model="timeType.type" :label="3">按比例分配时间
+            <el-radio v-model="timeType.type" :label="3">{{ $t('timeproportionally') }}
             <el-form class="sample" style="color:#333;">
             <p style="color:#999;display:block;line-height:2rem">
-            展示样例
+            {{ $t('showthesample') }} 
             </p>
             
-            <el-form-item label="用时占比">
+            <el-form-item :label="$t('lable.percentageOfTime')">
                 <!-- <el-col span="6">用时占比： </el-col> -->
                 <el-col span="12" style="padding-left:0;padding-right:0;"><el-slider v-model="progress" :step="5" style="width:100px;" ></el-slider></el-col>
-                <el-col span="2" style="padding-left:0;padding-right:0;"><span style="margin-left:10px;"><span style="margin-right:10px;">{{progress}}%</span>{{(progress*8/100).toFixed(1)}}小时</span></el-col>
+                <el-col span="2" style="padding-left:0;padding-right:0;"><span style="margin-left:10px;"><span style="margin-right:10px;">{{progress}}%</span>{{(progress*8/100).toFixed(1)}} {{ $t('time.hour') }}</span></el-col>
             </el-form-item>
             </el-form>
             </el-radio> 
@@ -166,15 +164,15 @@
         </el-col>
         </el-row>
         <!--设置时长样式内容-->
-        <p style="margin-left:10px;color:#666;">填报提醒设置</p>
+        <p style="margin-left:10px;color:#666;">{{ $t('reminderSettings') }}</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
             <el-col :span="24" >
                 <div class="panel" style="height:200px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
-                    <el-form-item label="提醒时间 " prop="alertTime">
+                    <el-form-item :label="$t('remindertime') " prop="alertTime">
                         <el-time-picker 
                                 v-model="timeType.alertTime"
-                                placeholder="提醒时间"
+                                :placeholder="$t('remindertime')"
                                 style="width:120px;"
                                 format="HH:mm"
                                 value-format="HH:mm"
@@ -185,19 +183,19 @@
                             </el-time-picker>
                     </el-form-item>
                     <el-form-item prop="alertType" style="margin-left:10px">
-                        <el-select v-model="timeType.alertType" placeholder="请选择提醒方式">
-                            <el-option label="每日提醒当天漏填" :value="0"></el-option>
-                            <el-option label="每日提醒昨天漏填" :value="1"></el-option>
+                        <el-select v-model="timeType.alertType" :placeholder="$t('remindermethod')">
+                            <el-option :label="$t('missingfill')" :value="0"></el-option>
+                            <el-option :label="$t('missingfills')" :value="1"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="提醒文本" prop="alertMsg" style="width: 50%;margin-left:10px;">
-                            <el-input placeholder="请输入提醒文本" v-model="timeType.alertMsg" clearable class="apu" maxlength="20"></el-input>
+                    <el-form-item :label="$t('remindertext')" prop="alertMsg" style="width: 50%;margin-left:10px;">
+                            <el-input :placeholder="$t('peaseenterthe')" v-model="timeType.alertMsg" clearable class="apu" maxlength="20"></el-input>
                     </el-form-item>
                     </el-form>
                     <div class="underpanel">
                         <div class="whiteList_head">
-                            <span style="float:left;color:#999">不提醒人员设置</span>
-                            <el-link type="primary" style="float:left;margin-left:15px" :underline="false" @click="addWhite">添加</el-link>
+                            <span style="float:left;color:#999">{{ $t('personneltoset') }}</span>
+                            <el-link type="primary" style="float:left;margin-left:15px" :underline="false" @click="addWhite">{{ $t('addTian') }}</el-link>
                         </div>
                         <div class="whiteList_content">
                             <el-tag style="margin:10px 0 0 10px" v-for="item in whiteList" :key="item.id" closable @close="whiteDelete(item)">{{item.label}}</el-tag>
@@ -207,29 +205,29 @@
             </el-col>
         </el-row>
 <!-- 设置员工可补填的时间 -->
-        <p style="margin-left:10px;color:#666;">员工填报日报时间设置</p>
+        <p style="margin-left:10px;color:#666;">{{ $t('timesetting') }}</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="24" >
             <div class="panel" style="height:120px;">
                 <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                  
-                <el-form-item label="补填时间" prop="fillMonths">
+                <el-form-item :label="$t('filltime')" prop="fillMonths">
                     <el-select v-model="timeType.fillMonths" >
                         <el-option v-for="item in monthTimeList" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
-                    <span style="color:#666;margin-left:10px;">(说明：系统管理员为员工代填日报时不受补填时间的限制)</span>
-                    <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" label="可提前填报" /></span>
+                    <span style="color:#666;margin-left:10px;">{{ $t('instructions') }}</span>
+                    <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" :label="$t('filledinadvance')" /></span>
                 </el-form-item><br>
-                <el-form-item label="员工填报及时日" prop="timeliness" v-if="user.company.packageProject">
+                <el-form-item :label="$t('timelydate')" prop="timeliness" v-if="user.company.packageProject">
                     <el-select v-model="timeType.timeliness">
-                        <el-option label="当天" :value="0"></el-option>
-                        <el-option label="第二天" :value="1"></el-option>
-                        <el-option label="第三天" :value="2"></el-option>
+                        <el-option :label="$t('dang-tian')" :value="0"></el-option>
+                        <el-option :label="$t('oneday')" :value="1"></el-option>
+                        <el-option :label="$t('shreeday')" :value="2"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日报自动审核时限：" style="color:#606266" v-if="user.timeType.reportAutoApprove">
-                    待审核<el-input-number v-model="timeType.reportAutoApproveDays" style="width:150px;margin:0 10px" min="1"></el-input-number>天后
+                <el-form-item :label="$t('dailyreview')" style="color:#606266" v-if="user.timeType.reportAutoApprove">
+                    {{ $t('state.WaitingAudit') }}<el-input-number v-model="timeType.reportAutoApproveDays" style="width:150px;margin:0 10px" min="1"></el-input-number>{{ $t('dyas') }}
                 </el-form-item>
                 </el-form>
             </div>
@@ -237,23 +235,23 @@
         </el-row>
         <!-- 设置研究中心 -->
         <div class="yanjiu">
-            <p style="margin-left:10px;color:#666;">自定义日报填报列表</p>
+            <p style="margin-left:10px;color:#666;">{{ $t('dailyfilling') }}</p>
             <el-switch style="margin-left: 40px" v-model="timeType.customDegreeActive" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">开启后系统可按该字段数据进行分类统计工时成本</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('afteritisenabled') }}</span>
             <template v-if="timeType.customDegreeActive">
             <el-switch style="margin-left: 40px" v-model="timeType.customDegreeStatus" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">是否为必填项</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
             </template>
         </div>
         <el-row v-if="timeType.customDegreeActive" :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
             <el-col :span="24" >
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
-                        <el-form-item label="字段名称 ">
-                            <el-input placeholder="请输入字段名称" maxlength="6" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
+                        <el-form-item :label="$t('fieldnames') ">
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="6" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
                         </el-form-item>
                         <el-form-item>
-                            <el-button type="primary" size="small" @click="bianji()">数据维护</el-button>
+                            <el-button type="primary" size="small" @click="bianji()">{{ $t('datamaintenance') }}</el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -261,25 +259,25 @@
         </el-row>
         <!-- 设置数值填报 -->
         <div class="yanjiu" v-if="user.company.packageProject==1">
-            <p style="margin-left:10px;color:#666;"><span>自定义日报填报数值</span></p>
+            <p style="margin-left:10px;color:#666;"><span>{{ $t('dailyfillingvalue') }}</span></p>
             <el-switch style="margin-left: 40px" v-model="timeType.customDataActive" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">开启后可按项目，部门和人员统计该数值</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('afterthisunctionisenabled') }}</span>
             <template v-if="timeType.customDataActive">
             <el-switch style="margin-left: 40px" v-model="timeType.customDataStatus" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">是否为必填项</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
             </template>
         </div>
         <el-row v-if="timeType.customDataActive && user.company.packageProject==1" :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
             <el-col :span="24" >
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType" style="margin-top:10px;">
-                        <el-form-item label="字段名称 ">
-                            <el-input placeholder="请输入字段名称" maxlength="5" size="small" v-model="timeType.customDataName" clearable> </el-input>
+                        <el-form-item :label="$t('fieldnames') ">
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="5" size="small" v-model="timeType.customDataName" clearable> </el-input>
                         </el-form-item>
-                        <el-form-item label="是否开启最大值限制 " style="margin-left:10px;">
+                        <el-form-item :label="$t('maximumvaluelimit') " style="margin-left:10px;">
                             <el-switch v-model="timeType.customDataMaxStatus" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
                         </el-form-item>
-                        <el-form-item label="最大值 " style="margin-left:10px;" v-if="timeType.customDataMaxStatus">
+                        <el-form-item :label="$t('maximum') " style="margin-left:10px;" v-if="timeType.customDataMaxStatus">
                             <el-input-number v-model="timeType.customDataMaxValue"></el-input-number>
                         </el-form-item>
                     </el-form>
@@ -289,35 +287,35 @@
 
         <!-- 设置数值填报 -->
         <div class="yanjiu" >
-            <p style="margin-left:10px;color:#666;"><span>自定义日报填报文本</span></p>
+            <p style="margin-left:10px;color:#666;"><span>{{ $t('fillingtext') }}</span></p>
             <el-switch style="margin-left: 40px" v-model="timeType.customTextActive" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">开启后可员工可额外填写该信息</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('additionalinformation') }}</span>
             <template v-if="timeType.customTextActive">
             <el-switch style="margin-left: 40px" v-model="timeType.customTextStatus" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">是否为必填项</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
             </template>
         </div>
         <el-row v-if="timeType.customTextActive" :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
             <el-col :span="24" >
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
-                        <el-form-item label="字段名称 ">
-                            <el-input placeholder="请输入字段名称" maxlength="5" size="small" v-model="timeType.customTextName" clearable> </el-input>
+                        <el-form-item :label="$t('fieldnames') ">
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="5" size="small" v-model="timeType.customTextName" clearable> </el-input>
                         </el-form-item>
                     </el-form>
                 </div>
             </el-col>
         </el-row>
         <div class="yanjiu">
-            <span style="margin-left:10px;color:#666;">{{user.companyId==781?'具体内容与结果':'工作事项'}}</span>
+            <span style="margin-left:10px;color:#666;">{{user.companyId==781?$t('other.specificcontentandresults'):$t('other.workMatters')}}</span>
             <el-switch :style="user.companyId==781?'margin-left:66px;':'margin-left:108px;'" v-model="timeType.workContentState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span style="margin-left:10px;color:#999;">是否为必填项</span>
+            <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
         </div>
         <!-- 是否开启导入审核 -->
         <div class="yanjiu">
-            <p style="margin-left:10px;color:#666;">是否开启导入审核</p>
+            <p style="margin-left:10px;color:#666;">{{ $t('importauditing') }}</p>
             <el-switch style="margin-left: 55px" v-model="timeType.needDeptAudit" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            <span v-if="timeType.needDeptAudit == 1" style="margin-left:10px;color:#999;">审核人为各部门直属领导</span>
+            <span v-if="timeType.needDeptAudit == 1" style="margin-left:10px;color:#999;">{{ $t('eachdepartment') }}</span>
         </div>
 
         <!-- 是否开启主项目管理 -->
@@ -328,90 +326,89 @@
         </div> -->
 
         <div style="width:80px;margin:0 auto;padding:20px;">
-            <el-button  type="primary" @click="submitInsert" :loading="addLoading">保存</el-button>
+            <el-button  type="primary" @click="submitInsert" :loading="addLoading">{{ $t('save') }}</el-button>
         </div>
         <!-- 维护数据 -->
-        <el-dialog title="维护数据列表" show-header="false" v-if="subProjectVisible" :visible.sync="subProjectVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog :title="$t('maintenanceDatalist')" show-header="false" v-if="subProjectVisible" :visible.sync="subProjectVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-table :data="subProjectList" highlight-current-row  height="400" style="width: 100%;">
-            <el-table-column prop="id" width="60" label="序号">
+            <el-table-column prop="id" width="60" :label="$t('headerTop.serialNumber')">
                 <template slot-scope="scope" >
                     {{scope.$index + 1}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" ></el-table-column>
-            <el-table-column label="操作" width="150">
+            <el-table-column prop="name" :label="$t('names')" ></el-table-column>
+            <el-table-column :label="$t('operation')" width="150">
                 <template slot-scope="scope" >
-                    <el-button size="small" type="primary" @click="addNewSubProject(scope.row)">编辑</el-button>
-                    <el-button size="small" type="danger" @click="deleteSubPro(scope.row)">删除</el-button>
+                    <el-button size="small" type="primary" @click="addNewSubProject(scope.row)">{{ $t('bian-ji') }}</el-button>
+                    <el-button size="small" type="danger" @click="deleteSubPro(scope.row)">{{ $t('btn.delete') }}</el-button>
                 </template>
             </el-table-column>
 
             </el-table>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="subProjectVisible = false" >关闭</el-button>
-                <el-button type="primary" @click="addNewSubProject()" >新增数据</el-button>
+                <el-button type="primary" @click="subProjectVisible = false" >{{ $t('Shutdown') }}</el-button>
+                <el-button type="primary" @click="addNewSubProject()" >{{ $t('addData') }}</el-button>
             </div>
         </el-dialog>
         <!-- 新增子项目弹出框 -->
-        <el-dialog title="新增/修改维护数据" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog :title="$t('addedormodifiedthemaintenancedata')" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form2" :model="addfm" :rules="ruless" label-width="100px">
-                <el-form-item label="名称" prop="name">
-                    <el-input v-model="addfm.name" placeholder="请输入名称" clearable></el-input>
+                <el-form-item :label="$t('names')" prop="name">
+                    <el-input v-model="addfm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click.native="addSubProject = false">取消</el-button>
-                <el-button type="primary" @click="submitInsertSubProject" :loading="addLoading">提交</el-button>
+                <el-button @click.native="addSubProject = false">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitInsertSubProject" :loading="addLoading">{{ $t('btn.submit') }}</el-button>
             </div>
         </el-dialog>
 
         <!-- 设置休息时间段 -->
-        <el-dialog title="设置休息时间段" v-if="setupRestDialog" :visible.sync="setupRestDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog :title="$t('settingrestPeriod')" v-if="setupRestDialog" :visible.sync="setupRestDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-table :data="restList" highlight-current-row height="400" style="width: 100%;">
-                <el-table-column prop="id" width="60" label="序号">
+                <el-table-column prop="id" width="60" :label="$t('headerTop.serialNumber')">
                     <template slot-scope="scope" >
                         {{scope.$index + 1}}
                     </template>
                 </el-table-column>
-                <el-table-column label="时间段">
+                <el-table-column :label="$t('message.period')">
                     <template slot-scope="scope">
                         <span>{{scope.row.startTime + '-' + scope.row.endTime}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="150">
+                <el-table-column :label="$t('operation')" width="150">
                     <template slot-scope="scope" >
-                        <el-button size="small" type="primary" @click="setupRestEdit(scope.row)">编辑</el-button>
-                        <el-button size="small" type="danger" @click="setupRestDelete(scope.row)">删除</el-button>
+                        <el-button size="small" type="primary" @click="setupRestEdit(scope.row)">{{ $t('bian-ji') }}</el-button>
+                        <el-button size="small" type="danger" @click="setupRestDelete(scope.row)">{{ $t('btn.delete') }}</el-button>
                     </template>
                 </el-table-column>
             </el-table>
             <div slot="footer" class="dialog-footer">
-                <el-button @click.native="setupRestDialog = false">关闭</el-button>
-                <el-button type="primary" @click="setupRestNew">新增时间段</el-button>
+                <el-button @click.native="setupRestDialog = false">{{ $t('Shutdown') }}</el-button>
+                <el-button type="primary" @click="setupRestNew">{{ $t('xin-zeng-shi-jian-duan') }}</el-button>
             </div>
-
-            <el-dialog :title="setupItemId == null ? '新增' : '修改'" v-if="setupRestAppendDialog" :visible.sync="setupRestAppendDialog" :close-on-click-modal="false" customClass="customWidth" width="400px" append-to-body>
+            <el-dialog :title="setupItemId == null ? $t('add') : $t('xiu-gai')" v-if="setupRestAppendDialog" :visible.sync="setupRestAppendDialog" :close-on-click-modal="false" customClass="customWidth" width="400px" append-to-body>
                 <el-form label-width="100px">
-                    <el-form-item label="开始时间">
-                        <el-time-picker v-model="restTime.startTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm" @change="timeRule(0)"></el-time-picker>
+                    <el-form-item :label="$t('starttimes')">
+                        <el-time-picker v-model="restTime.startTime" :placeholder="$t('message.Pleaseselectatime')" format="HH:mm" value-format="HH:mm" @change="timeRule(0)"></el-time-picker>
                     </el-form-item>
-                    <el-form-item label="结束时间">
-                        <el-time-picker v-model="restTime.endTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm" @change="timeRule(1)"></el-time-picker>
+                    <el-form-item :label="$t('time.endTime')">
+                        <el-time-picker v-model="restTime.endTime" :placeholder="$t('message.Pleaseselectatime')" format="HH:mm" value-format="HH:mm" @change="timeRule(1)"></el-time-picker>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button @click.native="setupRestAppendDialog = false">取消</el-button>
-                    <el-button type="primary" @click="setupRestSure()">确认</el-button>
+                    <el-button @click.native="setupRestAppendDialog = false">{{ $t('btn.cancel') }}</el-button>
+                    <el-button type="primary" @click="setupRestSure()">{{ $t('btn.determine') }}</el-button>
                 </div>
             </el-dialog>
         </el-dialog>
 
         <!-- 日报提醒白名单 -->
-        <el-dialog title="选择人员"  v-if="whiteListDialog" :visible.sync="whiteListDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog :title="$t('screening.selectPeople')"  v-if="whiteListDialog" :visible.sync="whiteListDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <div class="tree" style="height:400px">
                 <el-scrollbar style="height:100%">
                     <el-input
-                    placeholder="输入关键字进行过滤"
+                    :placeholder="$t('keywordfiltering')"
                     v-model="filterText">
                     </el-input>
                 <el-tree :data="whiteListAll" show-checkbox :props="defaultProps" node-key="id"
@@ -421,8 +418,8 @@
             </div>
             <!-- <div>已选中&nbsp;{{chosenMembCount}}&nbsp;人</div>         :default-checked-keys="alreadyPartArray"  @check-change="onTreeItemChange" -->
             <div slot="footer" class="dialog-footer">
-                <el-button  @click="whiteListDialog = false">取消</el-button>
-                <el-button type="primary" @click="setWhiteList()">确定</el-button>
+                <el-button  @click="whiteListDialog = false">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="setWhiteList()">{{ $t('btn.determine') }}</el-button>
             </div>
         </el-dialog>
     </section>
@@ -433,7 +430,7 @@
     export default {
         data() {
             return {
-                monthTimeList:[{id:0, name:'不限制'},{id:1, name:'仅可补填当月'},{id:2, name:'可补填到上个月'},{id:3, name:'可补填到上上月'},{id:4, name:'可补填7天内日报'},{id:5, name:'可补填前1天日报'}],
+                monthTimeList:[{id:0, name:this.$t('donlimit')},{id:1, name:this.$t('canbefilled')},{id:2, name:this.$t('lastmonth')},{id:3, name:this.$t('lastlastmonth')},{id:4, name:this.$t('newspaperwithin')},{id:5, name:this.$t('previousdaydaily')}],
                 progress:30,
                 startTime:null,
                 endTime:null,
@@ -458,12 +455,12 @@
                 needDeptAudit: false,
                 customDegreeName: '',
                 rules: {
-                    allday: [{ required: true, message: "请选择全天工作时长", trigger: "blur" }],
-                    am: [{ required: true, message: "请输入上午工作时长", trigger: "blur" }],
-                    pm: [{ required: true, message: "请输入下午工作时长", trigger: "blur" }],
+                    allday: [{ required: true, message: this.$t('dayworkinghours'), trigger: "blur" }],
+                    am: [{ required: true, message: this.$t('morningworkinghours'), trigger: "blur" }],
+                    pm: [{ required: true, message: this.$t('afternoonworkinghours'), trigger: "blur" }],
                 },
                 ruless: {
-                    name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+                    name: [{ required: true, message: this.$t('peaseenterthe'), trigger: "blur" }],
                 },
                 subProjectVisible: false,
                 subProjectList: [],//子项目列表
@@ -498,7 +495,24 @@
                 this.$refs.whiteListTree.filter(val);
             }
         },
-        methods: {
+        created() {
+            let height = window.innerHeight;
+            this.tableHeight = height - 195;
+            const that = this;
+            window.onresize = function temp() {
+                that.tableHeight = window.innerHeight - 195;
+            };
+        },
+        mounted() {
+            this.timeRange = []
+            for(let i=0.5; i<=20; i+=0.5){
+                this.timeRange.push(i)
+            }
+            this.initTime();
+            this.getCompanyTimeSetting();
+            this.getRestList()
+        },
+         methods: {
             timeAlldayChange(){
                 if(this.timeType.maxReportTime < this.timeType.allday || this.timeType.lockWorktime){
                     this.timeType.maxReportTime = this.timeType.allday
@@ -572,7 +586,7 @@
                 },res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '删除成功',
+                            message: this.$t('message.successfullyDeleted'),
                             type: 'success'
                         })
                         this.getRestList()
@@ -594,7 +608,7 @@
                         this.restTime.id = this.setupItemId
                     }
                     if(this.restTime.startTime == null || this.restTime.endTime == null){
-                        this.$message('请选择时间段')
+                        this.$message(this.$t('qing-xuan-ze-shi-jian-duan'))
                         return
                     }
                     this.http.post('/time-auto-exclude/addOrMod',this.restTime,
@@ -651,7 +665,7 @@
                             this.listLoading = false;
                             if (res.code == "ok") {
                                 this.$message({
-                                    message: '成功',
+                                    message: this.$t('other.successful'),
                                     type: "success"
                                 });
                                 this.addfm = {name: ''}
@@ -690,9 +704,9 @@
                 this.addSubProject = true;
             },
             deleteSubPro(subProject) {
-                this.$confirm("确定要这条" + subProject.name + "数据吗?","删除", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
+                this.$confirm(this.$t('takethisone') + subProject.name + this.$t('shu-ju-ma'),this.$t('btn.delete'), {
+                    confirmButtonText: this.$t('btn.determine'),
+                    cancelButtonText: this.$t('btn.cancel'),
                     type: "warning"
                 })
                 .then(() => {
@@ -704,14 +718,14 @@
                         this.listLoading = false;
                         if (res.code == "ok") {
                             this.$message({
-                                message: "删除成功",
+                                message: this.$t('message.successfullyDeleted'),
                                 type: "success"
                             });
                             this.bianji();
                         } else {
-                            if(res.msg.indexOf("无法删除1") == '-1') {
+                            if(res.msg.indexOf(this.$t('wu-fa-shan-chu-1')) == '-1') {
                                 this.$message({
-                                    message: '该数据正在使用，无法删除',
+                                    message: this.$t('cannotbedeleted'),
                                     type: "error"
                                 });
                             } else {
@@ -840,7 +854,7 @@
                 },res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '删除成功',
+                            message: this.$t('message.successfullyDeleted'),
                             type: 'success'
                         })
                     }else {
@@ -879,7 +893,7 @@
                 },res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '添加成功',
+                            message: this.$t('addsuccessful'),
                             type: 'success'
                         })
                         this.whiteListDialog = false
@@ -908,7 +922,7 @@
                         if(param.customDegreeActive) {
                             if(param.customDegreeName.replace(/^ +| +$/g,'') == ''){
                                 this.$message({
-                                    message:"请输入[自定义日报填报列表]的字段名称",
+                                    message:this.$t('customDailyFillingList'),
                                     type:"error"
                                 })
                                 return
@@ -920,7 +934,7 @@
                         if(param.customDataActive) {
                             if(param.customDataName.replace(/^ +| +$/g,'') == ''){
                                 this.$message({
-                                    message:"请输入[自定义日报填报数值]的字段名称",
+                                    message:this.$t('customDailyFillingLists'),
                                     type:"error"
                                 })
                                 return
@@ -932,7 +946,7 @@
                         if(param.customTextActive) {
                             if(param.customTextName == null || param.customTextName.replace(/^ +| +$/g,'') == ''){
                                 this.$message({
-                                    message:"请输入[自定义日报填报文本]的字段名称",
+                                    message:this.$t('customDailyFillingListss'),
                                     type:"error"
                                 })
                                 return
@@ -956,7 +970,7 @@
                         if(param.payOvertime) {
                             if(param.overtimeRatio == 0 || param.overtimeRatio == '') {
                                 this.$message({
-                                    message:"请设置加班几倍工资",
+                                    message:this.$t('overtimepay'),
                                     type:"error"
                                 })
                                 return
@@ -976,7 +990,7 @@
                                 this.listLoading = false;
                                 if (res.code == "ok") {
                                     this.$message({
-                                        message: '保存成功',
+                                        message: this.$t('savesuccess'),
                                         type: "success"
                                     });
                                     this.user.timeType = param;
@@ -1082,23 +1096,6 @@
             }
 
         },
-        created() {
-            let height = window.innerHeight;
-            this.tableHeight = height - 195;
-            const that = this;
-            window.onresize = function temp() {
-                that.tableHeight = window.innerHeight - 195;
-            };
-        },
-        mounted() {
-            this.timeRange = []
-            for(let i=0.5; i<=20; i+=0.5){
-                this.timeRange.push(i)
-            }
-            this.initTime();
-            this.getCompanyTimeSetting();
-            this.getRestList()
-        }
     };
 </script>
 

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -2,7 +2,7 @@
     <div>
         <van-nav-bar title="填写日报" left-text="返回" @click-left="back" fixed left-arrow/>
 
-        <van-form class="login_form">
+        <van-form class="login_form" ref="loginForm">
             <div>
             <van-field readonly clickable name="datetimePicker" :value="form.createDate" label="时间选择" placeholder="点击选择时间" 
             @click="showPicker = true" :rules="rules.createDate" />
@@ -313,7 +313,7 @@
             <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
                 <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
-                    <p>{{item.projectName}}</p> 
+                    <p>{{item.projectName}}</p>
                     <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
                 </div>
             </div>
@@ -1322,276 +1322,282 @@ import timetoolVue from '../timetool/timetool.vue';
             },
             // 提交日报
             submitReport() {
-                this.dateAr = []
-                let alp = []
-                if(this.user.timeType.multiWorktime == 1) {
-                    for(var p in this.form.domains) {
-                        var slll = this.form.domains[p]
-                        for(var o in slll.worktimeList) {
-                            if(slll.worktimeList[o].startTime || slll.worktimeList[o].endTime) {
-                                let objs = {}
-                                objs.s = slll.worktimeList[o].startTime
-                                objs.e = slll.worktimeList[o].endTime
-                                alp.push(objs)
+                this.$refs.loginForm.validate().then(
+                ()=>{
+                // 验证通过
+                    this.dateAr = []
+                    let alp = []
+                    if(this.user.timeType.multiWorktime == 1) {
+                        for(var p in this.form.domains) {
+                            var slll = this.form.domains[p]
+                            for(var o in slll.worktimeList) {
+                                if(slll.worktimeList[o].startTime || slll.worktimeList[o].endTime) {
+                                    let objs = {}
+                                    objs.s = slll.worktimeList[o].startTime
+                                    objs.e = slll.worktimeList[o].endTime
+                                    alp.push(objs)
+                                }
                             }
                         }
-                    }
-                }else{
-                    for(let i in this.form.domains){
-                        let objs = {}
-                        objs.s = this.form.domains[i].startTime
-                        objs.e = this.form.domains[i].endTime
-                        alp.push(objs)
-                    }
-                }
-                this.dateAr = alp
-                    if(this.dateAr.length > 0) {
-                        let trus = this.fns()
-                        if(!trus) {
-                            this.$toast('填写的时间段重叠')
-                            return
-                        }
-                    }
-                
-                
-                // return
-                const toast = this.$toast.loading({
-                    forbidClick: true,
-                    duration: 0
-                });
-                // let formData = new FormData();
-                let formData = new URLSearchParams()
-                formData.append("draft", this.isDraft);
-                if (this.reportTimeType.type == 0) {
-                    var alldayNum = 0;
-                    var amNum = 0;
-                    var pmNum = 0;
-                    for(var i in this.form.domains) {
-                        if (this.form.domains[i].timeType == 0) {
-                            alldayNum ++;
-                        } else if (this.form.domains[i].timeType == 1) {
-                            amNum++;
-                        } else if (this.form.domains[i].timeType == 2) {
-                            pmNum++;
+                    }else{
+                        for(let i in this.form.domains){
+                            let objs = {}
+                            objs.s = this.form.domains[i].startTime
+                            objs.e = this.form.domains[i].endTime
+                            alp.push(objs)
                         }
                     }
-                    if (alldayNum > 1) {
-                        this.$toast.fail("工作时间-全天，只能选择一次");
-                        return;
-                    }
-                    if (amNum > 1) {
-                        this.$toast.fail("工作时间-上午，只能选择一次");
-                        
-                        return;
-                    }
-                    if (pmNum > 1) {
-                        this.$toast.fail("工作时间-下午，只能选择一次");
-                        return;
-                    }
-                    if (alldayNum == 1 && (amNum > 0 || pmNum > 0)) {
-                        this.$toast.fail("工作时间-全天，不能和上下午同时存在");
-                        return;
-                    }
-                } else if (this.reportTimeType.type == 3) {
-                    //总百分比不能超过100%
-                    let total = 0;
-                    this.form.domains.forEach(w=>{total += w.progress});
-                    if (total > 100) {
-                        this.$toast.fail("用时比例之和不能超过100%");
-                        return;
-                    } else if (total < 100) {
-                        this.$toast.fail("工时尚未完全分配，无法提交");
-                        return;
-                    }
-                }
-                if (this.reportTimeType.type == 1 && this.report.time) {
-                            var totalTime = 0;
-                            for (var t=0;t<this.form.domains.length; t++) {
-                                totalTime += parseFloat(this.form.domains[t].workingTime);
-                            }
-                            if (this.report.time.workHours && totalTime > parseFloat(this.report.time.workHours)) {
-                                this.$toast.fail("填报工时之和"+(totalTime)+"h不能超过考勤总工时("+this.report.time.workHours.toFixed(1)+"h)");
-                                return;
+                    this.dateAr = alp
+                        if(this.dateAr.length > 0) {
+                            let trus = this.fns()
+                            if(!trus) {
+                                this.$toast('填写的时间段重叠')
+                                return
                             }
                         }
-                
-                //填字段
-                for(var i in this.form.domains) {
-                    if (this.user.timeType.customDegreeActive == 1) {
-                        if(this.form.domains[i].degreeId) {
-                            formData.append("degreeId", this.form.domains[i].degreeId);
-                        } else {
-                            if(this.user.timeType.customDegreeStatus && this.form.domains[i].wuduList.length){
-                                this.$toast.fail('请选择' + this.user.timeType.customDegreeName)
-                                return
-                            }else{
-                                formData.append("degreeId", -1);
+                    // return
+                    const toast = this.$toast.loading({
+                        forbidClick: true,
+                        duration: 0
+                    });
+                    // let formData = new FormData();
+                    let formData = new URLSearchParams()
+                    formData.append("draft", this.isDraft);
+                    if (this.reportTimeType.type == 0) {
+                        var alldayNum = 0;
+                        var amNum = 0;
+                        var pmNum = 0;
+                        for(var i in this.form.domains) {
+                            if (this.form.domains[i].timeType == 0) {
+                                alldayNum ++;
+                            } else if (this.form.domains[i].timeType == 1) {
+                                amNum++;
+                            } else if (this.form.domains[i].timeType == 2) {
+                                pmNum++;
                             }
+                        }
+                        if (alldayNum > 1) {
+                            this.$toast.fail("工作时间-全天，只能选择一次");
+                            return;
+                        }
+                        if (amNum > 1) {
+                            this.$toast.fail("工作时间-上午，只能选择一次");
                             
+                            return;
+                        }
+                        if (pmNum > 1) {
+                            this.$toast.fail("工作时间-下午，只能选择一次");
+                            return;
+                        }
+                        if (alldayNum == 1 && (amNum > 0 || pmNum > 0)) {
+                            this.$toast.fail("工作时间-全天，不能和上下午同时存在");
+                            return;
                         }
-                    } else {
-                        formData.append("degreeId", -1);
-                    }
-                    if(this.form.domains[i].customData) {
-                        formData.append("customData", this.form.domains[i].customData);
-                    } else {
-                        formData.append("customData", "0");
-                    }
-                    if(this.form.domains[i].customText) {
-                        formData.append("customText", this.form.domains[i].customText);
-                    } else {
-                        formData.append("customText", "-");
-                    }
-                    
-                    if (this.form.domains[i].id) {
-                        formData.append("id", this.form.domains[i].id);
-                    } else {
-                        formData.append("id", -1);
-                    }
-                    formData.append("projectId", parseFloat(this.form.domains[i].projectId));
-                    if (this.form.domains[i].subProjectId) {
-                        formData.append("subProjectId", this.form.domains[i].subProjectId);
-                    } else {
-                        formData.append("subProjectId", 0);
-                    }
-                    if (this.form.domains[i].groupId) {
-                        formData.append("groupId", this.form.domains[i].groupId);
-                    } else {
-                        formData.append("groupId", 0);
-                    }
-                    if (this.form.domains[i].stage) {
-                        formData.append("stage", this.form.domains[i].stage);
-                    } else {
-                        formData.append("stage", '-');
-                    }
-                    formData.append("reportTimeType", this.reportTimeType.type);
-                    formData.append("multiWorktime", this.reportTimeType.multiWorktime);
-                    if (this.reportTimeType.type == 0) {
-                        formData.append("timeType", this.form.domains[i].timeType);
-                        formData.append("workingTime", parseFloat(this.form.domains[i].workingTime));
-                    } else if (this.reportTimeType.type == 1) {
-                        formData.append("workingTime", parseFloat(this.form.domains[i].workingTime));
-                    } else if (this.reportTimeType.type == 2) {
-                        formData.append("startTime", this.form.domains[i].startTime);
-                        formData.append("endTime",this.form.domains[i].endTime);
                     } else if (this.reportTimeType.type == 3) {
-                        formData.append("progress", this.form.domains[i].progress);
-                        formData.append("workingTime",this.form.domains[i].workingTime);
-                    }
-                    
-                    if (this.form.domains[i].taskId) {
-                        formData.append("taskId", this.form.domains[i].taskId);
-                    } else {
-                        formData.append("taskId", 0);
-                    }
-                    if (this.form.domains[i].taskFinish == true) {
-                        formData.append("taskFinish", 1);
-                    } else {
-                        formData.append("taskFinish", 0);
-                    }
-                    formData.append("createDate", this.form.createDate);
-                    formData.append("isOvertime", this.form.domains[i].isOvertime?1:0);
-                    if (this.form.domains[i].overtimeHours && this.form.domains[i].isOvertime == 1) {
-                        formData.append("overtimeHours", this.form.domains[i].overtimeHours);
-                    } else {
-                        formData.append("overtimeHours", 0);
-                    }
-                    if(this.form.domains[i].basecostId){
-                        formData.append("basecostId", this.form.domains[i].basecostId);
-                    }
-                    
-
-
-                    //项目专业进度
-                    if (this.form.domains[i].professionProgress) {
-                        let m = JSON.stringify(this.form.domains[i].professionProgress);
-                        m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
-                        formData.append("professionProgress", m);
-                    } else {
-                        formData.append("professionProgress", "[]");
-                    }
-                    //图片的处理，serverPic是当前所有的照片
-                    if (this.form.domains[i].serverPics) {
-                        let m = JSON.stringify(this.form.domains[i].serverPics);
-                        m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
-                        formData.append("pics", m);
-                    } else {
-                        formData.append("pics", "@");
+                        //总百分比不能超过100%
+                        let total = 0;
+                        this.form.domains.forEach(w=>{total += w.progress});
+                        if (total > 100) {
+                            this.$toast.fail("用时比例之和不能超过100%");
+                            return;
+                        } else if (total < 100) {
+                            this.$toast.fail("工时尚未完全分配，无法提交");
+                            return;
+                        }
                     }
-                    
-                    //处理多个时间事项
-                    if (this.reportTimeType.multiWorktime == 1) {
-                        //检查时间是否有重叠
-                        var workList = this.form.domains[i].worktimeList;
-                        for (var j=0;j<workList.length; j++) {
-                            var curItem = workList[j];
-                            if (curItem.startTime == null || curItem.endTime == null) {
-                                this.$toast.fail("请设置工作时间");
-                                return;
+                    if (this.reportTimeType.type == 1 && this.report.time) {
+                                var totalTime = 0;
+                                for (var t=0;t<this.form.domains.length; t++) {
+                                    totalTime += parseFloat(this.form.domains[t].workingTime);
+                                }
+                                if (this.report.time.workHours && totalTime > parseFloat(this.report.time.workHours)) {
+                                    this.$toast.fail("填报工时之和"+(totalTime)+"h不能超过考勤总工时("+this.report.time.workHours.toFixed(1)+"h)");
+                                    return;
+                                }
                             }
-                            //检查开始时间是否大于结束时间
-                            if (curItem.startTime >= curItem.endTime) {
-                                this.$toast.fail("时间段"+curItem.startTime+'-'+curItem.endTime+"有误："+ 
-                                        "结束时间必须大于开始时间");
-                                return;
+                    //填字段
+                    for(var i in this.form.domains) {
+                        if (this.user.timeType.customDegreeActive == 1) {
+                            if(this.form.domains[i].degreeId) {
+                                formData.append("degreeId", this.form.domains[i].degreeId);
+                            } else {
+                                if(this.user.timeType.customDegreeStatus && this.form.domains[i].wuduList.length){
+                                    this.$toast.fail('请选择' + this.user.timeType.customDegreeName)
+                                    return
+                                }else{
+                                    formData.append("degreeId", -1);
+                                }
+                                
                             }
-                            for (var p = j+1;p<workList.length; p++) {
-                                var jItem = workList[p];
-                                if ((jItem.startTime>=curItem.startTime&&jItem.startTime < curItem.endTime)
-                                        || (jItem.endTime>curItem.startTime&&jItem.endTime <= curItem.endTime)) {
-                                    
-                                    this.$toast.fail("时间段"+curItem.startTime+'-'+curItem.endTime+"与"+ 
-                                            jItem.startTime+'-'+jItem.endTime+ "存在重叠，请修改。");
+                        } else {
+                            formData.append("degreeId", -1);
+                        }
+                        if(this.form.domains[i].customData) {
+                            formData.append("customData", this.form.domains[i].customData);
+                        } else {
+                            formData.append("customData", "0");
+                        }
+                        if(this.form.domains[i].customText) {
+                            formData.append("customText", this.form.domains[i].customText);
+                        } else {
+                            formData.append("customText", "-");
+                        }
+                        
+                        if (this.form.domains[i].id) {
+                            formData.append("id", this.form.domains[i].id);
+                        } else {
+                            formData.append("id", -1);
+                        }
+                        formData.append("projectId", parseFloat(this.form.domains[i].projectId));
+                        if (this.form.domains[i].subProjectId) {
+                            formData.append("subProjectId", this.form.domains[i].subProjectId);
+                        } else {
+                            formData.append("subProjectId", 0);
+                        }
+                        if (this.form.domains[i].groupId) {
+                            formData.append("groupId", this.form.domains[i].groupId);
+                        } else {
+                            formData.append("groupId", 0);
+                        }
+                        if (this.form.domains[i].stage) {
+                            formData.append("stage", this.form.domains[i].stage);
+                        } else {
+                            formData.append("stage", '-');
+                        }
+                        formData.append("reportTimeType", this.reportTimeType.type);
+                        formData.append("multiWorktime", this.reportTimeType.multiWorktime);
+                        if (this.reportTimeType.type == 0) {
+                            formData.append("timeType", this.form.domains[i].timeType);
+                            formData.append("workingTime", parseFloat(this.form.domains[i].workingTime));
+                        } else if (this.reportTimeType.type == 1) {
+                            formData.append("workingTime", parseFloat(this.form.domains[i].workingTime));
+                        } else if (this.reportTimeType.type == 2) {
+                            formData.append("startTime", this.form.domains[i].startTime);
+                            formData.append("endTime",this.form.domains[i].endTime);
+                        } else if (this.reportTimeType.type == 3) {
+                            formData.append("progress", this.form.domains[i].progress);
+                            formData.append("workingTime",this.form.domains[i].workingTime);
+                        }
+                        
+                        if (this.form.domains[i].taskId) {
+                            formData.append("taskId", this.form.domains[i].taskId);
+                        } else {
+                            formData.append("taskId", 0);
+                        }
+                        if (this.form.domains[i].taskFinish == true) {
+                            formData.append("taskFinish", 1);
+                        } else {
+                            formData.append("taskFinish", 0);
+                        }
+                        formData.append("createDate", this.form.createDate);
+                        formData.append("isOvertime", this.form.domains[i].isOvertime?1:0);
+                        if (this.form.domains[i].overtimeHours && this.form.domains[i].isOvertime == 1) {
+                            formData.append("overtimeHours", this.form.domains[i].overtimeHours);
+                        } else {
+                            formData.append("overtimeHours", 0);
+                        }
+                        if(this.form.domains[i].basecostId){
+                            formData.append("basecostId", this.form.domains[i].basecostId);
+                        }
+                        
+
+
+                        //项目专业进度
+                        if (this.form.domains[i].professionProgress) {
+                            let m = JSON.stringify(this.form.domains[i].professionProgress);
+                            m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
+                            formData.append("professionProgress", m);
+                        } else {
+                            formData.append("professionProgress", "[]");
+                        }
+                        //图片的处理，serverPic是当前所有的照片
+                        if (this.form.domains[i].serverPics) {
+                            let m = JSON.stringify(this.form.domains[i].serverPics);
+                            m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
+                            formData.append("pics", m);
+                        } else {
+                            formData.append("pics", "@");
+                        }
+                        
+                        //处理多个时间事项
+                        if (this.reportTimeType.multiWorktime == 1) {
+                            //检查时间是否有重叠
+                            var workList = this.form.domains[i].worktimeList;
+                            for (var j=0;j<workList.length; j++) {
+                                var curItem = workList[j];
+                                if (curItem.startTime == null || curItem.endTime == null) {
+                                    this.$toast.fail("请设置工作时间");
+                                    return;
+                                }
+                                //检查开始时间是否大于结束时间
+                                if (curItem.startTime >= curItem.endTime) {
+                                    this.$toast.fail("时间段"+curItem.startTime+'-'+curItem.endTime+"有误："+ 
+                                            "结束时间必须大于开始时间");
                                     return;
                                 }
+                                for (var p = j+1;p<workList.length; p++) {
+                                    var jItem = workList[p];
+                                    if ((jItem.startTime>=curItem.startTime&&jItem.startTime < curItem.endTime)
+                                            || (jItem.endTime>curItem.startTime&&jItem.endTime <= curItem.endTime)) {
+                                        
+                                        this.$toast.fail("时间段"+curItem.startTime+'-'+curItem.endTime+"与"+ 
+                                                jItem.startTime+'-'+jItem.endTime+ "存在重叠，请修改。");
+                                        return;
+                                    }
+                                }
                             }
-                        }
 
-                        let m = JSON.stringify(this.form.domains[i].worktimeList);
-                        m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
-                        formData.append("content", m);
-                    } else {
-                        if (this.form.domains[i].content) {
-                            formData.append("content", this.form.domains[i].content);
+                            let m = JSON.stringify(this.form.domains[i].worktimeList);
+                            m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
+                            formData.append("content", m);
                         } else {
-                            formData.append("content", '-');
+                            if (this.form.domains[i].content) {
+                                formData.append("content", this.form.domains[i].content);
+                            } else {
+                                formData.append("content", '-');
+                            }
                         }
-                    }
 
-                    //审核人
-                    if (this.form.domains[i].projectAuditorId) {
-                        formData.append("projectAuditorId", this.form.domains[i].projectAuditorId);
-                    } else {
-                        if (this.user.timeType.reportAuditType == 0) {
-                            this.$toast.fail("请指定["+this.form.domains[i].projectName+']项目的审核人');
+                        //审核人
+                        if (this.form.domains[i].projectAuditorId) {
+                            formData.append("projectAuditorId", this.form.domains[i].projectAuditorId);
                         } else {
-                            if (this.form.domains[i].taskGroups.length == 0) {
-                                this.$toast.fail("您在["+this.form.domains[i].projectName+"]项目上尚无参与的任务分组");
-                            } else if (!this.form.domains[i].groupId) {
-                                this.$toast.fail("请选择["+this.form.domains[i].projectName+"]项目的任务分组");
+                            if (this.user.timeType.reportAuditType == 0) {
+                                this.$toast.fail("请指定["+this.form.domains[i].projectName+']项目的审核人');
                             } else {
-                                this.$toast.fail("请先设置["+this.form.domains[i].projectName+']-['+this.form.domains[i].groupName+']的分组负责人');
+                                if (this.form.domains[i].taskGroups.length == 0) {
+                                    this.$toast.fail("您在["+this.form.domains[i].projectName+"]项目上尚无参与的任务分组");
+                                } else if (!this.form.domains[i].groupId) {
+                                    this.$toast.fail("请选择["+this.form.domains[i].projectName+"]项目的任务分组");
+                                } else {
+                                    this.$toast.fail("请先设置["+this.form.domains[i].projectName+']-['+this.form.domains[i].groupName+']的分组负责人');
+                                }
                             }
+                            return;
                         }
-                        return;
                     }
-                }
-                if(!this.flgLg) {
-                    return
-                }
-                this.flgLg = false
-                this.$axios.post("/report/editReport", formData)
-                .then(res => {
-                    this.flgLg = true
-                    if(res.code == "ok") {
-                        this.$toast.clear();
-                        this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
-                        this.$router.push("/index");
-                    } else {
-                        this.$toast.clear();
-                        this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+'：'+res.msg);
+                    if(!this.flgLg) {
+                        return
                     }
-                }).catch(err=> {this.$toast.clear(); this.flgLg = true});
+                    this.flgLg = false
+                    this.$axios.post("/report/editReport", formData)
+                    .then(res => {
+                        this.flgLg = true
+                        if(res.code == "ok") {
+                            this.$toast.clear();
+                            this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
+                            this.$router.push("/index");
+                        } else {
+                            this.$toast.clear();
+                            this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+'：'+res.msg);
+                        }
+                    }).catch(err=> {this.$toast.clear(); this.flgLg = true});
+                }).catch(()=>{
+                //验证失败
+                console.log('验证失败');
+                    return
+                })
+                
             },
             //初始化参数
             initWxConfig() {
@@ -1812,6 +1818,7 @@ import timetoolVue from '../timetool/timetool.vue';
             padding: 0.3rem 0.53333rem;
         // line-height: 40px;
         // height: 40px;
+        overflow: auto;
         color: #333;
         border-bottom: 2px solid #f6f6f6;
         width: 100%;