Commit f3833c60a8da435305357804202fec78ea1bf5f2

Authored by 徐烜
1 parent 6a84ebae

1、国际化改造:人员配置前端页面改造

src/main/resources/static/pages/scheduleApp/language/en.js
@@ -718,7 +718,7 @@ var ScheduleApp_en_language = { @@ -718,7 +718,7 @@ var ScheduleApp_en_language = {
718 "busConfig_form_page_line29_txt-3849" : "Form", 718 "busConfig_form_page_line29_txt-3849" : "Form",
719 "busConfig_form_page_line44_txt-3347" : "Route name", 719 "busConfig_form_page_line44_txt-3347" : "Route name",
720 "busConfig_form_page_line54_txt-3364" : "Please enter pinyin", 720 "busConfig_form_page_line54_txt-3364" : "Please enter pinyin",
721 - "busConfig_form_page_line61_txt-1788" : "Line must be selected", 721 + "busConfig_form_page_line61_txt-1788" : "Line must be selected",
722 "busConfig_form_page_line65_txt-4009" : "Vehicles", 722 "busConfig_form_page_line65_txt-4009" : "Vehicles",
723 "busConfig_form_page_line75_txt-3364" : "Please enter pinyin", 723 "busConfig_form_page_line75_txt-3364" : "Please enter pinyin",
724 "busConfig_form_page_line88_txt-1794" : "Vehicle must be selected", 724 "busConfig_form_page_line88_txt-1794" : "Vehicle must be selected",
@@ -784,6 +784,142 @@ var ScheduleApp_en_language = { @@ -784,6 +784,142 @@ var ScheduleApp_en_language = {
784 "busConfig_module_js_line251_txt-3729" : "Failed:", 784 "busConfig_module_js_line251_txt-3729" : "Failed:",
785 "busConfig_module_js_line386_txt-4342" : "Vehicle {{clZbh}} details", 785 "busConfig_module_js_line386_txt-4342" : "Vehicle {{clZbh}} details",
786 786
  787 + //------------ 人员配置管理模块 -----------//
  788 + // 模块位置:../module/core/employeeConfig
  789 + // 页面;index.html
  790 + "employeeConfig_index_page_line3_txt-1651" : "Staffing management",
  791 + "employeeConfig_index_page_line9_txt-3807" : "Home page",
  792 + "employeeConfig_index_page_line13_txt-1303" : "Operation plan management",
  793 + "employeeConfig_index_page_line17_txt-1651" : "Staffing management",
  794 + "employeeConfig_index_page_line36_txt-3688" : "Configuration table",
  795 + "employeeConfig_index_page_line41_txt-3261" : "Add configuration",
  796 + "employeeConfig_index_page_line47_txt-3339" : "Data tool",
  797 + "employeeConfig_index_page_line54_txt-4449" : "Import from excel",
  798 + "employeeConfig_index_page_line60_txt-4493" : "Export to excel",
  799 +
  800 + // 页面:orderOptionOpen.html
  801 + "employeeConfig_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
  802 + "employeeConfig_orderOptionOpen_page_line17_txt-4018" : "Yes",
  803 +
  804 + // 页面:list.html
  805 + "employeeConfig_list_page_line7_txt-3934" : "Serial number",
  806 + "employeeConfig_list_page_line8_txt-3347" : "Route name",
  807 + "employeeConfig_list_page_line9_txt-3222" : "Shift code",
  808 + "employeeConfig_list_page_line10_txt-2255" : "Driver employee number",
  809 + "employeeConfig_list_page_line11_txt-3568" : "Driver",
  810 + "employeeConfig_list_page_line12_txt-2189" : "Conductor employee number",
  811 + "employeeConfig_list_page_line13_txt-3567" : "Conductor",
  812 + "employeeConfig_list_page_line14_txt-3874" : "Status",
  813 + "employeeConfig_list_page_line15_txt-3874" : "Status",
  814 + "employeeConfig_list_page_line16_txt-3942" : "Operation",
  815 + "employeeConfig_list_page_line30_txt-3364" : "Please enter pinyin",
  816 + "employeeConfig_list_page_line38_txt-3232" : "Enter employee number",
  817 + "employeeConfig_list_page_line41_txt-3231" : "Enter name",
  818 + "employeeConfig_list_page_line44_txt-3232" : "Enter employee number",
  819 + "employeeConfig_list_page_line47_txt-3231" : "Enter name",
  820 + "employeeConfig_list_page_line51_txt-3746" : "Voided",
  821 + "employeeConfig_list_page_line56_txt-3747" : "Disabled",
  822 + "employeeConfig_list_page_line63_txt-4001" : "Search",
  823 + "employeeConfig_list_page_line73_txt-3385" : "Sorting options",
  824 + "employeeConfig_list_page_line81_txt-4000" : "Reset",
  825 + "employeeConfig_list_page_line107_txt-3747" : "Disabled",
  826 + "employeeConfig_list_page_line113_txt-3747" : "Disabled",
  827 + "employeeConfig_list_page_line126_txt-3866" : "Details",
  828 + "employeeConfig_list_page_line127_txt-4028" : "Modify",
  829 + "employeeConfig_list_page_line129_txt-389" : "Do you want to invalidate the personnel configuration information?",
  830 + "employeeConfig_list_page_line130_txt-3429" : "Line:",
  831 + "employeeConfig_list_page_line130_txt-1785" : "Driving employee number:",
  832 + "employeeConfig_list_page_line130_txt-31" : "If the scheduling rule is associated with this configuration, an error will be reported. It is recommended to modify the configured personnel!",
  833 + "employeeConfig_list_page_line132_txt-4257" : "Yes",
  834 + "employeeConfig_list_page_line133_txt-3817" : "Cancel",
  835 + "employeeConfig_list_page_line136_txt-4143" : "Voided",
  836 + "employeeConfig_list_page_line137_txt-4211" : "Cancel",
  837 + "employeeConfig_list_page_line146_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
  838 + "employeeConfig_list_page_line159_txt-4430" : "First",
  839 + "employeeConfig_list_page_line160_txt-3613" : "Previous",
  840 + "employeeConfig_list_page_line161_txt-3614" : "Next",
  841 + "employeeConfig_list_page_line162_txt-4068" : "Last",
  842 +
  843 + // 页面:detail.html
  844 + "employeeConfig_detail_page_line3_txt-1651" : "Staffing management",
  845 + "employeeConfig_detail_page_line9_txt-3807" : "Home page",
  846 + "employeeConfig_detail_page_line13_txt-1303" : "Operation plan management",
  847 + "employeeConfig_detail_page_line17_txt-1651" : "Staffing management",
  848 + "employeeConfig_detail_page_line21_txt-842" : "Staffing details",
  849 + "employeeConfig_detail_page_line45_txt-3347" : "Route name",
  850 + "employeeConfig_detail_page_line52_txt-3222" : "Shift code",
  851 + "employeeConfig_detail_page_line60_txt-2254" : "Driver name",
  852 + "employeeConfig_detail_page_line68_txt-2255" : "Driver employee number",
  853 + "employeeConfig_detail_page_line76_txt-1766" : "Conductor name:",
  854 + "employeeConfig_detail_page_line84_txt-1767" : "Conductor employee number:",
  855 +
  856 + // 页面:edit.html
  857 + "employeeConfig_edit_page_line3_txt-1651" : "Staffing management",
  858 + "employeeConfig_edit_page_line9_txt-3807" : "Home page",
  859 + "employeeConfig_edit_page_line13_txt-1303" : "Operation plan management",
  860 + "employeeConfig_edit_page_line17_txt-1651" : "Staffing management",
  861 + "employeeConfig_edit_page_line21_txt-834" : "Modify staffing information",
  862 + "employeeConfig_edit_page_line29_txt-3849" : "Form",
  863 + "employeeConfig_edit_page_line44_txt-3347" : "Route name",
  864 + "employeeConfig_edit_page_line54_txt-3364" : "Please enter pinyin",
  865 + "employeeConfig_edit_page_line61_txt-1788" : "Line must be selected",
  866 + "employeeConfig_edit_page_line66_txt-3222" : "Shift code",
  867 + "employeeConfig_edit_page_line69_txt-1268" : "Please enter shift code",
  868 + "employeeConfig_edit_page_line73_txt-926" : "Shift code must be filled in",
  869 + "employeeConfig_edit_page_line78_txt-3568" : "Driver",
  870 + "employeeConfig_edit_page_line88_txt-3364" : "Please enter pinyin",
  871 + "employeeConfig_edit_page_line95_txt-1226" : "Driver must select",
  872 + "employeeConfig_edit_page_line144_txt-2578" : "Conductor:",
  873 + "employeeConfig_edit_page_line154_txt-3364" : "Please enter pinyin",
  874 + "employeeConfig_edit_page_line214_txt-4173" : "Submit",
  875 + "employeeConfig_edit_page_line215_txt-3817" : "Cancel",
  876 +
  877 + // 页面:form.html
  878 + "employeeConfig_form_page_line3_txt-1651" : "Staffing management",
  879 + "employeeConfig_form_page_line9_txt-3807" : "Home page",
  880 + "employeeConfig_form_page_line13_txt-1303" : "Operation plan management",
  881 + "employeeConfig_form_page_line17_txt-1651" : "Staffing management",
  882 + "employeeConfig_form_page_line21_txt-834" : "Modify staffing information",
  883 + "employeeConfig_form_page_line29_txt-3849" : "Form",
  884 + "employeeConfig_form_page_line44_txt-3347" : "Route name",
  885 + "employeeConfig_form_page_line54_txt-3364" : "Please enter pinyin",
  886 + "employeeConfig_form_page_line61_txt-1788" : "Line must be selected",
  887 + "employeeConfig_form_page_line66_txt-3222" : "Shift code",
  888 + "employeeConfig_form_page_line69_txt-1268" : "Please enter shift code",
  889 + "employeeConfig_form_page_line73_txt-926" : "Shift code must be filled in",
  890 + "employeeConfig_form_page_line78_txt-3568" : "Driver",
  891 + "employeeConfig_form_page_line88_txt-3364" : "Please enter pinyin",
  892 + "employeeConfig_form_page_line95_txt-1226" : "Driver must select",
  893 + "employeeConfig_form_page_line144_txt-2578" : "Conductor:",
  894 + "employeeConfig_form_page_line154_txt-3364" : "Please enter pinyin",
  895 + "employeeConfig_form_page_line214_txt-4173" : "Submit",
  896 + "employeeConfig_form_page_line215_txt-3817" : "Cancel",
  897 +
  898 + // 页面:dataImport.html
  899 + "employeeConfig_dataImport_page_line2_txt-4334" : "Staffing information import from excel",
  900 + "employeeConfig_dataImport_page_line7_txt-2684" : "Select file",
  901 + "employeeConfig_dataImport_page_line20_txt-3658" : "file name",
  902 + "employeeConfig_dataImport_page_line21_txt-4092" : "Size(MB)",
  903 + "employeeConfig_dataImport_page_line22_txt-4091" : "progress",
  904 + "employeeConfig_dataImport_page_line23_txt-3874" : "Status",
  905 + "employeeConfig_dataImport_page_line24_txt-3942" : "Operation",
  906 + "employeeConfig_dataImport_page_line53_txt-4154" : "upload",
  907 + "employeeConfig_dataImport_page_line57_txt-3817" : "Cancel",
  908 + "employeeConfig_dataImport_page_line60_txt-3868" : "Delete",
  909 + "employeeConfig_dataImport_page_line71_txt-4015" : "Close",
  910 +
  911 + // module.js
  912 + "employeeConfig_module_js_line25_txt-3347" : "Route name",
  913 + "employeeConfig_module_js_line26_txt-3222" : "Shift code",
  914 + "employeeConfig_module_js_line27_txt-2255" : "Driver employee number",
  915 + "employeeConfig_module_js_line28_txt-2254" : "Driver name",
  916 + "employeeConfig_module_js_line29_txt-2189" : "Conductor employee number",
  917 + "employeeConfig_module_js_line30_txt-2071" : "Conductor name",
  918 + "employeeConfig_module_js_line31_txt-3127" : "Void or not",
  919 + "employeeConfig_module_js_line112_txt-1806" : "Please select the route!",
  920 + "employeeConfig_module_js_line176_txt-1613" : "Staffing information",
  921 + "employeeConfig_module_js_line267_txt-3729" : "Failed:",
  922 + "employeeConfig_module_js_line409_txt-1781" : "Staff {{jsyName}} details",
787 923
788 924
789 // TODO; 925 // TODO;
src/main/resources/static/pages/scheduleApp/language/zh.js
@@ -785,6 +785,145 @@ var ScheduleApp_zh_language = { @@ -785,6 +785,145 @@ var ScheduleApp_zh_language = {
785 "busConfig_module_js_line251_txt-3729" : "失败:", 785 "busConfig_module_js_line251_txt-3729" : "失败:",
786 "busConfig_module_js_line386_txt-4342" : "车辆 {{clZbh}} 配置详细信息", 786 "busConfig_module_js_line386_txt-4342" : "车辆 {{clZbh}} 配置详细信息",
787 787
  788 + //------------ 人员配置管理模块 -----------//
  789 + // 模块位置:../module/core/employeeConfig
  790 + // 页面;index.html
  791 + "employeeConfig_index_page_line3_txt-1651" : "人员配置管理",
  792 + "employeeConfig_index_page_line9_txt-3807" : "首页",
  793 + "employeeConfig_index_page_line13_txt-1303" : "运营计划管理",
  794 + "employeeConfig_index_page_line17_txt-1651" : "人员配置管理",
  795 + "employeeConfig_index_page_line36_txt-3688" : "配置表",
  796 + "employeeConfig_index_page_line41_txt-3261" : "添加配置",
  797 + "employeeConfig_index_page_line47_txt-3339" : "数据工具",
  798 + "employeeConfig_index_page_line54_txt-4449" : "导入Excel",
  799 + "employeeConfig_index_page_line60_txt-4493" : "导出Excel",
  800 +
  801 + // 页面:orderOptionOpen.html
  802 + "employeeConfig_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
  803 + "employeeConfig_orderOptionOpen_page_line17_txt-4018" : "确定",
  804 +
  805 + // 页面:list.html
  806 + "employeeConfig_list_page_line7_txt-3934" : "序号",
  807 + "employeeConfig_list_page_line8_txt-3347" : "线路名称",
  808 + "employeeConfig_list_page_line9_txt-3222" : "搭班编码",
  809 + "employeeConfig_list_page_line10_txt-2255" : "驾驶员工号",
  810 + "employeeConfig_list_page_line11_txt-3568" : "驾驶员",
  811 + "employeeConfig_list_page_line12_txt-2189" : "售票员工号",
  812 + "employeeConfig_list_page_line13_txt-3567" : "售票员",
  813 + "employeeConfig_list_page_line14_txt-3874" : "状态",
  814 + "employeeConfig_list_page_line15_txt-3874" : "状态",
  815 + "employeeConfig_list_page_line16_txt-3942" : "操作",
  816 + "employeeConfig_list_page_line30_txt-3364" : "请输拼音",
  817 + "employeeConfig_list_page_line38_txt-3232" : "输入工号",
  818 + "employeeConfig_list_page_line41_txt-3231" : "输入姓名",
  819 + "employeeConfig_list_page_line44_txt-3232" : "输入工号",
  820 + "employeeConfig_list_page_line47_txt-3231" : "输入姓名",
  821 + "employeeConfig_list_page_line51_txt-3746" : "已作废",
  822 + "employeeConfig_list_page_line56_txt-3747" : "已停用",
  823 + "employeeConfig_list_page_line63_txt-4001" : "搜索",
  824 + "employeeConfig_list_page_line73_txt-3385" : "排序选项",
  825 + "employeeConfig_list_page_line81_txt-4000" : "重置",
  826 + "employeeConfig_list_page_line107_txt-3747" : "已停用",
  827 + "employeeConfig_list_page_line113_txt-3747" : "已停用",
  828 + "employeeConfig_list_page_line126_txt-3866" : "详细",
  829 + "employeeConfig_list_page_line127_txt-4028" : "修改",
  830 + "employeeConfig_list_page_line129_txt-389" : "是否作废人员配置信息?",
  831 + "employeeConfig_list_page_line130_txt-3429" : "线路:",
  832 + "employeeConfig_list_page_line130_txt-1785" : "驾驶员工号:",
  833 + "employeeConfig_list_page_line130_txt-31" : "如果排班规则关联此配置,会报错,建议修改配置的人员!",
  834 + "employeeConfig_list_page_line132_txt-4257" : "是",
  835 + "employeeConfig_list_page_line133_txt-3817" : "取消",
  836 + "employeeConfig_list_page_line136_txt-4143" : "作废",
  837 + "employeeConfig_list_page_line137_txt-4211" : "撤销",
  838 + "employeeConfig_list_page_line146_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
  839 + "employeeConfig_list_page_line159_txt-4430" : "首页",
  840 + "employeeConfig_list_page_line160_txt-3613" : "上一页",
  841 + "employeeConfig_list_page_line161_txt-3614" : "下一页",
  842 + "employeeConfig_list_page_line162_txt-4068" : "尾页",
  843 +
  844 + // 页面:detail.html
  845 + "employeeConfig_detail_page_line3_txt-1651" : "人员配置管理",
  846 + "employeeConfig_detail_page_line9_txt-3807" : "首页",
  847 + "employeeConfig_detail_page_line13_txt-1303" : "运营计划管理",
  848 + "employeeConfig_detail_page_line17_txt-1651" : "人员配置管理",
  849 + "employeeConfig_detail_page_line21_txt-842" : "人员配置详细信息",
  850 + "employeeConfig_detail_page_line45_txt-3347" : "线路名称",
  851 + "employeeConfig_detail_page_line52_txt-3222" : "搭班编码",
  852 + "employeeConfig_detail_page_line60_txt-2254" : "驾驶员姓名",
  853 + "employeeConfig_detail_page_line68_txt-2255" : "驾驶员工号",
  854 + "employeeConfig_detail_page_line76_txt-1766" : "售票员姓名:",
  855 + "employeeConfig_detail_page_line84_txt-1767" : "售票员工号:",
  856 +
  857 + // 页面:edit.html
  858 + "employeeConfig_edit_page_line3_txt-1651" : "人员配置管理",
  859 + "employeeConfig_edit_page_line9_txt-3807" : "首页",
  860 + "employeeConfig_edit_page_line13_txt-1303" : "运营计划管理",
  861 + "employeeConfig_edit_page_line17_txt-1651" : "人员配置管理",
  862 + "employeeConfig_edit_page_line21_txt-834" : "修改人员配置信息",
  863 + "employeeConfig_edit_page_line29_txt-3849" : "表单",
  864 + "employeeConfig_edit_page_line44_txt-3347" : "线路名称",
  865 + "employeeConfig_edit_page_line54_txt-3364" : "请输拼音",
  866 + "employeeConfig_edit_page_line61_txt-1788" : "线路必须选择",
  867 + "employeeConfig_edit_page_line66_txt-3222" : "搭班编码",
  868 + "employeeConfig_edit_page_line69_txt-1268" : "请输入搭班编码",
  869 + "employeeConfig_edit_page_line73_txt-926" : "搭班编码必须填写",
  870 + "employeeConfig_edit_page_line78_txt-3568" : "驾驶员",
  871 + "employeeConfig_edit_page_line88_txt-3364" : "请输拼音",
  872 + "employeeConfig_edit_page_line95_txt-1226" : "驾驶员必须选择",
  873 + "employeeConfig_edit_page_line144_txt-2578" : "售票员:",
  874 + "employeeConfig_edit_page_line154_txt-3364" : "请输拼音",
  875 + "employeeConfig_edit_page_line214_txt-4173" : "提交",
  876 + "employeeConfig_edit_page_line215_txt-3817" : "取消",
  877 +
  878 + // 页面:form.html
  879 + "employeeConfig_form_page_line3_txt-1651" : "人员配置管理",
  880 + "employeeConfig_form_page_line9_txt-3807" : "首页",
  881 + "employeeConfig_form_page_line13_txt-1303" : "运营计划管理",
  882 + "employeeConfig_form_page_line17_txt-1651" : "人员配置管理",
  883 + "employeeConfig_form_page_line21_txt-834" : "修改人员配置信息",
  884 + "employeeConfig_form_page_line29_txt-3849" : "表单",
  885 + "employeeConfig_form_page_line44_txt-3347" : "线路名称",
  886 + "employeeConfig_form_page_line54_txt-3364" : "请输拼音",
  887 + "employeeConfig_form_page_line61_txt-1788" : "线路必须选择",
  888 + "employeeConfig_form_page_line66_txt-3222" : "搭班编码",
  889 + "employeeConfig_form_page_line69_txt-1268" : "请输入搭班编码",
  890 + "employeeConfig_form_page_line73_txt-926" : "搭班编码必须填写",
  891 + "employeeConfig_form_page_line78_txt-3568" : "驾驶员",
  892 + "employeeConfig_form_page_line88_txt-3364" : "请输拼音",
  893 + "employeeConfig_form_page_line95_txt-1226" : "驾驶员必须选择",
  894 + "employeeConfig_form_page_line144_txt-2578" : "售票员:",
  895 + "employeeConfig_form_page_line154_txt-3364" : "请输拼音",
  896 + "employeeConfig_form_page_line214_txt-4173" : "提交",
  897 + "employeeConfig_form_page_line215_txt-3817" : "取消",
  898 +
  899 + // 页面:dataImport.html
  900 + "employeeConfig_dataImport_page_line2_txt-4334" : "人员配置信息excel数据导入",
  901 + "employeeConfig_dataImport_page_line7_txt-2684" : "选择文件",
  902 + "employeeConfig_dataImport_page_line20_txt-3658" : "文件名",
  903 + "employeeConfig_dataImport_page_line21_txt-4092" : "大小(M)",
  904 + "employeeConfig_dataImport_page_line22_txt-4091" : "进度",
  905 + "employeeConfig_dataImport_page_line23_txt-3874" : "状态",
  906 + "employeeConfig_dataImport_page_line24_txt-3942" : "操作",
  907 + "employeeConfig_dataImport_page_line53_txt-4154" : "上传",
  908 + "employeeConfig_dataImport_page_line57_txt-3817" : "取消",
  909 + "employeeConfig_dataImport_page_line60_txt-3868" : "删除",
  910 + "employeeConfig_dataImport_page_line71_txt-4015" : "关闭",
  911 +
  912 + // module.js
  913 + "employeeConfig_module_js_line25_txt-3347" : "线路名称",
  914 + "employeeConfig_module_js_line26_txt-3222" : "搭班编码",
  915 + "employeeConfig_module_js_line27_txt-2255" : "驾驶员工号",
  916 + "employeeConfig_module_js_line28_txt-2254" : "驾驶员姓名",
  917 + "employeeConfig_module_js_line29_txt-2189" : "售票员工号",
  918 + "employeeConfig_module_js_line30_txt-2071" : "售票员姓名",
  919 + "employeeConfig_module_js_line31_txt-3127" : "是否作废",
  920 + "employeeConfig_module_js_line112_txt-1806" : "请选择线路!",
  921 + "employeeConfig_module_js_line176_txt-1613" : "人员配置信息",
  922 + "employeeConfig_module_js_line267_txt-3729" : "失败:",
  923 + "employeeConfig_module_js_line409_txt-1781" : "驾驶员 {{jsyName}} 配置详细信息",
  924 +
  925 +
  926 +
788 927
789 // TODO: 928 // TODO:
790 }; 929 };
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dataImport.html
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 </div> 13 </div>
14 14
15 <div class="table-scrollable table-scrollable-borderless"> 15 <div class="table-scrollable table-scrollable-borderless">
  16 +
16 <table class="table table-hover table-light"> 17 <table class="table table-hover table-light">
17 <thead> 18 <thead>
18 <tr class="uppercase"> 19 <tr class="uppercase">
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/dataImport.html
1 <div class="modal-header"> 1 <div class="modal-header">
2 - <h3 class="modal-title">$$$$$${txt-4334}</h3> 2 + <h3 class="modal-title">{{"employeeConfig_dataImport_page_line2_txt-4334" | translate}}</h3>
3 </div> 3 </div>
4 <div class="modal-body"> 4 <div class="modal-body">
5 <div class="col-md-6"> 5 <div class="col-md-6">
6 <div class="input-group"> 6 <div class="input-group">
7 - <input type="file" class="form-control" nv-file-select="" uploader="ctrl.uploader"/>  
8 - <span class="input-group-btn"> 7 + <label class="btn btn-info" for="xFile">{{"employeeConfig_dataImport_page_line7_txt-2684" | translate}}</label>
  8 + <input id="xFile" type="file" style="position: absolute;clip: rect(0 0 0 0);" class="form-control" nv-file-select="" uploader="ctrl.uploader"/>
9 <button type="button" ng-click="ctrl.clearInputFile()" class="btn btn-default"> 9 <button type="button" ng-click="ctrl.clearInputFile()" class="btn btn-default">
10 <span class="glyphicon glyphicon-trash"></span> 10 <span class="glyphicon glyphicon-trash"></span>
11 </button> 11 </button>
12 - </span>  
13 </div> 12 </div>
14 </div> 13 </div>
15 14
16 <div class="table-scrollable table-scrollable-borderless"> 15 <div class="table-scrollable table-scrollable-borderless">
  16 +
17 <table class="table table-hover table-light"> 17 <table class="table table-hover table-light">
18 <thead> 18 <thead>
19 <tr class="uppercase"> 19 <tr class="uppercase">
20 - <th width="50%">$$$$$${txt-3658}</th>  
21 - <th ng-show="ctrl.uploader.isHTML5">$$$$$${txt-4092}</th>  
22 - <th ng-show="ctrl.uploader.isHTML5">$$$$$${txt-4091}</th>  
23 - <th>$$$$$${txt-3874}</th>  
24 - <th>$$$$$${txt-3942}</th> 20 + <th width="50%">{{"employeeConfig_dataImport_page_line20_txt-3658" | translate}}</th>
  21 + <th ng-show="ctrl.uploader.isHTML5">{{"employeeConfig_dataImport_page_line21_txt-4092" | translate}}</th>
  22 + <th ng-show="ctrl.uploader.isHTML5">{{"employeeConfig_dataImport_page_line22_txt-4091" | translate}}</th>
  23 + <th>{{"employeeConfig_dataImport_page_line23_txt-3874" | translate}}</th>
  24 + <th>{{"employeeConfig_dataImport_page_line24_txt-3942" | translate}}</th>
25 </tr> 25 </tr>
26 </thead> 26 </thead>
27 <tbody> 27 <tbody>
@@ -50,14 +50,14 @@ @@ -50,14 +50,14 @@
50 <td nowrap> 50 <td nowrap>
51 <button type="button" class="btn btn-success btn-xs" ng-click="item.upload()" 51 <button type="button" class="btn btn-success btn-xs" ng-click="item.upload()"
52 ng-disabled="item.isReady || item.isUploading || item.isSuccess"> 52 ng-disabled="item.isReady || item.isUploading || item.isSuccess">
53 - <span class="glyphicon glyphicon-upload"></span> $$$$$${txt-4154} 53 + <span class="glyphicon glyphicon-upload"></span> {{"employeeConfig_dataImport_page_line53_txt-4154" | translate}}
54 </button> 54 </button>
55 <button type="button" class="btn btn-warning btn-xs" ng-click="item.cancel()" 55 <button type="button" class="btn btn-warning btn-xs" ng-click="item.cancel()"
56 ng-disabled="!item.isUploading"> 56 ng-disabled="!item.isUploading">
57 - <span class="glyphicon glyphicon-ban-circle"></span> $$$$$${txt-3817} 57 + <span class="glyphicon glyphicon-ban-circle"></span> {{"employeeConfig_dataImport_page_line57_txt-3817" | translate}}
58 </button> 58 </button>
59 <button type="button" class="btn btn-danger btn-xs" ng-click="item.remove()"> 59 <button type="button" class="btn btn-danger btn-xs" ng-click="item.remove()">
60 - <span class="glyphicon glyphicon-trash"></span> $$$$$${txt-3868} 60 + <span class="glyphicon glyphicon-trash"></span> {{"employeeConfig_dataImport_page_line60_txt-3868" | translate}}
61 </button> 61 </button>
62 </td> 62 </td>
63 </tr> 63 </tr>
@@ -68,5 +68,5 @@ @@ -68,5 +68,5 @@
68 </div> 68 </div>
69 69
70 <div class="modal-footer"> 70 <div class="modal-footer">
71 - <button class="btn btn-primary" ng-click="ctrl.close()">$$$$$${txt-4015}</button>  
72 -</div>  
73 \ No newline at end of file 71 \ No newline at end of file
  72 + <button class="btn btn-primary" ng-click="ctrl.close()">{{"employeeConfig_dataImport_page_line71_txt-4015" | translate}}</button>
  73 +</div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/detail.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-1651}</h1> 3 + <h1>{{"employeeConfig_detail_page_line3_txt-1651" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 8 <li>
9 - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a> 9 + <a href="/pages/home.html" data-pjax>{{"employeeConfig_detail_page_line9_txt-3807" | translate}}</a>
10 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-1303}</span> 13 + <span class="active">{{"employeeConfig_detail_page_line13_txt-1303" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="employeeConfig">$$$$$${txt-1651}</a> 17 + <a ui-sref="employeeConfig">{{"employeeConfig_detail_page_line17_txt-1651" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-842}</span> 21 + <span class="active">{{"employeeConfig_detail_page_line21_txt-842" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -42,14 +42,14 @@ @@ -42,14 +42,14 @@
42 <!-- 其他信息放置在这里 --> 42 <!-- 其他信息放置在这里 -->
43 <div class="form-body"> 43 <div class="form-body">
44 <div class="form-group has-success has-feedback"> 44 <div class="form-group has-success has-feedback">
45 - <label class="col-md-2 control-label">$$$$$${txt-3815}*:</label> 45 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line45_txt-3347" | translate}}*:</label>
46 <div class="col-md-3"> 46 <div class="col-md-3">
47 <input type="text" class="form-control" 47 <input type="text" class="form-control"
48 name="xl" ng-model="ctrl.employeeConfigForDetail.xl.name" readonly/> 48 name="xl" ng-model="ctrl.employeeConfigForDetail.xl.name" readonly/>
49 </div> 49 </div>
50 </div> 50 </div>
51 <div class="form-group has-success has-feedback"> 51 <div class="form-group has-success has-feedback">
52 - <label class="col-md-2 control-label">$$$$$${txt-3222}*:</label> 52 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line52_txt-3222" | translate}}*:</label>
53 <div class="col-md-3"> 53 <div class="col-md-3">
54 <input type="text" class="form-control" 54 <input type="text" class="form-control"
55 name="dbbm" ng-model="ctrl.employeeConfigForDetail.dbbm" readonly/> 55 name="dbbm" ng-model="ctrl.employeeConfigForDetail.dbbm" readonly/>
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </div> 57 </div>
58 58
59 <div class="form-group has-success has-feedback"> 59 <div class="form-group has-success has-feedback">
60 - <label class="col-md-2 control-label">$$$$$${txt-2254}*:</label> 60 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line60_txt-2254" | translate}}*:</label>
61 <div class="col-md-3"> 61 <div class="col-md-3">
62 <input type="text" class="form-control" name="jsy_name" 62 <input type="text" class="form-control" name="jsy_name"
63 ng-model="ctrl.employeeConfigForDetail.jsy.personnelName" readonly/> 63 ng-model="ctrl.employeeConfigForDetail.jsy.personnelName" readonly/>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </div> 65 </div>
66 66
67 <div class="form-group has-success has-feedback"> 67 <div class="form-group has-success has-feedback">
68 - <label class="col-md-2 control-label">$$$$$${txt-2255}*:</label> 68 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line68_txt-2255" | translate}}*:</label>
69 <div class="col-md-3"> 69 <div class="col-md-3">
70 <input type="text" class="form-control" name="jsy_code" 70 <input type="text" class="form-control" name="jsy_code"
71 ng-model="ctrl.employeeConfigForDetail.jsy.jobCodeori" readonly/> 71 ng-model="ctrl.employeeConfigForDetail.jsy.jobCodeori" readonly/>
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 </div> 73 </div>
74 74
75 <div class="form-group"> 75 <div class="form-group">
76 - <label class="col-md-2 control-label">$$$$$${txt-1766}</label> 76 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line76_txt-1766" | translate}}</label>
77 <div class="col-md-3"> 77 <div class="col-md-3">
78 <input type="text" class="form-control" name="spy_name" 78 <input type="text" class="form-control" name="spy_name"
79 ng-model="ctrl.employeeConfigForDetail.spy.personnelName" readonly/> 79 ng-model="ctrl.employeeConfigForDetail.spy.personnelName" readonly/>
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </div> 81 </div>
82 82
83 <div class="form-group"> 83 <div class="form-group">
84 - <label class="col-md-2 control-label">$$$$$${txt-1767}</label> 84 + <label class="col-md-2 control-label">{{"employeeConfig_detail_page_line84_txt-1767" | translate}}</label>
85 <div class="col-md-3"> 85 <div class="col-md-3">
86 <input type="text" class="form-control" name="spy_code" 86 <input type="text" class="form-control" name="spy_code"
87 ng-model="ctrl.employeeConfigForDetail.spy.jobCodeori" readonly/> 87 ng-model="ctrl.employeeConfigForDetail.spy.jobCodeori" readonly/>
@@ -96,4 +96,4 @@ @@ -96,4 +96,4 @@
96 </form> 96 </form>
97 97
98 </div> 98 </div>
99 -</div>  
100 \ No newline at end of file 99 \ No newline at end of file
  100 +</div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-1651}</h1> 3 + <h1>{{"employeeConfig_edit_page_line3_txt-1651" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 8 <li>
9 - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a> 9 + <a href="/pages/home.html" data-pjax>{{"employeeConfig_edit_page_line9_txt-3807" | translate}}</a>
10 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-1303}</span> 13 + <span class="active">{{"employeeConfig_edit_page_line13_txt-1303" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="employeeConfig">$$$$$${txt-1651}</a> 17 + <a ui-sref="employeeConfig">{{"employeeConfig_edit_page_line17_txt-1651" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-834}</span> 21 + <span class="active">{{"employeeConfig_edit_page_line21_txt-834" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="portlet-title"> 26 <div class="portlet-title">
27 <div class="caption"> 27 <div class="caption">
28 <i class="icon-equalizer font-red-sunglo"></i> <span 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29 - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span> 29 + class="caption-subject font-red-sunglo bold uppercase">{{"employeeConfig_edit_page_line29_txt-3849" | translate}}</span>
30 </div> 30 </div>
31 </div> 31 </div>
32 32
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <!-- 其他信息放置在这里 --> 41 <!-- 其他信息放置在这里 -->
42 <div class="form-body"> 42 <div class="form-body">
43 <div class="form-group has-success has-feedback"> 43 <div class="form-group has-success has-feedback">
44 - <label class="col-md-2 control-label">$$$$$${txt-3815}*:</label> 44 + <label class="col-md-2 control-label">{{"employeeConfig_edit_page_line44_txt-3347" | translate}}*:</label>
45 <div class="col-md-3"> 45 <div class="col-md-3">
46 <sa-Select5 name="xl" 46 <sa-Select5 name="xl"
47 model="ctrl.employeeConfigForSave" 47 model="ctrl.employeeConfigForSave"
@@ -51,31 +51,31 @@ @@ -51,31 +51,31 @@
51 dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 51 dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 iterobjname="item" 52 iterobjname="item"
53 iterobjexp="item.name" 53 iterobjexp="item.name"
54 - searchph="$$$$$${txt-3364}" 54 + searchph="{{'employeeConfig_edit_page_line54_txt-3364' | translate}}"
55 searchexp="this.name" 55 searchexp="this.name"
56 required > 56 required >
57 </sa-Select5> 57 </sa-Select5>
58 </div> 58 </div>
59 <!-- 隐藏块,显示验证信息 --> 59 <!-- 隐藏块,显示验证信息 -->
60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required"> 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
61 - $$$$$${txt-1788} 61 + {{"employeeConfig_edit_page_line61_txt-1788" | translate}}
62 </div> 62 </div>
63 </div> 63 </div>
64 64
65 <div class="form-group has-success has-feedback"> 65 <div class="form-group has-success has-feedback">
66 - <label class="col-md-2 control-label">$$$$$${txt-3222}*:</label> 66 + <label class="col-md-2 control-label">{{"employeeConfig_edit_page_line66_txt-3222" | translate}}*:</label>
67 <div class="col-md-3"> 67 <div class="col-md-3">
68 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required 68 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required
69 - placeholder="$$$$$${txt-1268}"/> 69 + placeholder="{{'employeeConfig_edit_page_line69_txt-1268' | translate}}"/>
70 </div> 70 </div>
71 <!-- 隐藏块,显示验证信息 --> 71 <!-- 隐藏块,显示验证信息 -->
72 <div class="alert alert-danger well-sm" ng-show="myForm.dbbm.$error.required"> 72 <div class="alert alert-danger well-sm" ng-show="myForm.dbbm.$error.required">
73 - $$$$$${txt-926} 73 + {{"employeeConfig_edit_page_line73_txt-926" | translate}}
74 </div> 74 </div>
75 </div> 75 </div>
76 76
77 <div class="form-group has-success has-feedback"> 77 <div class="form-group has-success has-feedback">
78 - <label class="col-md-2 control-label">$$$$$${txt-3568}*:</label> 78 + <label class="col-md-2 control-label">{{"employeeConfig_edit_page_line78_txt-3568" | translate}}*:</label>
79 <div class="col-md-3"> 79 <div class="col-md-3">
80 <sa-Select5 name="jsy" 80 <sa-Select5 name="jsy"
81 model="ctrl.employeeConfigForSave" 81 model="ctrl.employeeConfigForSave"
@@ -85,14 +85,14 @@ @@ -85,14 +85,14 @@
85 dsparams="{{ {type: 'local', param: 'ry' } | json }}" 85 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
86 iterobjname="item" 86 iterobjname="item"
87 iterobjexp="item.name + '<' + item.workId + '>'" 87 iterobjexp="item.name + '<' + item.workId + '>'"
88 - searchph="$$$$$${txt-3364}" 88 + searchph="{{'employeeConfig_edit_page_line88_txt-3364' | translate}}"
89 searchexp="this.name + '<' + this.workId + '>'" 89 searchexp="this.name + '<' + this.workId + '>'"
90 required > 90 required >
91 </sa-Select5> 91 </sa-Select5>
92 </div> 92 </div>
93 <!-- 隐藏块,显示验证信息 --> 93 <!-- 隐藏块,显示验证信息 -->
94 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required"> 94 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
95 - $$$$$${txt-1226} 95 + {{"employeeConfig_edit_page_line95_txt-1226" | translate}}
96 </div> 96 </div>
97 97
98 <!-- 重复配置 --> 98 <!-- 重复配置 -->
@@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
141 </div> 141 </div>
142 142
143 <div class="form-group"> 143 <div class="form-group">
144 - <label class="col-md-2 control-label">$$$$$${txt-2578}</label> 144 + <label class="col-md-2 control-label">{{"employeeConfig_edit_page_line144_txt-2578" | translate}}</label>
145 <div class="col-md-3"> 145 <div class="col-md-3">
146 <sa-Select5 name="spy" 146 <sa-Select5 name="spy"
147 model="ctrl.employeeConfigForSave" 147 model="ctrl.employeeConfigForSave"
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 dsparams="{{ {type: 'local', param: 'ry' } | json }}" 151 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
152 iterobjname="item" 152 iterobjname="item"
153 iterobjexp="item.name + '<' + item.workId + '>'" 153 iterobjexp="item.name + '<' + item.workId + '>'"
154 - searchph="$$$$$${txt-3364}" 154 + searchph="{{'employeeConfig_edit_page_line154_txt-3364' | translate}}"
155 searchexp="this.name + '<' + this.workId + '>'" 155 searchexp="this.name + '<' + this.workId + '>'"
156 > 156 >
157 </sa-Select5> 157 </sa-Select5>
@@ -211,8 +211,8 @@ @@ -211,8 +211,8 @@
211 <div class="row"> 211 <div class="row">
212 <div class="col-md-offset-3 col-md-4"> 212 <div class="col-md-offset-3 col-md-4">
213 <button type="submit" class="btn green" 213 <button type="submit" class="btn green"
214 - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>  
215 - <a type="button" class="btn default" ui-sref="employeeConfig" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a> 214 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeConfig_edit_page_line214_txt-4173" | translate}}</button>
  215 + <a type="button" class="btn default" ui-sref="employeeConfig" ><i class="fa fa-times"></i> {{"employeeConfig_edit_page_line215_txt-3817" | translate}}</a>
216 </div> 216 </div>
217 </div> 217 </div>
218 </div> 218 </div>
@@ -222,4 +222,4 @@ @@ -222,4 +222,4 @@
222 </div> 222 </div>
223 223
224 224
225 -</div>  
226 \ No newline at end of file 225 \ No newline at end of file
  226 +</div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-1651}</h1> 3 + <h1>{{"employeeConfig_form_page_line3_txt-1651" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 8 <li>
9 - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a> 9 + <a href="/pages/home.html" data-pjax>{{"employeeConfig_form_page_line9_txt-3807" | translate}}</a>
10 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-1303}</span> 13 + <span class="active">{{"employeeConfig_form_page_line13_txt-1303" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="employeeConfig">$$$$$${txt-1651}</a> 17 + <a ui-sref="employeeConfig">{{"employeeConfig_form_page_line17_txt-1651" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-838}</span> 21 + <span class="active">{{"employeeConfig_form_page_line21_txt-834" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="portlet-title"> 26 <div class="portlet-title">
27 <div class="caption"> 27 <div class="caption">
28 <i class="icon-equalizer font-red-sunglo"></i> <span 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29 - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span> 29 + class="caption-subject font-red-sunglo bold uppercase">{{"employeeConfig_form_page_line29_txt-3849" | translate}}</span>
30 </div> 30 </div>
31 </div> 31 </div>
32 32
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <!-- 其他信息放置在这里 --> 41 <!-- 其他信息放置在这里 -->
42 <div class="form-body"> 42 <div class="form-body">
43 <div class="form-group has-success has-feedback"> 43 <div class="form-group has-success has-feedback">
44 - <label class="col-md-2 control-label">$$$$$${txt-3815}*:</label> 44 + <label class="col-md-2 control-label">{{"employeeConfig_form_page_line44_txt-3347" | translate}}*:</label>
45 <div class="col-md-3"> 45 <div class="col-md-3">
46 <sa-Select5 name="xl" 46 <sa-Select5 name="xl"
47 model="ctrl.employeeConfigForSave" 47 model="ctrl.employeeConfigForSave"
@@ -51,31 +51,31 @@ @@ -51,31 +51,31 @@
51 dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 51 dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 iterobjname="item" 52 iterobjname="item"
53 iterobjexp="item.name" 53 iterobjexp="item.name"
54 - searchph="$$$$$${txt-3364}" 54 + searchph="{{'employeeConfig_form_page_line54_txt-3364' | translate}}"
55 searchexp="this.name" 55 searchexp="this.name"
56 required > 56 required >
57 </sa-Select5> 57 </sa-Select5>
58 </div> 58 </div>
59 <!-- 隐藏块,显示验证信息 --> 59 <!-- 隐藏块,显示验证信息 -->
60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required"> 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
61 - $$$$$${txt-1788} 61 + {{"employeeConfig_form_page_line61_txt-1788" | translate}}
62 </div> 62 </div>
63 </div> 63 </div>
64 64
65 <div class="form-group has-success has-feedback"> 65 <div class="form-group has-success has-feedback">
66 - <label class="col-md-2 control-label">$$$$$${txt-3222}*:</label> 66 + <label class="col-md-2 control-label">{{"employeeConfig_form_page_line66_txt-3222" | translate}}*:</label>
67 <div class="col-md-3"> 67 <div class="col-md-3">
68 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required 68 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required
69 - placeholder="$$$$$${txt-1268}"/> 69 + placeholder="{{'employeeConfig_form_page_line69_txt-1268' | translate}}"/>
70 </div> 70 </div>
71 <!-- 隐藏块,显示验证信息 --> 71 <!-- 隐藏块,显示验证信息 -->
72 <div class="alert alert-danger well-sm" ng-show="myForm.dbbm.$error.required"> 72 <div class="alert alert-danger well-sm" ng-show="myForm.dbbm.$error.required">
73 - $$$$$${txt-926} 73 + {{"employeeConfig_form_page_line73_txt-926" | translate}}
74 </div> 74 </div>
75 </div> 75 </div>
76 76
77 <div class="form-group has-success has-feedback"> 77 <div class="form-group has-success has-feedback">
78 - <label class="col-md-2 control-label">$$$$$${txt-3568}*:</label> 78 + <label class="col-md-2 control-label">{{"employeeConfig_form_page_line78_txt-3568" | translate}}*:</label>
79 <div class="col-md-3"> 79 <div class="col-md-3">
80 <sa-Select5 name="jsy" 80 <sa-Select5 name="jsy"
81 model="ctrl.employeeConfigForSave" 81 model="ctrl.employeeConfigForSave"
@@ -85,14 +85,14 @@ @@ -85,14 +85,14 @@
85 dsparams="{{ {type: 'local', param: 'ry' } | json }}" 85 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
86 iterobjname="item" 86 iterobjname="item"
87 iterobjexp="item.name + '<' + item.workId + '>'" 87 iterobjexp="item.name + '<' + item.workId + '>'"
88 - searchph="$$$$$${txt-3364}" 88 + searchph="{{'employeeConfig_form_page_line88_txt-3364' | translate}}"
89 searchexp="this.name + '<' + this.workId + '>'" 89 searchexp="this.name + '<' + this.workId + '>'"
90 required > 90 required >
91 </sa-Select5> 91 </sa-Select5>
92 </div> 92 </div>
93 <!-- 隐藏块,显示验证信息 --> 93 <!-- 隐藏块,显示验证信息 -->
94 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required"> 94 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
95 - $$$$$${txt-1226} 95 + {{"employeeConfig_form_page_line95_txt-1226" | translate}}
96 </div> 96 </div>
97 97
98 <!-- 重复配置 --> 98 <!-- 重复配置 -->
@@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
141 </div> 141 </div>
142 142
143 <div class="form-group"> 143 <div class="form-group">
144 - <label class="col-md-2 control-label">$$$$$${txt-2578}</label> 144 + <label class="col-md-2 control-label">{{"employeeConfig_form_page_line144_txt-2578" | translate}}</label>
145 <div class="col-md-3"> 145 <div class="col-md-3">
146 <sa-Select5 name="spy" 146 <sa-Select5 name="spy"
147 model="ctrl.employeeConfigForSave" 147 model="ctrl.employeeConfigForSave"
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 dsparams="{{ {type: 'local', param: 'ry' } | json }}" 151 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
152 iterobjname="item" 152 iterobjname="item"
153 iterobjexp="item.name + '<' + item.workId + '>'" 153 iterobjexp="item.name + '<' + item.workId + '>'"
154 - searchph="$$$$$${txt-3364}" 154 + searchph="{{'employeeConfig_form_page_line154_txt-3364' | translate}}"
155 searchexp="this.name + '<' + this.workId + '>'" 155 searchexp="this.name + '<' + this.workId + '>'"
156 > 156 >
157 </sa-Select5> 157 </sa-Select5>
@@ -211,8 +211,8 @@ @@ -211,8 +211,8 @@
211 <div class="row"> 211 <div class="row">
212 <div class="col-md-offset-3 col-md-4"> 212 <div class="col-md-offset-3 col-md-4">
213 <button type="submit" class="btn green" 213 <button type="submit" class="btn green"
214 - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>  
215 - <a type="button" class="btn default" ui-sref="employeeConfig" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a> 214 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeConfig_form_page_line214_txt-4173" | translate}}</button>
  215 + <a type="button" class="btn default" ui-sref="employeeConfig" ><i class="fa fa-times"></i> {{"employeeConfig_form_page_line215_txt-3817" | translate}}</a>
216 </div> 216 </div>
217 </div> 217 </div>
218 </div> 218 </div>
@@ -222,4 +222,4 @@ @@ -222,4 +222,4 @@
222 </div> 222 </div>
223 223
224 224
225 -</div>  
226 \ No newline at end of file 225 \ No newline at end of file
  226 +</div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-1651}</h1> 3 + <h1>{{"employeeConfig_index_page_line3_txt-1651" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 8 <li>
9 - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a> 9 + <a href="/pages/home.html" data-pjax>{{"employeeConfig_index_page_line9_txt-3807" | translate}}</a>
10 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-1303}</span> 13 + <span class="active">{{"employeeConfig_index_page_line13_txt-1303" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <span class="active">$$$$$${txt-1651}</span> 17 + <span class="active">{{"employeeConfig_index_page_line17_txt-1651" | translate}}</span>
18 </li> 18 </li>
19 </ul> 19 </ul>
20 20
@@ -33,31 +33,31 @@ @@ -33,31 +33,31 @@
33 <div class="portlet-title"> 33 <div class="portlet-title">
34 <div class="caption font-dark"> 34 <div class="caption font-dark">
35 <i class="fa fa-database font-dark"></i> 35 <i class="fa fa-database font-dark"></i>
36 - <span class="caption-subject bold uppercase">$$$$$${txt-3688}</span> 36 + <span class="caption-subject bold uppercase">{{"employeeConfig_index_page_line36_txt-3688" | translate}}</span>
37 </div> 37 </div>
38 <div class="actions"> 38 <div class="actions">
39 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()"> 39 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
40 <i class="fa fa-plus"></i> 40 <i class="fa fa-plus"></i>
41 - $$$$$${txt-3261} 41 + {{"employeeConfig_index_page_line41_txt-3261" | translate}}
42 </a> 42 </a>
43 43
44 <div class="btn-group"> 44 <div class="btn-group">
45 <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown"> 45 <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
46 <i class="fa fa-share"></i> 46 <i class="fa fa-share"></i>
47 - <span>$$$$$${txt-3339}</span> 47 + <span>{{"employeeConfig_index_page_line47_txt-3339" | translate}}</span>
48 <i class="fa fa-angle-down"></i> 48 <i class="fa fa-angle-down"></i>
49 </a> 49 </a>
50 <ul class="dropdown-menu pull-right"> 50 <ul class="dropdown-menu pull-right">
51 <li> 51 <li>
52 <a href="javascript:" class="tool-action" ng-click="ctrl.importData()"> 52 <a href="javascript:" class="tool-action" ng-click="ctrl.importData()">
53 <i class="fa fa-file-excel-o"></i> 53 <i class="fa fa-file-excel-o"></i>
54 - $$$$$${txt-4449} 54 + {{"employeeConfig_index_page_line54_txt-4449" | translate}}
55 </a> 55 </a>
56 </li> 56 </li>
57 <li> 57 <li>
58 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()"> 58 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
59 <i class="fa fa-file-excel-o"></i> 59 <i class="fa fa-file-excel-o"></i>
60 - $$$$$${txt-4493} 60 + {{"employeeConfig_index_page_line60_txt-4493" | translate}}
61 </a> 61 </a>
62 </li> 62 </li>
63 <!--<li class="divider"></li>--> 63 <!--<li class="divider"></li>-->
@@ -77,4 +77,4 @@ @@ -77,4 +77,4 @@
77 </div> 77 </div>
78 </div> 78 </div>
79 </div> 79 </div>
80 -</div>  
81 \ No newline at end of file 80 \ No newline at end of file
  81 +</div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
@@ -4,16 +4,16 @@ @@ -4,16 +4,16 @@
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th style="width: 70px;">$$$$$${txt-3934}</th>  
8 - <th style="width: 150px;">$$$$$${txt-3815}</th>  
9 - <th style="width: 80px;">$$$$$${txt-3222}</th>  
10 - <th >$$$$$${txt-2255}</th>  
11 - <th style="width: 15%;">$$$$$${txt-3568}</th>  
12 - <th >$$$$$${txt-2189}</th>  
13 - <th >$$$$$${txt-3567}</th>  
14 - <th style="width: 80px;">$$$$$${txt-3874}1</th>  
15 - <th style="width: 80px;">$$$$$${txt-3874}2</th>  
16 - <th style="width: 21%">$$$$$${txt-3942}</th> 7 + <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line7_txt-3934" | translate}}</th>
  8 + <th style="width: 150px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line8_txt-3347" | translate}}</th>
  9 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line9_txt-3222" | translate}}</th>
  10 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line10_txt-2255" | translate}}</th>
  11 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line11_txt-3568" | translate}}</th>
  12 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line12_txt-2189" | translate}}</th>
  13 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line13_txt-3567" | translate}}</th>
  14 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line14_txt-3874" | translate}}1</th>
  15 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line14_txt-3874" | translate}}2</th>
  16 + <th style="width: 230px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeConfig_list_page_line16_txt-3942" | translate}}</th>
17 </tr> 17 </tr>
18 <tr role="row" class="filter"> 18 <tr role="row" class="filter">
19 <td></td> 19 <td></td>
@@ -27,40 +27,41 @@ @@ -27,40 +27,41 @@
27 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 27 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
28 iterobjname="item" 28 iterobjname="item"
29 iterobjexp="item.name" 29 iterobjexp="item.name"
30 - searchph="$$$$$${txt-3364}" 30 + searchph="{{'employeeConfig_list_page_line30_txt-3364' | translate}}"
31 searchexp="this.name" 31 searchexp="this.name"
  32 + width="120"
32 required > 33 required >
33 </sa-Select5> 34 </sa-Select5>
34 </div> 35 </div>
35 </td> 36 </td>
36 <td></td> 37 <td></td>
37 <td> 38 <td>
38 - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.jobCodeori_like']" placeholder="$$$$$${txt-3232}"/> 39 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.jobCodeori_like']" placeholder="{{'employeeConfig_list_page_line38_txt-3232' | translate}}"/>
39 </td> 40 </td>
40 <td> 41 <td>
41 - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.personnelName_like']" placeholder="$$$$$${txt-3231}"/> 42 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.personnelName_like']" placeholder="{{'employeeConfig_list_page_line41_txt-3231' | translate}}"/>
42 </td> 43 </td>
43 <td> 44 <td>
44 - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.jobCodeori_like']" placeholder="$$$$$${txt-3232}"/> 45 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.jobCodeori_like']" placeholder="{{'employeeConfig_list_page_line44_txt-3232' | translate}}"/>
45 </td> 46 </td>
46 <td> 47 <td>
47 - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="$$$$$${txt-3231}"/> 48 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="{{'employeeConfig_list_page_line47_txt-3231' | translate}}"/>
48 </td> 49 </td>
49 <td> 50 <td>
50 <label class="checkbox-inline"> 51 <label class="checkbox-inline">
51 - <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>$$$$$${txt-3746} 52 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>{{"employeeConfig_list_page_line51_txt-3746" | translate}}
52 </label> 53 </label>
53 </td> 54 </td>
54 <td> 55 <td>
55 <label class="checkbox-inline"> 56 <label class="checkbox-inline">
56 - <input type="checkbox" ng-model="ctrl.personIsDestroyCheck"/>$$$$$${txt-3747} 57 + <input type="checkbox" ng-model="ctrl.personIsDestroyCheck"/>{{"employeeConfig_list_page_line56_txt-3747" | translate}}
57 </label> 58 </label>
58 </td> 59 </td>
59 <td> 60 <td>
60 <div class="btn-group"> 61 <div class="btn-group">
61 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;" 62 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
62 ng-click="ctrl.doPage()"> 63 ng-click="ctrl.doPage()">
63 - <i class="fa fa-search"></i> $$$$$${txt-4001}</button> 64 + <i class="fa fa-search"></i> {{"employeeConfig_list_page_line63_txt-4001" | translate}}</button>
64 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle" 65 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
65 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 66 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
66 <span class="caret"></span> 67 <span class="caret"></span>
@@ -70,7 +71,7 @@ @@ -70,7 +71,7 @@
70 <li> 71 <li>
71 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()"> 72 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
72 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i> 73 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
73 - $$$$$${txt-3385} 74 + {{"employeeConfig_list_page_line73_txt-3385" | translate}}
74 </a> 75 </a>
75 </li> 76 </li>
76 </ul> 77 </ul>
@@ -78,7 +79,7 @@ @@ -78,7 +79,7 @@
78 79
79 <button class="btn btn-sm red btn-outline filter-cancel" 80 <button class="btn btn-sm red btn-outline filter-cancel"
80 ng-click="ctrl.reset()"> 81 ng-click="ctrl.reset()">
81 - <i class="fa fa-times"></i> $$$$$${txt-4000}</button> 82 + <i class="fa fa-times"></i> {{"employeeConfig_list_page_line81_txt-4000" | translate}}</button>
82 </td> 83 </td>
83 84
84 </tr> 85 </tr>
@@ -104,13 +105,13 @@ @@ -104,13 +105,13 @@
104 <span ng-bind="info.jsy.jobCodeori"></span> 105 <span ng-bind="info.jsy.jobCodeori"></span>
105 </td> 106 </td>
106 <td ng-class="{danger: info.jsy.destroy == 1}"> 107 <td ng-class="{danger: info.jsy.destroy == 1}">
107 - <span ng-bind="info.jsy.personnelName + (info.jsy.destroy == 1 ? '($$$$$${txt-3747})' : '')"></span> 108 + <span ng-bind="info.jsy.personnelName + (info.jsy.destroy == 1 ? ('employeeConfig_list_page_line107_txt-3747' | translate) : '')"></span>
108 </td> 109 </td>
109 <td> 110 <td>
110 <span ng-bind="info.spy.jobCodeori"></span> 111 <span ng-bind="info.spy.jobCodeori"></span>
111 </td> 112 </td>
112 <td> 113 <td>
113 - <span ng-bind="info.spy.personnelName + (info.spy.destroy == 1 ? '($$$$$${txt-3747})' : '')"></span> 114 + <span ng-bind="info.spy.personnelName + (info.spy.destroy == 1 ? ('employeeConfig_list_page_line113_txt-3747' | translate) : '')"></span>
114 </td> 115 </td>
115 <td> 116 <td>
116 <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span> 117 <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
@@ -123,14 +124,18 @@ @@ -123,14 +124,18 @@
123 <td> 124 <td>
124 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 125 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
125 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 126 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
126 - <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>  
127 - <a ui-sref="employeeConfig_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> $$$$$${txt-4028} </a> 127 + <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> {{"employeeConfig_list_page_line126_txt-3866" | translate}} </a>
  128 + <a ui-sref="employeeConfig_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> {{"employeeConfig_list_page_line127_txt-4028" | translate}} </a>
128 <a sweetalert 129 <a sweetalert
129 - sweet-options="{title: '$$$$$${txt-389}',text: '$$$$$${txt-3429}' + info.xl.name + '</br>$$$$$${txt-1785}' + info.jsy.jobCode + '</br>$$$$$${txt-31}', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '$$$$$${txt-4257}',cancelButtonText: '$$$$$${txt-3817}'}" 130 + sweet-options="{title: ('employeeConfig_list_page_line129_txt-389' | translate),
  131 + text: ('employeeConfig_list_page_line130_txt-3429' | translate) + info.xl.name + '</br>' + ('employeeConfig_list_page_line130_txt-1785' | translate) + info.jsy.jobCode + '</br>' + ('employeeConfig_list_page_line130_txt-31' | translate),
  132 + html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',
  133 + confirmButtonText: ('employeeConfig_list_page_line132_txt-4257' | translate),
  134 + cancelButtonText: ('employeeConfig_list_page_line133_txt-3817' | translate)}"
130 sweet-on-confirm="ctrl.toggleEmpConfig(info.id)" 135 sweet-on-confirm="ctrl.toggleEmpConfig(info.id)"
131 class="btn btn-danger btn-sm" 136 class="btn btn-danger btn-sm"
132 - ng-if="info.isCancel == '0'">$$$$$${txt-4143}</a>  
133 - <a ng-click="ctrl.toggleEmpConfig(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> $$$$$${txt-4211} </a> 137 + ng-if="info.isCancel == '0'">{{"employeeConfig_list_page_line136_txt-4143" | translate}}</a>
  138 + <a ng-click="ctrl.toggleEmpConfig(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> {{"employeeConfig_list_page_line137_txt-4211" | translate}} </a>
134 </td> 139 </td>
135 </tr> 140 </tr>
136 </tbody> 141 </tbody>
@@ -138,8 +143,11 @@ @@ -138,8 +143,11 @@
138 </div> 143 </div>
139 144
140 <div class="pageBar"> 145 <div class="pageBar">
141 - <div class="pageBarLeft">  
142 - $$$$$${txt-3053} 146 + <div class="pageBarLeft"
  147 + translate="employeeConfig_list_page_line146_txt-3053"
  148 + translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
  149 + translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
  150 + translate-value-total="{{ ctrl.page()['totalElements'] }}">
143 </div> 151 </div>
144 152
145 <div class="pageBarRight"> 153 <div class="pageBarRight">
@@ -149,10 +157,10 @@ @@ -149,10 +157,10 @@
149 rotate="false" 157 rotate="false"
150 max-size="10" 158 max-size="10"
151 boundary-links="true" 159 boundary-links="true"
152 - first-text="$$$$$${txt-4430}"  
153 - previous-text="$$$$$${txt-3613}"  
154 - next-text="$$$$$${txt-3614}"  
155 - last-text="$$$$$${txt-4068}"> 160 + first-text="{{'employeeConfig_list_page_line159_txt-4430' | translate}}"
  161 + previous-text="{{'employeeConfig_list_page_line160_txt-3613' | translate}}"
  162 + next-text="{{'employeeConfig_list_page_line161_txt-3614' | translate}}"
  163 + last-text="{{'employeeConfig_list_page_line162_txt-4068' | translate}}">
156 </uib-pagination> 164 </uib-pagination>
157 </div> 165 </div>
158 </div> 166 </div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory( @@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
5 [ 5 [
6 'EmployeeConfigService_g', 6 'EmployeeConfigService_g',
7 'UserPrincipal', 7 'UserPrincipal',
8 - function(service, UserPrincipal) { 8 + '$translate',
  9 + function(service, UserPrincipal, translate) {
9 /** 当前的查询条件信息 */ 10 /** 当前的查询条件信息 */
10 var currentSearchCondition = {'isCancel_eq': false}; 11 var currentSearchCondition = {'isCancel_eq': false};
11 // 当前查询返回的信息 12 // 当前查询返回的信息
@@ -21,13 +22,13 @@ angular.module(&#39;ScheduleApp&#39;).factory( @@ -21,13 +22,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(
21 22
22 // 字段描述 23 // 字段描述
23 var columns = [ 24 var columns = [
24 - {name: "xl.name", desc: i18n('txt-3347')},  
25 - {name: "dbbmFormula", desc: i18n('txt-3222')},  
26 - {name: "jsy.jobCodeori", desc: i18n('txt-2255')},  
27 - {name: "jsy.personnelName", desc: i18n('txt-2254')},  
28 - {name: "spy.jobCodeori", desc: i18n('txt-2189')},  
29 - {name: "spy.personnelName", desc: i18n('txt-2071')},  
30 - {name: "isCancel", desc: i18n('txt-3127')} 25 + {name: "xl.name", desc: translate.instant("employeeConfig_module_js_line25_txt-3347")},
  26 + {name: "dbbmFormula", desc: translate.instant("employeeConfig_module_js_line26_txt-3222")},
  27 + {name: "jsy.jobCodeori", desc: translate.instant("employeeConfig_module_js_line27_txt-2255")},
  28 + {name: "jsy.personnelName", desc: translate.instant("employeeConfig_module_js_line28_txt-2254")},
  29 + {name: "spy.jobCodeori", desc: translate.instant("employeeConfig_module_js_line29_txt-2189")},
  30 + {name: "spy.personnelName", desc: translate.instant("employeeConfig_module_js_line30_txt-2071")},
  31 + {name: "isCancel", desc: translate.instant("employeeConfig_module_js_line31_txt-3127")}
31 ]; 32 ];
32 // 排序字段 33 // 排序字段
33 var orderColumns = { 34 var orderColumns = {
@@ -108,7 +109,7 @@ angular.module(&#39;ScheduleApp&#39;).factory( @@ -108,7 +109,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
108 {xlid: currentSearchCondition['xl.id_eq']} 109 {xlid: currentSearchCondition['xl.id_eq']}
109 ).$promise; 110 ).$promise;
110 } else { 111 } else {
111 - alert(i18n('txt-1806')); 112 + alert(translate.instant("employeeConfig_module_js_line112_txt-1806"));
112 return null; 113 return null;
113 } 114 }
114 }, 115 },
@@ -130,7 +131,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -130,7 +131,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
130 '$state', 131 '$state',
131 '$uibModal', 132 '$uibModal',
132 'FileDownload_g', 133 'FileDownload_g',
133 - function(service, $state, $uibModal, fileDownload) { 134 + '$translate',
  135 + function(service, $state, $uibModal, fileDownload, translate) {
134 var self = this; 136 var self = this;
135 137
136 // 切换到form状态 138 // 切换到form状态
@@ -171,7 +173,7 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -171,7 +173,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
171 if (p) { 173 if (p) {
172 p.then( 174 p.then(
173 function(result) { 175 function(result) {
174 - fileDownload.downloadFile(result.data, "application/octet-stream", "' + i18n('txt-1613') + '.xls"); 176 + fileDownload.downloadFile(result.data, "application/octet-stream", translate.instant("employeeConfig_module_js_line176_txt-1613") + ".xls");
175 }, 177 },
176 function(result) { 178 function(result) {
177 console.log("exportData failed:" + result); 179 console.log("exportData failed:" + result);
@@ -225,7 +227,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -225,7 +227,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
225 [ 227 [
226 'EmployeeConfigService', 228 'EmployeeConfigService',
227 '$uibModal', 229 '$uibModal',
228 - function(service, $uibModal) { 230 + '$translate',
  231 + function(service, $uibModal, translate) {
229 var self = this; 232 var self = this;
230 var EmpConfig = service.getQueryClass(); 233 var EmpConfig = service.getQueryClass();
231 234
@@ -261,7 +264,7 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -261,7 +264,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
261 self.toggleEmpConfig = function(id) { 264 self.toggleEmpConfig = function(id) {
262 EmpConfig.delete({id: id}, function(result) { 265 EmpConfig.delete({id: id}, function(result) {
263 if (result.msg) { // 暂时这样做,之后全局拦截 266 if (result.msg) { // 暂时这样做,之后全局拦截
264 - alert(i18n('txt-3729') + result.msg); 267 + alert(translate.instant("employeeConfig_module_js_line267_txt-3729") + result.msg);
265 } else { 268 } else {
266 self.doPage(); 269 self.doPage();
267 } 270 }
@@ -391,7 +394,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -391,7 +394,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
391 [ 394 [
392 'EmployeeConfigService', 395 'EmployeeConfigService',
393 '$stateParams', 396 '$stateParams',
394 - function(service, $stateParams) { 397 + '$translate',
  398 + function(service, $stateParams, translate) {
395 var self = this; 399 var self = this;
396 var EmpConfig = service.getQueryClass(); 400 var EmpConfig = service.getQueryClass();
397 var id = $stateParams.id; 401 var id = $stateParams.id;
@@ -402,7 +406,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -402,7 +406,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
402 // 当转向到此页面时,就获取明细信息并绑定 406 // 当转向到此页面时,就获取明细信息并绑定
403 EmpConfig.get({id: id}, function(value) { 407 EmpConfig.get({id: id}, function(value) {
404 self.employeeConfigForDetail = value; 408 self.employeeConfigForDetail = value;
405 - self.title = i18n('txt-1781', [self.employeeConfigForDetail.jsy.personnelName]); 409 + self.title = translate.instant("employeeConfig_module_js_line409_txt-1781",
  410 + {"jsyName" : self.employeeConfigForDetail.jsy.personnelName});
406 }); 411 });
407 } 412 }
408 ] 413 ]
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/orderOptionOpen.html
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="modal-title"> 2 <div class="modal-title">
3 <h3> 3 <h3>
4 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i> 4 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
5 - <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span> 5 + <span class="caption-subject bold uppercase">{{"employeeConfig_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
6 </h3> 6 </h3>
7 </div> 7 </div>
8 </div> 8 </div>
@@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
14 </sa-Orderoption> 14 </sa-Orderoption>
15 </div> 15 </div>
16 <div class="modal-footer"> 16 <div class="modal-footer">
17 - <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>  
18 -</div>  
19 \ No newline at end of file 17 \ No newline at end of file
  18 + <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"employeeConfig_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
  19 +</div>