diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 2eb651e..1b5553a 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -1,114 +1,115 @@ -{ - "lang": { - "en": "English", - "zh": "中文" - }, - "Search": "Search", - "Reset": "Reset", - "Cancel": "Cancel", - "Submit": "Submit", - "Confirm": "Confirm", - "Close": "Close", - "Save": "Save", - "New": "New", - "Edit": "Edit", - "Audit": "Audit", - "Delete": "Delete", - "Add": "Add", - "View": "View", - "Back": "Back", - "Download": "Download", - "Upload": "Upload", - "Preview": "Preview", - "Total": "Total", - "Action": "Action", - "Import": "Import", - "Export": "Export", - "Copy": "Copy", - "Clear": "Clear", - "Publish": "Publish", - "Read": "Read", - "UnRead": "UnRead", - "sureCancel": "Are you sure to cancel?", - "sureDelete": "Are you sure to delete?", - "sureSubmit": "Are you sure to submit?", - "Yes": "Yes", - "No": "No", - "Success": "Success", - "Failed": "Failed", - "All": "All", - "Table": { - "Total": "Total {{total}} items" - }, - "operator": "Operator", - "time": "Time", - "Login": "Login", - "Username": "Username", - "Realname": "Realname", - "Password": "Password", - "ChangePassword": "Change password", - "Profile": "Profile", - "Logout": "Logout", - "LoginTimeout": "Login timeout", - "LoginTimeoutTip": "Please input your password", - "userProfile": "User Profile", - "Telephone": "Telephone", - "Email": "Email address", - "Address": "Address", - "Company": "Company", - "Department": "Department", - "datetime": { - "thisWeek": "This Week", - "lastWeek": "Last Week", - "thisMonth": "This Month", - "lastMonth": "Last Month", - "nextMonth": "Next Month", - "lastThreeMonth": "Last Three Month", - "nextThreeMonth": "Next Three Month", - "firstHalfYear": "First Half Year", - "latterHalfYear": "Latter Half Year", - "thisYear": "This Year" - }, - "weekdays": { - "1": "Monday", - "2": "Tuesday", - "3": "Wednesday", - "4": "Thursday", - "5": "Friday", - "6": "Saturday", - "7": "Sunday" - }, - "weekdaysShort": { - "1": "Mon", - "2": "Tue", - "3": "Wed", - "4": "Thu", - "5": "Fri", - "6": "Sat", - "7": "Sun" - }, - "menu": { - "Reservation": "Reservation", - "Invoice": "Invoice", - "Feedback": "Feedback", - "Notice": "Notice", - "Report": "Report", - "Airticket": "AirTicket", - "Trainticket": "TrainTicket", - "Products": "Products" - }, - "Validation": { - "Title": "Notification", - "LoginFailed": "Incorrect password, Login failed.", - "UsernameIsEmpty": "Please input your username", - "PasswordIsEmpty": "Please input your password" - }, - "invoiceStatus": { - "Status": "Status", - "Not_submitted": "Not submitted", - "Submitted": "Submitted", - "Travel_advisor_approved": "Travel advisor approved", - "Finance_Dept_arrproved": "Finance Dept arrproved", - "Paid": "Paid" - } -} +{ + "lang": { + "en": "English", + "zh": "中文" + }, + "Search": "Search", + "Reset": "Reset", + "Cancel": "Cancel", + "Submit": "Submit", + "Confirm": "Confirm", + "Close": "Close", + "Save": "Save", + "New": "New", + "Edit": "Edit", + "Audit": "Audit", + "Delete": "Delete", + "Add": "Add", + "View": "View", + "Back": "Back", + "Download": "Download", + "Upload": "Upload", + "Preview": "Preview", + "Total": "Total", + "Action": "Action", + "Import": "Import", + "Export": "Export", + "Copy": "Copy", + "Clear": "Clear", + "Publish": "Publish", + "Read": "Read", + "UnRead": "UnRead", + "sureCancel": "Are you sure to cancel?", + "sureDelete": "Are you sure to delete?", + "sureSubmit": "Are you sure to submit?", + "Yes": "Yes", + "No": "No", + "Success": "Success", + "Failed": "Failed", + "All": "All", + "Table": { + "Total": "Total {{total}} items" + }, + "operator": "Operator", + "time": "Time", + "Login": "Login", + "Username": "Username", + "Realname": "Realname", + "Password": "Password", + "ChangePassword": "Change password", + "Profile": "Profile", + "Logout": "Logout", + "LoginTimeout": "Login timeout", + "LoginTimeoutTip": "Please input your password", + "userProfile": "User Profile", + "Telephone": "Telephone", + "Email": "Email address", + "Address": "Address", + "Company": "Company", + "Department": "Department", + "datetime": { + "thisWeek": "This Week", + "lastWeek": "Last Week", + "thisMonth": "This Month", + "lastMonth": "Last Month", + "nextMonth": "Next Month", + "lastThreeMonth": "Last Three Month", + "nextThreeMonth": "Next Three Month", + "firstHalfYear": "First Half Year", + "latterHalfYear": "Latter Half Year", + "thisYear": "This Year" + }, + "weekdays": { + "1": "Monday", + "2": "Tuesday", + "3": "Wednesday", + "4": "Thursday", + "5": "Friday", + "6": "Saturday", + "7": "Sunday" + }, + "weekdaysShort": { + "1": "Mon", + "2": "Tue", + "3": "Wed", + "4": "Thu", + "5": "Fri", + "6": "Sat", + "7": "Sun" + }, + "menu": { + "Reservation": "Reservation", + "Invoice": "Invoice", + "Feedback": "Feedback", + "Notice": "Notice", + "Report": "Report", + "Airticket": "AirTicket", + "Trainticket": "TrainTicket", + "Products": "Products" + }, + "Validation": { + "Title": "Notification", + "LoginFailed": "Incorrect password, Login failed.", + "UsernameIsEmpty": "Please input your username", + "PasswordIsEmpty": "Please input your password" + }, + "invoiceStatus": { + "Status": "Status", + "Not_submitted": "Not submitted", + "Submitted": "Submitted", + "Travel_advisor_approved": "Travel advisor approved", + "Finance_Dept_arrproved": "Finance Dept arrproved", + "Paid": "Paid" + }, + "Compare": "Compare" +} diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json index 82ce882..dabcc64 100644 --- a/public/locales/zh/common.json +++ b/public/locales/zh/common.json @@ -1,114 +1,115 @@ -{ - "lang": { - "en": "English", - "zh": "中文" - }, - "Search": "查询", - "Reset": "重置", - "Cancel": "取消", - "Submit": "提交", - "Confirm": "确认", - "Close": "关闭", - "Save": "保存", - "New": "新增", - "Edit": "编辑", - "Audit": "审核", - "Delete": "删除", - "Add": "添加", - "View": "查看", - "Back": "返回", - "Download": "下载", - "Upload": "上传", - "Preview": "预览", - "Total": "总数", - "Action": "操作", - "Import": "导入", - "Export": "导出", - "Copy": "复制", - "Clear": "清空", - "Publish": "发布", - "Read": "已读", - "UnRead": "未读", - "sureCancel": "确定取消?", - "sureDelete": "确定删除?", - "sureSubmit": "确定提交?", - "Yes": "是", - "No": "否", - "Success": "成功", - "Failed": "失败", - "All": "所有", - "Table": { - "Total": "共 {{total}} 条" - }, - "operator": "操作", - "time": "时间", - "Login": "登录", - "Username": "账号", - "Realname": "姓名", - "Password": "密码", - "ChangePassword": "修改密码", - "Profile": "账户中心", - "Logout": "退出", - "LoginTimeout": "登录超时", - "LoginTimeoutTip": "请输入密码", - "userProfile": "账号信息", - "Telephone": "联系电话", - "Email": "电子邮箱", - "Address": "公司地址", - "Company": "公司名称", - "Department": "部门", - "datetime": { - "thisWeek": "本周", - "lastWeek": "上周", - "thisMonth": "本月", - "lastMonth": "上月", - "nextMonth": "下月", - "lastThreeMonth": "前三个月", - "nextThreeMonth": "后三个月", - "firstHalfYear": "上半年", - "latterHalfYear": "下半年", - "thisYear": "今年" - }, - "weekdays": { - "1": "周一", - "2": "周二", - "3": "周三", - "4": "周四", - "5": "周五", - "6": "周六", - "7": "周日" - }, - "weekdaysShort": { - "1": "一", - "2": "二", - "3": "三", - "4": "四", - "5": "五", - "6": "六", - "7": "日" - }, - "menu": { - "Reservation": "团预订", - "Invoice": "账单", - "Feedback": "反馈表", - "Notice": "通知", - "Report": "质量评分", - "Airticket": "机票订票", - "Trainticket": "火车订票", - "Products": "产品管理" - }, - "Validation": { - "Title": "温馨提示", - "LoginFailed": "密码错误,登陆失败。", - "UsernameIsEmpty": "请输入账号", - "PasswordIsEmpty": "请输入密码" - }, - "invoiceStatus": { - "Status": "审核状态", - "Not_submitted": "待提交", - "Submitted": "待审核", - "Travel_advisor_approved": "顾问已审核", - "Finance_Dept_arrproved": "财务已审核", - "Paid": "已打款" - } -} +{ + "lang": { + "en": "English", + "zh": "中文" + }, + "Search": "查询", + "Reset": "重置", + "Cancel": "取消", + "Submit": "提交", + "Confirm": "确认", + "Close": "关闭", + "Save": "保存", + "New": "新增", + "Edit": "编辑", + "Audit": "审核", + "Delete": "删除", + "Add": "添加", + "View": "查看", + "Back": "返回", + "Download": "下载", + "Upload": "上传", + "Preview": "预览", + "Total": "总数", + "Action": "操作", + "Import": "导入", + "Export": "导出", + "Copy": "复制", + "Clear": "清空", + "Publish": "发布", + "Read": "已读", + "UnRead": "未读", + "sureCancel": "确定取消?", + "sureDelete": "确定删除?", + "sureSubmit": "确定提交?", + "Yes": "是", + "No": "否", + "Success": "成功", + "Failed": "失败", + "All": "所有", + "Table": { + "Total": "共 {{total}} 条" + }, + "operator": "操作", + "time": "时间", + "Login": "登录", + "Username": "账号", + "Realname": "姓名", + "Password": "密码", + "ChangePassword": "修改密码", + "Profile": "账户中心", + "Logout": "退出", + "LoginTimeout": "登录超时", + "LoginTimeoutTip": "请输入密码", + "userProfile": "账号信息", + "Telephone": "联系电话", + "Email": "电子邮箱", + "Address": "公司地址", + "Company": "公司名称", + "Department": "部门", + "datetime": { + "thisWeek": "本周", + "lastWeek": "上周", + "thisMonth": "本月", + "lastMonth": "上月", + "nextMonth": "下月", + "lastThreeMonth": "前三个月", + "nextThreeMonth": "后三个月", + "firstHalfYear": "上半年", + "latterHalfYear": "下半年", + "thisYear": "今年" + }, + "weekdays": { + "1": "周一", + "2": "周二", + "3": "周三", + "4": "周四", + "5": "周五", + "6": "周六", + "7": "周日" + }, + "weekdaysShort": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "日" + }, + "menu": { + "Reservation": "团预订", + "Invoice": "账单", + "Feedback": "反馈表", + "Notice": "通知", + "Report": "质量评分", + "Airticket": "机票订票", + "Trainticket": "火车订票", + "Products": "产品管理" + }, + "Validation": { + "Title": "温馨提示", + "LoginFailed": "密码错误,登陆失败。", + "UsernameIsEmpty": "请输入账号", + "PasswordIsEmpty": "请输入密码" + }, + "invoiceStatus": { + "Status": "审核状态", + "Not_submitted": "待提交", + "Submitted": "待审核", + "Travel_advisor_approved": "顾问已审核", + "Finance_Dept_arrproved": "财务已审核", + "Paid": "已打款" + }, + "Compare": "对比" +} diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx index b94010d..73a6b3e 100644 --- a/src/components/SearchForm.jsx +++ b/src/components/SearchForm.jsx @@ -258,13 +258,13 @@ function getFields(props) { item( "dates", //时间日期 99, -