Merge remote-tracking branch 'origin/pudong_jdk8_wvp' into pudong_jdk8_wvp

liujun001
2 parents 59dcfaa9 f7f6dfda
Showing 24 changed files with 3466 additions and 2944 deletions
src/main/resources/static/pages/scheduleApp/language/en.js
src/main/resources/static/pages/scheduleApp/language/zh.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/orderOptionOpen.html
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html
src/main/resources/static/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html
@@ -2,10 +2,52 @@
 // 英文资源
 var ScheduleApp_en_language = {
+    // main.js
+    "main_js_line_82_txt-3966" : "Operation",
+    "main_js_line_83_txt-3958" : "Lack of vehicles",
+    "main_js_line_84_txt-3960" : "Climate",
+    "main_js_line_85_txt-3837" : "Accident",
+    "main_js_line_86_txt-3838" : "Dispute",
+    "main_js_line_87_txt-3876" : "Reduction",
+    "main_js_line_88_txt-4026" : "Vehicle allocation",
+    "main_js_line_89_txt-3840" : "Fault",
+    "main_js_line_90_txt-3961" : "Road obstruction",
+    "main_js_line_91_txt-3962" : "Few passengers",
+    "main_js_line_92_txt-3963" : "Slow hanging",
+    "main_js_line_93_txt-4197" : "Other",
+    "main_js_line_94_txt-4102" : "Maintenance",
+    "main_js_line_95_txt-3957" : "Lack of manpower",
+    "main_js_line_96_txt-3956" : "Foreign aid",
+    "main_js_line_99_txt-2790" : "Current version",
+    "main_js_line_100_txt-168" : "All Versions (To be Updated, Current, Historical)",
+    "main_js_line_301_txt-1805" : "Please Log in Again!",
+    "main_js_line_304_txt-2284" : "Status Code:",
+    "main_js_line_305_txt-2285" : "Access Path:",
+    "main_js_line_306_txt-2286" : "Error Message:",
+    "main_js_line_307_txt-1807" : "Server Error:",
+    "main_js_line_325_txt-695" : "It seems that the server cannot connect",
+    "main_js_line_327_txt-2284" : "Status Code:",
+    "main_js_line_330_txt-2325" : "Error Content:",
+    "main_js_line_332_txt-2325" : "Error Content:",
+    "main_js_line_336_txt-1807" : "Server Error:",
+    "main_js_line_338_txt-1838" : "Please Log in Again:",
+    "main_js_line_340_txt-2333" : "Other Errors:",
+    "main_js_line_383_txt-1149" : "Subpages Loaded:",
+
+    //------------ 自定义指令 --------------//
+    // 指令位置：../module/common/dts2/queryOption
+    // 页面：saOrderOptionTemplate.html
+    "queryOption_saOrderOptionTemplate_line93_txt-4157" : "Ascending order",
+    "queryOption_saOrderOptionTemplate_line94_txt-4156" : "Descending order",
+
+    // 指令位置：../module/common/dts1/select
+    // js：saSelect5.js
+    "saSelect5_js_line375_txt-1275" : "Dictionary data is not available=",
+
     //------------ 车辆信息管理模块 -----------//
     // 模块位置：../module/basicInfo/busInfoManage
-    // 页面；index.html
+    // 页面；index.html
     // line3
     "busInfoManage_index_page-title" : "vehicle information management",
     // line9
@@ -57,11 +99,11 @@ var ScheduleApp_en_language = {
     "busInfoManage_list_page_line142_txt-4257" : "Yes",
     "busInfoManage_list_page_line142_txt-3817" : "Cancel",
     "busInfoManage_list_page_line144_txt-3868" : "Delete",
-    "busInfoManage_list_page_line153_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
-    "busInfoManage_list_page_line163_txt-4430" : "First",
-    "busInfoManage_list_page_line164_txt-3613" : "Previous",
-    "busInfoManage_list_page_line165_txt-3614" : "Next",
-    "busInfoManage_list_page_line166_txt-4068" : "Last",
+    "busInfoManage_list_page_line156_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
+    "busInfoManage_list_page_line169_txt-4430" : "First",
+    "busInfoManage_list_page_line170_txt-3613" : "Previous",
+    "busInfoManage_list_page_line171_txt-3614" : "Next",
+    "busInfoManage_list_page_line172_txt-4068" : "Last",
     // 页面：detail.html
     "busInfoManage_detail_page_line3_txt-1656" : "vehicle details",
@@ -287,8 +329,273 @@ var ScheduleApp_en_language = {
     "busInfoManage_module_js_line434_txt-4009" : "Vehicles",
     "busInfoManage_module_js_line434_txt-3066" : "Details",
+    //------------ 人员信息管理模块 -----------//
+    // 模块位置：../module/basicInfo/employeeInfoManage
+    // 页面；index.html
+    "employeeInfoManage_index_page_line3_txt-1658" : "Personnel information management",
+    "employeeInfoManage_index_page_line9_txt-3807" : "Home page",
+    "employeeInfoManage_index_page_line13_txt-2398" : "Basic information",
+    "employeeInfoManage_index_page_line17_txt-1658" : "Personnel information management",
+    "employeeInfoManage_index_page_line36_txt-2234" : "Personnel information table",
+    "employeeInfoManage_index_page_line41_txt-1648" : "Add personnel information",
+    "employeeInfoManage_index_page_line47_txt-3339" : "Data tool",
+    "employeeInfoManage_index_page_line54_txt-4493" : "Export to excel",
+
+    // 页面：orderOptionOpen.html
+    "employeeInfoManage_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
+    "employeeInfoManage_orderOptionOpen_page_line17_txt-4018" : "Yes",
+
+    // 页面：list.html
+    "employeeInfoManage_list_page_line7_txt-3934" : "Serial number",
+    "employeeInfoManage_list_page_line8_txt-3949" : "Name",
+    "employeeInfoManage_list_page_line9_txt-3955" : "No.",
+    "employeeInfoManage_list_page_line10_txt-3940" : "Employee number",
+    "employeeInfoManage_list_page_line11_txt-3095" : "Kingdee employee number",
+    "employeeInfoManage_list_page_line12_txt-4086" : "Gender",
+    "employeeInfoManage_list_page_line13_txt-3096" : "Company",
+    "employeeInfoManage_list_page_line14_txt-3777" : "Branch company",
+    "employeeInfoManage_list_page_line15_txt-4093" : "Occupation type",
+    "employeeInfoManage_list_page_line16_txt-4085" : "Deactivate",
+    "employeeInfoManage_list_page_line17_txt-3942" : "Operation",
+    "employeeInfoManage_list_page_line23_txt-3231" : "Enter name",
+    "employeeInfoManage_list_page_line26_txt-3233" : "Enter number",
+    "employeeInfoManage_list_page_line29_txt-3232" : "Enter employee number",
+    "employeeInfoManage_list_page_line32_txt-3232" : "Enter employee number",
+    "employeeInfoManage_list_page_line45_txt-3364" : "Please enter pinyin",
+    "employeeInfoManage_list_page_line60_txt-3364" : "Please enter pinyin",
+    "employeeInfoManage_list_page_line75_txt-3364" : "Please enter pinyin",
+    "employeeInfoManage_list_page_line82_txt-4085" : "Deactivate",
+    "employeeInfoManage_list_page_line89_txt-4001" : "Search",
+    "employeeInfoManage_list_page_line99_txt-3385" : "Sorting options",
+    "employeeInfoManage_list_page_line107_txt-4000" : "Reset",
+    "employeeInfoManage_list_page_line120_txt-4426" : "Name/Job-code:",
+    "employeeInfoManage_list_page_line142_txt-4058" : "Unknown",
+    "employeeInfoManage_list_page_line163_txt-4058" : "Unknown",
+    "employeeInfoManage_list_page_line171_txt-3866" : "Details",
+    "employeeInfoManage_list_page_line172_txt-4028" : "Modify",
+    "employeeInfoManage_list_page_line174_txt-675" : "Do you want to delete personnel information?",
+    "employeeInfoManage_list_page_line175_txt-3719" : "Name:",
+    "employeeInfoManage_list_page_line175_txt-3761" : "Employee number:",
+    "employeeInfoManage_list_page_line175_txt-40" : "If there is personnel configuration information associated, an error will be reported. It is recommended not to delete it casually!",
+    "employeeInfoManage_list_page_line177_txt-4257" : "Yes",
+    "employeeInfoManage_list_page_line178_txt-3817" : "Cancel",
+    "employeeInfoManage_list_page_line180_txt-3868" : "Delete",
+    "employeeInfoManage_list_page_line189_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
+    "employeeInfoManage_list_page_line202_txt-4430" : "First",
+    "employeeInfoManage_list_page_line203_txt-3613" : "Previous",
+    "employeeInfoManage_list_page_line204_txt-3614" : "Next",
+    "employeeInfoManage_list_page_line205_txt-4068" : "Last",
+
+    // 页面：detail.html
+    "employeeInfoManage_detail_page_line3_txt-1650" : "Personnel details",
+    "employeeInfoManage_detail_page_line9_txt-3807" : "Home page",
+    "employeeInfoManage_detail_page_line13_txt-2398" : "Basic information",
+    "employeeInfoManage_detail_page_line17_txt-1658" : "Personnel information management",
+    "employeeInfoManage_detail_page_line21_txt-1650" : "Personnel details",
+    "employeeInfoManage_detail_page_line38_txt-2686" : "Company",
+    "employeeInfoManage_detail_page_line45_txt-1765" : "Affiliated branch:",
+    "employeeInfoManage_detail_page_line52_txt-3955" : "No.",
+    "employeeInfoManage_detail_page_line59_txt-3949" : "Name",
+    "employeeInfoManage_detail_page_line66_txt-902" : "Operation service certificate number:",
+    "employeeInfoManage_detail_page_line73_txt-903" : "One-card work card number:",
+    "employeeInfoManage_detail_page_line80_txt-3698" : "Gender:",
+    "employeeInfoManage_detail_page_line86_txt-3703" : "Occupation type:",
+    "employeeInfoManage_detail_page_line89_txt-4058" : "Unknown",
+
+    // 页面：edit.html
+    "employeeInfoManage_edit_page_line3_txt-1643" : "Modify personnel information",
+    "employeeInfoManage_edit_page_line9_txt-3807" : "Home page",
+    "employeeInfoManage_edit_page_line13_txt-2398" : "Basic information",
+    "employeeInfoManage_edit_page_line17_txt-1658" : "Personnel information management",
+    "employeeInfoManage_edit_page_line21_txt-1643" : "Modify personnel information",
+    "employeeInfoManage_edit_page_line29_txt-3849" : "Form",
+    "employeeInfoManage_edit_page_line37_txt-2686" : "Company",
+    "employeeInfoManage_edit_page_line47_txt-973" : "Please select the company",
+    "employeeInfoManage_edit_page_line55_txt-1792" : "Company must be selected",
+    "employeeInfoManage_edit_page_line60_txt-3777" : "Branch company",
+    "employeeInfoManage_edit_page_line70_txt-973" : "Please select the branch",
+    "employeeInfoManage_edit_page_line79_txt-923" : "Branch must also be selected",
+    "employeeInfoManage_edit_page_line84_txt-3940" : "Employee number",
+    "employeeInfoManage_edit_page_line88_txt-2346" : "Please enter employee number",
+    "employeeInfoManage_edit_page_line95_txt-1793" : "Employee number must be filled in",
+    "employeeInfoManage_edit_page_line103_txt-3949" : "Name",
+    "employeeInfoManage_edit_page_line107_txt-2345" : "Please enter name",
+    "employeeInfoManage_edit_page_line111_txt-1787" : "Name must be filled in",
+    "employeeInfoManage_edit_page_line116_txt-902" : "Operation service certificate number:",
+    "employeeInfoManage_edit_page_line119_txt-516" : "Please enter the operation service certificate number",
+    "employeeInfoManage_edit_page_line124_txt-2244" : "One-card number:",
+    "employeeInfoManage_edit_page_line127_txt-517" : "Please enter your work card number",
+    "employeeInfoManage_edit_page_line132_txt-3698" : "Gender:",
+    "employeeInfoManage_edit_page_line139_txt-3703" : "Occupation type:",
+    "employeeInfoManage_edit_page_line149_txt-3364" : "Please enter pinyin",
+    "employeeInfoManage_edit_page_line157_txt-3449" : "Remarks:",
+    "employeeInfoManage_edit_page_line174_txt-4173" : "Submit",
+    "employeeInfoManage_edit_page_line175_txt-3817" : "Cancel",
+
+    // 页面：form.html
+    "employeeInfoManage_form_page_line3_txt-1648" : "Add personnel information",
+    "employeeInfoManage_form_page_line9_txt-3807" : "Home page",
+    "employeeInfoManage_form_page_line13_txt-2398" : "Basic information",
+    "employeeInfoManage_form_page_line17_txt-1658" : "Personnel information management",
+    "employeeInfoManage_form_page_line21_txt-1648" : "Add personnel information",
+    "employeeInfoManage_form_page_line29_txt-3849" : "Form",
+    "employeeInfoManage_form_page_line37_txt-2686" : "Company",
+    "employeeInfoManage_form_page_line47_txt-973" : "Please select the company",
+    "employeeInfoManage_form_page_line55_txt-1792" : "Company must be selected",
+    "employeeInfoManage_form_page_line60_txt-3777" : "Branch company",
+    "employeeInfoManage_form_page_line70_txt-973" : "Please select the branch",
+    "employeeInfoManage_form_page_line79_txt-923" : "Branch must also be selected",
+    "employeeInfoManage_form_page_line84_txt-3940" : "Employee number",
+    "employeeInfoManage_form_page_line88_txt-2346" : "Please enter employee number",
+    "employeeInfoManage_form_page_line95_txt-1793" : "Employee number must be filled in",
+    "employeeInfoManage_form_page_line103_txt-3949" : "Name",
+    "employeeInfoManage_form_page_line107_txt-2345" : "Please enter name",
+    "employeeInfoManage_form_page_line111_txt-1787" : "Name must be filled in",
+    "employeeInfoManage_form_page_line116_txt-902" : "Operation service certificate number:",
+    "employeeInfoManage_form_page_line119_txt-516" : "Please enter the operation service certificate number",
+    "employeeInfoManage_form_page_line124_txt-2244" : "One-card number:",
+    "employeeInfoManage_form_page_line127_txt-517" : "Please enter your work card number",
+    "employeeInfoManage_form_page_line132_txt-3698" : "Gender:",
+    "employeeInfoManage_form_page_line139_txt-3703" : "Occupation type:",
+    "employeeInfoManage_form_page_line149_txt-3364" : "Please enter pinyin",
+    "employeeInfoManage_form_page_line157_txt-3449" : "Remarks:",
+    "employeeInfoManage_form_page_line174_txt-4173" : "Submit",
+    "employeeInfoManage_form_page_line175_txt-3817" : "Cancel",
+
+    // module.js
+    "employeeInfoManage_module_js_line33_txt-3949" : "Name",
+    "employeeInfoManage_module_js_line34_txt-3940" : "Worker number",
+    "employeeInfoManage_module_js_line35_txt-4086" : "Gender",
+    "employeeInfoManage_module_js_line36_txt-3096" : "Company",
+    "employeeInfoManage_module_js_line37_txt-3777" : "Branch company",
+    "employeeInfoManage_module_js_line38_txt-4093" : "Occupation type",
+    "employeeInfoManage_module_js_line182_txt-1614" : "Basic information of personnel",
+    "employeeInfoManage_module_js_line286_txt-3729" : "Failed:",
+    "employeeInfoManage_module_js_line411_txt-4081" : "Employee",
+    "employeeInfoManage_module_js_line413_txt-3066" : "Details",
+
+    //------------ 车辆设备信息管理模块 -----------//
+    // 模块位置：../module/basicInfo/deviceInfoManage
+    // 页面；index.html
+    "deviceInfoManage_index_page_line3_txt-848" : "Vehicle equipment information management",
+    "deviceInfoManage_index_page_line9_txt-3807" : "Home page",
+    "deviceInfoManage_index_page_line13_txt-2398" : "Basic information",
+    "deviceInfoManage_index_page_line17_txt-848" : "Vehicle equipment information management",
+    "deviceInfoManage_index_page_line27_txt-2233" : "Equipment information table",
+    "deviceInfoManage_index_page_line32_txt-1791" : "Add equipment information",
+
+    // 页面：orderOptionOpen.html
+    "deviceInfoManage_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
+    "deviceInfoManage_orderOptionOpen_page_line17_txt-4018" : "Yes",
+
+    // 页面：list.html
+    "deviceInfoManage_list_page_line17_txt-3934" : "Serial number",
+    "deviceInfoManage_list_page_line18_txt-3347" : "Route name",
+    "deviceInfoManage_list_page_line19_txt-2597" : "Internal number",
+    "deviceInfoManage_list_page_line20_txt-3211" : "Activation date",
+    "deviceInfoManage_list_page_line21_txt-2185" : "Old equipment number",
+    "deviceInfoManage_list_page_line22_txt-2184" : "New equipment number",
+    "deviceInfoManage_list_page_line23_txt-4389" : "Operator/Operation time",
+    "deviceInfoManage_list_page_line24_txt-3874" : "Status",
+    "deviceInfoManage_list_page_line25_txt-3942" : "Operation",
+    "deviceInfoManage_list_page_line38_txt-3364" : "Please enter pinyin",
+    "deviceInfoManage_list_page_line44_txt-1773" : "Enter internal number",
+    "deviceInfoManage_list_page_line52_txt-4162" : "Scrapped",
+    "deviceInfoManage_list_page_line59_txt-4001" : "Search",
+    "deviceInfoManage_list_page_line69_txt-3385" : "Sorting options",
+    "deviceInfoManage_list_page_line77_txt-4000" : "Reset",
+    "deviceInfoManage_list_page_line122_txt-4058" : "Unknown",
+    "deviceInfoManage_list_page_line127_txt-3866" : "Details",
+    "deviceInfoManage_list_page_line144_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
+    "deviceInfoManage_list_page_line157_txt-4430" : "First",
+    "deviceInfoManage_list_page_line158_txt-3613" : "Previous",
+    "deviceInfoManage_list_page_line159_txt-3614" : "Next",
+    "deviceInfoManage_list_page_line160_txt-4068" : "Last",
+
+    // 页面：detail.html
+    "deviceInfoManage_detail_page_line3_txt-847" : "Vehicle equipment details",
+    "deviceInfoManage_detail_page_line9_txt-3807" : "Home page",
+    "deviceInfoManage_detail_page_line13_txt-2398" : "Basic information",
+    "deviceInfoManage_detail_page_line17_txt-848" : "Vehicle equipment information management",
+    "deviceInfoManage_detail_page_line21_txt-847" : "Vehicle equipment details",
+    "deviceInfoManage_detail_page_line38_txt-1476" : "Vehicle internal number",
+    "deviceInfoManage_detail_page_line45_txt-3347" : "Route name",
+    "deviceInfoManage_detail_page_line52_txt-3216" : "Old terminal number",
+    "deviceInfoManage_detail_page_line59_txt-3201" : "New terminal number",
+    "deviceInfoManage_detail_page_line67_txt-4422" : "Old SIM card number:",
+    "deviceInfoManage_detail_page_line74_txt-3701" : "New SIM card number:",
+    "deviceInfoManage_detail_page_line82_txt-2258" : "Fault description:",
+    "deviceInfoManage_detail_page_line90_txt-4403" : "Description:",
+    "deviceInfoManage_detail_page_line98_txt-3211" : "Activation date",
+
+    // 页面：edit.html
+    "deviceInfoManage_edit_page_line3_txt-836" : "Modify vehicle equipment information",
+    "deviceInfoManage_edit_page_line9_txt-3807" : "Home page",
+    "deviceInfoManage_edit_page_line13_txt-2398" : "Basic information",
+    "deviceInfoManage_edit_page_line17_txt-848" : "Vehicle equipment information management",
+    "deviceInfoManage_edit_page_line21_txt-836" : "Modify vehicle equipment information",
+    "deviceInfoManage_edit_page_line29_txt-3849" : "Form",
+    "deviceInfoManage_edit_page_line38_txt-3347" : "Route name",
+    "deviceInfoManage_edit_page_line48_txt-3364" : "Please enter pinyin",
+    "deviceInfoManage_edit_page_line55_txt-1788" : "Line must be selected",
+    "deviceInfoManage_edit_page_line60_txt-3469" : "Vehicle:",
+    "deviceInfoManage_edit_page_line71_txt-3364" : "Please enter pinyin",
+    "deviceInfoManage_edit_page_line78_txt-1794" : "Vehicle must be selected",
+    "deviceInfoManage_edit_page_line83_txt-3216" : "Old terminal number",
+    "deviceInfoManage_edit_page_line91_txt-3201" : "New terminal number",
+    "deviceInfoManage_edit_page_line98_txt-1264" : "Please enter the new terminal number",
+    "deviceInfoManage_edit_page_line102_txt-910" : "The new terminal number must be filled in",
+    "deviceInfoManage_edit_page_line110_txt-4422" : "Old SIM card number:",
+    "deviceInfoManage_edit_page_line113_txt-3357" : "Please enter your old SIM card number",
+    "deviceInfoManage_edit_page_line118_txt-3701" : "New SIM card number:",
+    "deviceInfoManage_edit_page_line121_txt-3356" : "Please enter the new SIM card number",
+    "deviceInfoManage_edit_page_line126_txt-2258" : "Fault description:",
+    "deviceInfoManage_edit_page_line134_txt-4403" : "Description:",
+    "deviceInfoManage_edit_page_line170_txt-2252" : "Activation date:",
+    "deviceInfoManage_edit_page_line183_txt-146" : "Activation date must be selected, accurate to the specific time",
+    "deviceInfoManage_edit_page_line197_txt-4173" : "Submit",
+    "deviceInfoManage_edit_page_line198_txt-3817" : "Cancel",
+
+    // 页面：form.html
+    "deviceInfoManage_form_page_line3_txt-845" : "Add vehicle equipment information",
+    "deviceInfoManage_form_page_line9_txt-3807" : "Home page",
+    "deviceInfoManage_form_page_line13_txt-2398" : "Basic information",
+    "deviceInfoManage_form_page_line17_txt-848" : "Vehicle equipment information management",
+    "deviceInfoManage_form_page_line21_txt-845" : "Add vehicle equipment information",
+    "deviceInfoManage_form_page_line29_txt-3849" : "Form",
+    "deviceInfoManage_form_page_line38_txt-3347" : "Route name",
+    "deviceInfoManage_form_page_line48_txt-3364" : "Please enter pinyin",
+    "deviceInfoManage_form_page_line55_txt-1788" : "Line must be selected",
+    "deviceInfoManage_form_page_line60_txt-3469" : "Vehicle:",
+    "deviceInfoManage_form_page_line71_txt-3364" : "Please enter pinyin",
+    "deviceInfoManage_form_page_line78_txt-1794" : "Vehicle must be selected",
+    "deviceInfoManage_form_page_line83_txt-3216" : "Old terminal number",
+    "deviceInfoManage_form_page_line91_txt-3201" : "New terminal number",
+    "deviceInfoManage_form_page_line98_txt-1264" : "Please enter the new terminal number",
+    "deviceInfoManage_form_page_line102_txt-910" : "The new terminal number must be filled in",
+    "deviceInfoManage_form_page_line110_txt-4422" : "Old SIM card number:",
+    "deviceInfoManage_form_page_line113_txt-3357" : "Please enter your old SIM card number",
+    "deviceInfoManage_form_page_line118_txt-3701" : "New SIM card number:",
+    "deviceInfoManage_form_page_line121_txt-3356" : "Please enter the new SIM card number",
+    "deviceInfoManage_form_page_line126_txt-2258" : "Fault description:",
+    "deviceInfoManage_form_page_line134_txt-4403" : "Description:",
+    "deviceInfoManage_form_page_line197_txt-4173" : "Submit",
+    "deviceInfoManage_form_page_line198_txt-3817" : "Cancel",
+
+    // module.js
+    "deviceInfoManage_module_js_line26_txt-3347" : "Route name",
+    "deviceInfoManage_module_js_line27_txt-1476" : "Vehicle internal number",
+    "deviceInfoManage_module_js_line28_txt-3211" : "Activation date",
+    "deviceInfoManage_module_js_line29_txt-2185" : "Old equipment number",
+    "deviceInfoManage_module_js_line30_txt-3201" : "New terminal number",
+    "deviceInfoManage_module_js_line148_txt-3729" : "Failed:",
+    "deviceInfoManage_module_js_line269_txt-3243" : "{{clZbh}} Equipment information",
+    // TODO；
+
 };
-// TODO；
+
+
+
@@ -2,10 +2,53 @@
 // 中文资源
 var ScheduleApp_zh_language = {
+    // main.js
+    "main_js_line_82_txt-3966" : "营运",
+    "main_js_line_83_txt-3958" : "缺车",
+    "main_js_line_84_txt-3960" : "气候",
+    "main_js_line_85_txt-3837" : "肇事",
+    "main_js_line_86_txt-3838" : "纠纷",
+    "main_js_line_87_txt-3876" : "抽减",
+    "main_js_line_88_txt-4026" : "配车",
+    "main_js_line_89_txt-3840" : "故障",
+    "main_js_line_90_txt-3961" : "路阻",
+    "main_js_line_91_txt-3962" : "客稀",
+    "main_js_line_92_txt-3963" : "吊慢",
+    "main_js_line_93_txt-4197" : "其他",
+    "main_js_line_94_txt-4102" : "保养",
+    "main_js_line_95_txt-3957" : "缺人",
+    "main_js_line_96_txt-3956" : "援外",
+    "main_js_line_99_txt-2790" : "当前版本",
+    "main_js_line_100_txt-168" : "所有版本（待更新，当前，历史）",
+    "main_js_line_301_txt-1805" : "请重新登录！",
+    "main_js_line_304_txt-2284" : "状态编码：",
+    "main_js_line_305_txt-2285" : "访问路径：",
+    "main_js_line_306_txt-2286" : "错误消息：",
+    "main_js_line_307_txt-1807" : "服务端错误：",
+    "main_js_line_325_txt-695" : "貌似服务端连接不上",
+    "main_js_line_327_txt-2284" : "状态编码：",
+    "main_js_line_330_txt-2325" : "错误内容：",
+    "main_js_line_332_txt-2325" : "错误内容：",
+    "main_js_line_336_txt-1807" : "服务端错误：",
+    "main_js_line_338_txt-1838" : "请重新登录：",
+    "main_js_line_340_txt-2333" : "其他错误：",
+    "main_js_line_383_txt-1149" : "子页面已载入：",
+
+    //------------ 自定义指令 --------------//
+    // 指令位置：../module/common/dts2/queryOption
+    // 页面：saOrderOptionTemplate.html
+    "queryOption_saOrderOptionTemplate_line93_txt-4157" : "升序",
+    "queryOption_saOrderOptionTemplate_line94_txt-4156" : "降序",
+
+    // 指令位置：../module/common/dts1/select
+    // js：saSelect5.js
+    "saSelect5_js_line375_txt-1275" : "字典数据不存在=",
+
+
     //------------ 车辆信息管理模块 -----------//
     // 模块位置：../module/basicInfo/busInfoManage
-    // 页面；index.html
+    // 页面；index.html
     // line3
     "busInfoManage_index_page-title" : "车辆信息管理",
     // line9
@@ -57,11 +100,11 @@ var ScheduleApp_zh_language = {
     "busInfoManage_list_page_line142_txt-4257" : "是",
     "busInfoManage_list_page_line142_txt-3817" : "取消",
     "busInfoManage_list_page_line144_txt-3868" : "删除",
-    "busInfoManage_list_page_line153_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
-    "busInfoManage_list_page_line163_txt-4430" : "首页",
-    "busInfoManage_list_page_line164_txt-3613" : "上一页",
-    "busInfoManage_list_page_line165_txt-3614" : "下一页",
-    "busInfoManage_list_page_line166_txt-4068" : "尾页",
+    "busInfoManage_list_page_line156_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
+    "busInfoManage_list_page_line169_txt-4430" : "首页",
+    "busInfoManage_list_page_line170_txt-3613" : "上一页",
+    "busInfoManage_list_page_line171_txt-3614" : "下一页",
+    "busInfoManage_list_page_line172_txt-4068" : "尾页",
     // 页面：detail.html
     "busInfoManage_detail_page_line3_txt-1656" : "车辆详细信息",
@@ -287,6 +330,267 @@ var ScheduleApp_zh_language = {
     "busInfoManage_module_js_line434_txt-4009" : "车辆",
     "busInfoManage_module_js_line434_txt-3066" : "详细信息",
+    //------------ 人员信息管理模块 -----------//
+    // 模块位置：../module/basicInfo/employeeInfoManage
+    // 页面；index.html
+    "employeeInfoManage_index_page_line3_txt-1658" : "人员信息管理",
+    "employeeInfoManage_index_page_line9_txt-3807" : "首页",
+    "employeeInfoManage_index_page_line13_txt-2398" : "基础信息",
+    "employeeInfoManage_index_page_line17_txt-1658" : "人员信息管理",
+    "employeeInfoManage_index_page_line36_txt-2234" : "人员信息表",
+    "employeeInfoManage_index_page_line41_txt-1648" : "添加人员信息",
+    "employeeInfoManage_index_page_line47_txt-3339" : "数据工具",
+    "employeeInfoManage_index_page_line54_txt-4493" : "导出Excel",
+
+    // 页面：orderOptionOpen.html
+    "employeeInfoManage_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
+    "employeeInfoManage_orderOptionOpen_page_line17_txt-4018" : "确定",
+
+    // 页面：list.html
+    "employeeInfoManage_list_page_line7_txt-3934" : "序号",
+    "employeeInfoManage_list_page_line8_txt-3949" : "姓名",
+    "employeeInfoManage_list_page_line9_txt-3955" : "编号",
+    "employeeInfoManage_list_page_line10_txt-3940" : "工号",
+    "employeeInfoManage_list_page_line11_txt-3095" : "金蝶工号",
+    "employeeInfoManage_list_page_line12_txt-4086" : "性别",
+    "employeeInfoManage_list_page_line13_txt-3096" : "所在公司",
+    "employeeInfoManage_list_page_line14_txt-3777" : "分公司",
+    "employeeInfoManage_list_page_line15_txt-4093" : "工种",
+    "employeeInfoManage_list_page_line16_txt-4085" : "停用",
+    "employeeInfoManage_list_page_line17_txt-3942" : "操作",
+    "employeeInfoManage_list_page_line23_txt-3231" : "输入姓名",
+    "employeeInfoManage_list_page_line26_txt-3233" : "输入编号",
+    "employeeInfoManage_list_page_line29_txt-3232" : "输入工号",
+    "employeeInfoManage_list_page_line32_txt-3232" : "输入工号",
+    "employeeInfoManage_list_page_line45_txt-3364" : "请输拼音",
+    "employeeInfoManage_list_page_line60_txt-3364" : "请输拼音",
+    "employeeInfoManage_list_page_line75_txt-3364" : "请输拼音",
+    "employeeInfoManage_list_page_line82_txt-4085" : "停用",
+    "employeeInfoManage_list_page_line89_txt-4001" : "搜索",
+    "employeeInfoManage_list_page_line99_txt-3385" : "排序选项",
+    "employeeInfoManage_list_page_line107_txt-4000" : "重置",
+    "employeeInfoManage_list_page_line120_txt-4426" : "姓名/工号：",
+    "employeeInfoManage_list_page_line142_txt-4058" : "未知",
+    "employeeInfoManage_list_page_line163_txt-4058" : "未知",
+    "employeeInfoManage_list_page_line171_txt-3866" : "详细",
+    "employeeInfoManage_list_page_line172_txt-4028" : "修改",
+    "employeeInfoManage_list_page_line174_txt-675" : "是否删除人员信息？",
+    "employeeInfoManage_list_page_line175_txt-3719" : "姓名：",
+    "employeeInfoManage_list_page_line175_txt-3761" : "工号：",
+    "employeeInfoManage_list_page_line175_txt-40" : "如果有人员配置信息关联，会报错，建议不要随便删除！",
+    "employeeInfoManage_list_page_line177_txt-4257" : "是",
+    "employeeInfoManage_list_page_line178_txt-3817" : "取消",
+    "employeeInfoManage_list_page_line180_txt-3868" : "删除",
+    "employeeInfoManage_list_page_line189_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
+    "employeeInfoManage_list_page_line202_txt-4430" : "首页",
+    "employeeInfoManage_list_page_line203_txt-3613" : "上一页",
+    "employeeInfoManage_list_page_line204_txt-3614" : "下一页",
+    "employeeInfoManage_list_page_line205_txt-4068" : "尾页",
+
+    // 页面：detail.html
+    "employeeInfoManage_detail_page_line3_txt-1650" : "人员详细信息",
+    "employeeInfoManage_detail_page_line9_txt-3807" : "首页",
+    "employeeInfoManage_detail_page_line13_txt-2398" : "基础信息",
+    "employeeInfoManage_detail_page_line17_txt-1658" : "人员信息管理",
+    "employeeInfoManage_detail_page_line21_txt-1650" : "人员详细信息",
+    "employeeInfoManage_detail_page_line38_txt-2686" : "所属公司",
+    "employeeInfoManage_detail_page_line45_txt-1765" : "所属分公司：",
+    "employeeInfoManage_detail_page_line52_txt-3955" : "编号",
+    "employeeInfoManage_detail_page_line59_txt-3949" : "姓名",
+    "employeeInfoManage_detail_page_line66_txt-902" : "运营服务证书号：",
+    "employeeInfoManage_detail_page_line73_txt-903" : "一卡通工作卡号：",
+    "employeeInfoManage_detail_page_line80_txt-3698" : "性别：",
+    "employeeInfoManage_detail_page_line86_txt-3703" : "工种：",
+    "employeeInfoManage_detail_page_line89_txt-4058" : "未知",
+
+    // 页面：edit.html
+    "employeeInfoManage_edit_page_line3_txt-1643" : "修改人员信息",
+    "employeeInfoManage_edit_page_line9_txt-3807" : "首页",
+    "employeeInfoManage_edit_page_line13_txt-2398" : "基础信息",
+    "employeeInfoManage_edit_page_line17_txt-1658" : "人员信息管理",
+    "employeeInfoManage_edit_page_line21_txt-1643" : "修改人员信息",
+    "employeeInfoManage_edit_page_line29_txt-3849" : "表单",
+    "employeeInfoManage_edit_page_line37_txt-2686" : "所属公司",
+    "employeeInfoManage_edit_page_line47_txt-973" : "请选择所属公司",
+    "employeeInfoManage_edit_page_line55_txt-1792" : "公司必须选择",
+    "employeeInfoManage_edit_page_line60_txt-3777" : "分公司",
+    "employeeInfoManage_edit_page_line70_txt-973" : "请选择所属分公司",
+    "employeeInfoManage_edit_page_line79_txt-923" : "分公司也必须选择",
+    "employeeInfoManage_edit_page_line84_txt-3940" : "工号",
+    "employeeInfoManage_edit_page_line88_txt-2346" : "请输入工号",
+    "employeeInfoManage_edit_page_line95_txt-1793" : "工号必须填写",
+    "employeeInfoManage_edit_page_line103_txt-3949" : "姓名",
+    "employeeInfoManage_edit_page_line107_txt-2345" : "请输入姓名",
+    "employeeInfoManage_edit_page_line111_txt-1787" : "姓名必须填写",
+    "employeeInfoManage_edit_page_line116_txt-902" : "运营服务证书号：",
+    "employeeInfoManage_edit_page_line119_txt-516" : "请输入运营服务证书号",
+    "employeeInfoManage_edit_page_line124_txt-2244" : "一卡通号：",
+    "employeeInfoManage_edit_page_line127_txt-517" : "请输入一卡通工作卡号",
+    "employeeInfoManage_edit_page_line132_txt-3698" : "性别：",
+    "employeeInfoManage_edit_page_line139_txt-3703" : "工种：",
+    "employeeInfoManage_edit_page_line149_txt-3364" : "请输拼音",
+    "employeeInfoManage_edit_page_line157_txt-3449" : "备注：",
+    "employeeInfoManage_edit_page_line174_txt-4173" : "提交",
+    "employeeInfoManage_edit_page_line175_txt-3817" : "取消",
+
+    // 页面：form.html
+    "employeeInfoManage_form_page_line3_txt-1648" : "添加人员信息",
+    "employeeInfoManage_form_page_line9_txt-3807" : "首页",
+    "employeeInfoManage_form_page_line13_txt-2398" : "基础信息",
+    "employeeInfoManage_form_page_line17_txt-1658" : "人员信息管理",
+    "employeeInfoManage_form_page_line21_txt-1648" : "添加人员信息",
+    "employeeInfoManage_form_page_line29_txt-3849" : "表单",
+    "employeeInfoManage_form_page_line37_txt-2686" : "所属公司",
+    "employeeInfoManage_form_page_line47_txt-973" : "请选择所属公司",
+    "employeeInfoManage_form_page_line55_txt-1792" : "公司必须选择",
+    "employeeInfoManage_form_page_line60_txt-3777" : "分公司",
+    "employeeInfoManage_form_page_line70_txt-973" : "请选择所属分公司",
+    "employeeInfoManage_form_page_line79_txt-923" : "分公司也必须选择",
+    "employeeInfoManage_form_page_line84_txt-3940" : "工号",
+    "employeeInfoManage_form_page_line88_txt-2346" : "请输入工号",
+    "employeeInfoManage_form_page_line95_txt-1793" : "工号必须填写",
+    "employeeInfoManage_form_page_line103_txt-3949" : "姓名",
+    "employeeInfoManage_form_page_line107_txt-2345" : "请输入姓名",
+    "employeeInfoManage_form_page_line111_txt-1787" : "姓名必须填写",
+    "employeeInfoManage_form_page_line116_txt-902" : "运营服务证书号：",
+    "employeeInfoManage_form_page_line119_txt-516" : "请输入运营服务证书号",
+    "employeeInfoManage_form_page_line124_txt-2244" : "一卡通号：",
+    "employeeInfoManage_form_page_line127_txt-517" : "请输入一卡通工作卡号",
+    "employeeInfoManage_form_page_line132_txt-3698" : "性别：",
+    "employeeInfoManage_form_page_line139_txt-3703" : "工种：",
+    "employeeInfoManage_form_page_line149_txt-3364" : "请输拼音",
+    "employeeInfoManage_form_page_line157_txt-3449" : "备注：",
+    "employeeInfoManage_form_page_line174_txt-4173" : "提交",
+    "employeeInfoManage_form_page_line175_txt-3817" : "取消",
+
+    // module.js
+    "employeeInfoManage_module_js_line33_txt-3949" : "姓名",
+    "employeeInfoManage_module_js_line34_txt-3940" : "工号",
+    "employeeInfoManage_module_js_line35_txt-4086" : "性别",
+    "employeeInfoManage_module_js_line36_txt-3096" : "所在公司",
+    "employeeInfoManage_module_js_line37_txt-3777" : "分公司",
+    "employeeInfoManage_module_js_line38_txt-4093" : "工种",
+    "employeeInfoManage_module_js_line182_txt-1614" : "人员基础信息",
+    "employeeInfoManage_module_js_line286_txt-3729" : "失败：",
+    "employeeInfoManage_module_js_line411_txt-4081" : "员工",
+    "employeeInfoManage_module_js_line413_txt-3066" : "详细信息",
+
+    //------------ 车辆设备信息管理模块 -----------//
+    // 模块位置：../module/basicInfo/deviceInfoManage
+    // 页面；index.html
+    "deviceInfoManage_index_page_line3_txt-848" : "车辆设备信息管理",
+    "deviceInfoManage_index_page_line9_txt-3807" : "首页",
+    "deviceInfoManage_index_page_line13_txt-2398" : "基础信息",
+    "deviceInfoManage_index_page_line17_txt-848" : "车辆设备信息管理",
+    "deviceInfoManage_index_page_line27_txt-2233" : "设备信息表",
+    "deviceInfoManage_index_page_line32_txt-1791" : "添加设备信息",
+
+    // 页面：orderOptionOpen.html
+    "deviceInfoManage_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
+    "deviceInfoManage_orderOptionOpen_page_line17_txt-4018" : "确定",
+
+    // 页面：list.html
+    "deviceInfoManage_list_page_line17_txt-3934" : "序号",
+    "deviceInfoManage_list_page_line18_txt-3347" : "线路名称",
+    "deviceInfoManage_list_page_line19_txt-2597" : "内部编号",
+    "deviceInfoManage_list_page_line20_txt-3211" : "启用日期",
+    "deviceInfoManage_list_page_line21_txt-2185" : "旧设备编号",
+    "deviceInfoManage_list_page_line22_txt-2184" : "新设备编号",
+    "deviceInfoManage_list_page_line23_txt-4389" : "操作人/操作时间",
+    "deviceInfoManage_list_page_line24_txt-3874" : "状态",
+    "deviceInfoManage_list_page_line25_txt-3942" : "操作",
+    "deviceInfoManage_list_page_line38_txt-3364" : "请输拼音",
+    "deviceInfoManage_list_page_line44_txt-1773" : "输入内部编号",
+    "deviceInfoManage_list_page_line52_txt-4162" : "报废",
+    "deviceInfoManage_list_page_line59_txt-4001" : "搜索",
+    "deviceInfoManage_list_page_line69_txt-3385" : "排序选项",
+    "deviceInfoManage_list_page_line77_txt-4000" : "重置",
+    "deviceInfoManage_list_page_line122_txt-4058" : "未知",
+    "deviceInfoManage_list_page_line127_txt-3866" : "详细",
+    "deviceInfoManage_list_page_line144_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
+    "deviceInfoManage_list_page_line157_txt-4430" : "首页",
+    "deviceInfoManage_list_page_line158_txt-3613" : "上一页",
+    "deviceInfoManage_list_page_line159_txt-3614" : "下一页",
+    "deviceInfoManage_list_page_line160_txt-4068" : "尾页",
+
+    // 页面：detail.html
+    "deviceInfoManage_detail_page_line3_txt-847" : "车辆设备详细信息",
+    "deviceInfoManage_detail_page_line9_txt-3807" : "首页",
+    "deviceInfoManage_detail_page_line13_txt-2398" : "基础信息",
+    "deviceInfoManage_detail_page_line17_txt-848" : "车辆设备信息管理",
+    "deviceInfoManage_detail_page_line21_txt-847" : "车辆设备详细信息",
+    "deviceInfoManage_detail_page_line38_txt-1476" : "车辆内部编号",
+    "deviceInfoManage_detail_page_line45_txt-3347" : "线路名称",
+    "deviceInfoManage_detail_page_line52_txt-3216" : "旧终端号",
+    "deviceInfoManage_detail_page_line59_txt-3201" : "新终端号",
+    "deviceInfoManage_detail_page_line67_txt-4422" : "旧SIM卡号：",
+    "deviceInfoManage_detail_page_line74_txt-3701" : "新SIM卡号：",
+    "deviceInfoManage_detail_page_line82_txt-2258" : "故障描述：",
+    "deviceInfoManage_detail_page_line90_txt-4403" : "保修描述：",
+    "deviceInfoManage_detail_page_line98_txt-3211" : "启用日期",
+
+    // 页面：edit.html
+    "deviceInfoManage_edit_page_line3_txt-836" : "修改车辆设备信息",
+    "deviceInfoManage_edit_page_line9_txt-3807" : "首页",
+    "deviceInfoManage_edit_page_line13_txt-2398" : "基础信息",
+    "deviceInfoManage_edit_page_line17_txt-848" : "车辆设备信息管理",
+    "deviceInfoManage_edit_page_line21_txt-836" : "修改车辆设备信息",
+    "deviceInfoManage_edit_page_line29_txt-3849" : "表单",
+    "deviceInfoManage_edit_page_line38_txt-3347" : "线路名称",
+    "deviceInfoManage_edit_page_line48_txt-3364" : "请输拼音",
+    "deviceInfoManage_edit_page_line55_txt-1788" : "线路必须选择",
+    "deviceInfoManage_edit_page_line60_txt-3469" : "车辆：",
+    "deviceInfoManage_edit_page_line71_txt-3364" : "请输拼音",
+    "deviceInfoManage_edit_page_line78_txt-1794" : "车辆必须选择",
+    "deviceInfoManage_edit_page_line83_txt-3216" : "旧终端号",
+    "deviceInfoManage_edit_page_line91_txt-3201" : "新终端号",
+    "deviceInfoManage_edit_page_line98_txt-1264" : "请输入新终端号",
+    "deviceInfoManage_edit_page_line102_txt-910" : "新终端号必须填写",
+    "deviceInfoManage_edit_page_line110_txt-4422" : "旧SIM卡号：",
+    "deviceInfoManage_edit_page_line113_txt-3357" : "请输入旧SIM卡号",
+    "deviceInfoManage_edit_page_line118_txt-3701" : "新SIM卡号：",
+    "deviceInfoManage_edit_page_line121_txt-3356" : "请输入新SIM卡号",
+    "deviceInfoManage_edit_page_line126_txt-2258" : "故障描述：",
+    "deviceInfoManage_edit_page_line134_txt-4403" : "保修描述：",
+    "deviceInfoManage_edit_page_line170_txt-2252" : "启用日期：",
+    "deviceInfoManage_edit_page_line183_txt-146" : "启用日期必须选择，精确到具体时间",
+    "deviceInfoManage_edit_page_line197_txt-4173" : "提交",
+    "deviceInfoManage_edit_page_line198_txt-3817" : "取消",
+
+    // 页面：form.html
+    "deviceInfoManage_form_page_line3_txt-845" : "添加车辆设备信息",
+    "deviceInfoManage_form_page_line9_txt-3807" : "首页",
+    "deviceInfoManage_form_page_line13_txt-2398" : "基础信息",
+    "deviceInfoManage_form_page_line17_txt-848" : "车辆设备信息管理",
+    "deviceInfoManage_form_page_line21_txt-845" : "添加车辆设备信息",
+    "deviceInfoManage_form_page_line29_txt-3849" : "表单",
+    "deviceInfoManage_form_page_line38_txt-3347" : "线路名称",
+    "deviceInfoManage_form_page_line48_txt-3364" : "请输拼音",
+    "deviceInfoManage_form_page_line55_txt-1788" : "线路必须选择",
+    "deviceInfoManage_form_page_line60_txt-3469" : "车辆：",
+    "deviceInfoManage_form_page_line71_txt-3364" : "请输拼音",
+    "deviceInfoManage_form_page_line78_txt-1794" : "车辆必须选择",
+    "deviceInfoManage_form_page_line83_txt-3216" : "旧终端号",
+    "deviceInfoManage_form_page_line91_txt-3201" : "新终端号",
+    "deviceInfoManage_form_page_line98_txt-1264" : "请输入新终端号",
+    "deviceInfoManage_form_page_line102_txt-910" : "新终端号必须填写",
+    "deviceInfoManage_form_page_line110_txt-4422" : "旧SIM卡号：",
+    "deviceInfoManage_form_page_line113_txt-3357" : "请输入旧SIM卡号",
+    "deviceInfoManage_form_page_line118_txt-3701" : "新SIM卡号：",
+    "deviceInfoManage_form_page_line121_txt-3356" : "请输入新SIM卡号",
+    "deviceInfoManage_form_page_line126_txt-2258" : "故障描述：",
+    "deviceInfoManage_form_page_line134_txt-4403" : "保修描述：",
+    "deviceInfoManage_form_page_line197_txt-4173" : "提交",
+    "deviceInfoManage_form_page_line198_txt-3817" : "取消",
+
+    // module.js
+    "deviceInfoManage_module_js_line26_txt-3347" : "线路名称",
+    "deviceInfoManage_module_js_line27_txt-1476" : "车辆内部编号",
+    "deviceInfoManage_module_js_line28_txt-3211" : "启用日期",
+    "deviceInfoManage_module_js_line29_txt-2185" : "旧设备编号",
+    "deviceInfoManage_module_js_line30_txt-3201" : "新终端号",
+    "deviceInfoManage_module_js_line148_txt-3729" : "失败：",
+    "deviceInfoManage_module_js_line269_txt-3243" : "车辆 {{clZbh}} 设备信息",
     // TODO：
@@ -5,15 +5,15 @@
             <thead>
             <tr role="row" class="heading">
                 <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line7_txt-3934" | translate}}</th>
-                <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line8_txt-2479" | translate}}</th>
-                <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line9_txt-2597" | translate}}</th>
-                <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line10_txt-3094" | translate}}</th>
-                <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line11_txt-3704" | translate}}</th>
-                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line12_txt-3096" | translate}}</th>
-                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line13_txt-2188" | translate}}</th>
-                <th style="width: 60px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line14_txt-4087" | translate}}</th>
-                <th style="width: 80px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;" >{{"busInfoManage_list_page_line15_txt-3874" | translate}}</th>
-                <th style="width: 230px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line16_txt-3942" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line8_txt-2479" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line9_txt-2597" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line10_txt-3094" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line11_txt-3704" | translate}}</th>
+                <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line12_txt-3096" | translate}}</th>
+                <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line13_txt-2188" | translate}}</th>
+                <th style="width: 60px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line14_txt-4087" | translate}}</th>
+                <th style="width: 80px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;" >{{"busInfoManage_list_page_line15_txt-3874" | translate}}</th>
+                <th style="width: 230px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line16_txt-3942" | translate}}</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -40,6 +40,7 @@
                                 iterobjexp="item.businessName"
                                 searchph="{{'busInfoManage_list_page_line41_txt-3364' | translate}}"
                                 searchexp="this.businessName"
+                                width="100"
                                 required
                             >
                     </sa-Select5>
@@ -55,6 +56,7 @@
                                 iterobjexp="item.businessName"
                                 searchph="{{'busInfoManage_list_page_line56_txt-3364' | translate}}"
                                 searchexp="this.businessName"
+                                width="100"
                                 required
                             >
                     </sa-Select5>
@@ -153,7 +155,7 @@
     <div class="pageBar">
         <div class="pageBarLeft"
-             translate="busInfoManage_list_page_line153_txt-3053"
+             translate="busInfoManage_list_page_line156_txt-3053"
              translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
              translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
              translate-value-total="{{ ctrl.page()['totalElements'] }}">
@@ -166,10 +168,10 @@
                             rotate="false"
                             max-size="10"
                             boundary-links="true"
-                            first-text="{{'busInfoManage_list_page_line163_txt-4430' | translate}}"
-                            previous-text="{{'busInfoManage_list_page_line164_txt-3613' | translate}}"
-                            next-text="{{'busInfoManage_list_page_line165_txt-3614' | translate}}"
-                            last-text="{{'busInfoManage_list_page_line166_txt-4068' | translate}}">
+                            first-text="{{'busInfoManage_list_page_line169_txt-4430' | translate}}"
+                            previous-text="{{'busInfoManage_list_page_line170_txt-3613' | translate}}"
+                            next-text="{{'busInfoManage_list_page_line171_txt-3614' | translate}}"
+                            last-text="{{'busInfoManage_list_page_line172_txt-4068' | translate}}">
             </uib-pagination>
         </div>
     </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-847}</h1>
+        <h1>{{"deviceInfoManage_detail_page_line3_txt-847" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_detail_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"deviceInfoManage_detail_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
+        <a ui-sref="deviceInfoManage">{{"deviceInfoManage_detail_page_line17_txt-848" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-847}</span>
+        <span class="active">{{"deviceInfoManage_detail_page_line21_txt-847" | translate}}</span>
     </li>
 </ul>
@@ -35,28 +35,28 @@
         <form class="form-horizontal" novalidate name="myForm">
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-1476}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line38_txt-1476" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="clZbh"
                                ng-model="ctrl.deviceInfoForDetail.clZbh" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line45_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="xlName"
                                ng-model="ctrl.deviceInfoForDetail.xlName" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line52_txt-3216" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="oldDeviceNo"
                                ng-model="ctrl.deviceInfoForDetail.oldDeviceNo" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line59_txt-3201" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="newDeviceNo"
                                ng-model="ctrl.deviceInfoForDetail.newDeviceNo" readonly/>
@@ -64,14 +64,14 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line67_txt-4422" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" name="oldSimNo"
                                ng-model="ctrl.deviceInfoForDetail.oldSimNo" readonly/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line74_txt-3701" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" name="newSimNo"
                                ng-model="ctrl.deviceInfoForDetail.newSimNo" readonly/>
@@ -79,7 +79,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line82_txt-2258" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="troubleDesc"
                                   ng-model="ctrl.deviceInfoForDetail.troubleDesc" readonly></textarea>
@@ -87,7 +87,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line90_txt-4403" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="guaranteeDesc"
                                   ng-model="ctrl.deviceInfoForDetail.guaranteeDesc" readonly></textarea>
@@ -95,7 +95,7 @@
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3211}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line98_txt-3211" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
@@ -109,4 +109,4 @@
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-845}</h1>
+        <h1>{{"deviceInfoManage_edit_page_line3_txt-845" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_edit_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"deviceInfoManage_edit_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
+        <a ui-sref="deviceInfoManage">{{"deviceInfoManage_edit_page_line17_txt-848" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-836}</span>
+        <span class="active">{{"deviceInfoManage_edit_page_line21_txt-836" | translate}}</span>
     </li>
 </ul>
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"deviceInfoManage_edit_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
@@ -35,7 +35,7 @@
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line38_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="xl"
                                     model="ctrl.deviceInfoForSave"
@@ -45,19 +45,19 @@
                                     dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'deviceInfoManage_edit_page_line48_txt-3364' | translate}}"
                                     searchexp="this.name"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
-                        $$$$$${txt-1788}
+                        {{"deviceInfoManage_edit_page_line55_txt-1788" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3469}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line60_txt-3469" | translate}}</label>
                     <div class="col-md-3">
                         <sa-Select5 name="cl"
                                     model="ctrl.deviceInfoForSave"
@@ -68,19 +68,19 @@
                                     dsparamsextra="{'type':'all', 'isCancel_eq': false}"
                                     iterobjname="item"
                                     iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'deviceInfoManage_edit_page_line71_txt-3364' | translate}}"
                                     searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
-                        $$$$$${txt-1794}
+                        {{"deviceInfoManage_edit_page_line78_txt-1794" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line83_txt-3216" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="oldDeviceNo"
                                ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
@@ -88,18 +88,18 @@
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line91_txt-3201" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
                                remote-Validation
                                remotevtype="cars_sbbh"
                                remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}"
-                               required placeholder="$$$$$${txt-1264}"/>
+                               required placeholder="{{'deviceInfoManage_edit_page_line98_txt-1264' | translate}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required">
-                        $$$$$${txt-910}
+                        {{"deviceInfoManage_edit_page_line102_txt-910" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
                         {{$remote_msg}}
@@ -107,23 +107,23 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line110_txt-4422" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo"
-                               placeholder="$$$$$${txt-3357}"/>
+                               placeholder="{{'deviceInfoManage_edit_page_line113_txt-3357' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line118_txt-3701" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo"
-                               placeholder="$$$$$${txt-3356}"/>
+                               placeholder="{{'deviceInfoManage_edit_page_line121_txt-3356' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line126_txt-2258" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
                                   ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
@@ -131,7 +131,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line134_txt-4403" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
                                   ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
@@ -167,7 +167,7 @@
                 <!--</div>-->
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2252}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line170_txt-2252" | translate}}</label>
                     <div class="col-md-3">
                         <div class="input-group">
                             <input type="datetime-local" class="form-control" name="qyrq"
@@ -180,7 +180,7 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        $$$$$${txt-146}
+                        {{"deviceInfoManage_edit_page_line183_txt-146" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
                         {{$remote_msg}}
@@ -194,12 +194,12 @@
             <div class="form-actions">
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
-                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
+                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"deviceInfoManage_edit_page_line197_txt-4173" | translate}}</button>
+                        <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> {{"deviceInfoManage_edit_page_line198_txt-3817" | translate}}</a>
                     </div>
                 </div>
             </div>
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-845}</h1>
+        <h1>{{"deviceInfoManage_form_page_line3_txt-845" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_form_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"deviceInfoManage_form_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
+        <a ui-sref="deviceInfoManage">{{"deviceInfoManage_form_page_line17_txt-848" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-845}</span>
+        <span class="active">{{"deviceInfoManage_form_page_line21_txt-845" | translate}}</span>
     </li>
 </ul>
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"deviceInfoManage_form_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
@@ -35,7 +35,7 @@
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line38_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="xl"
                                     model="ctrl.deviceInfoForSave"
@@ -45,19 +45,19 @@
                                     dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'deviceInfoManage_form_page_line48_txt-3364' | translate}}"
                                     searchexp="this.name"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
-                        $$$$$${txt-1788}
+                        {{"deviceInfoManage_form_page_line55_txt-1788" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3469}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line60_txt-3469" | translate}}</label>
                     <div class="col-md-3">
                         <sa-Select5 name="cl"
                                     model="ctrl.deviceInfoForSave"
@@ -68,19 +68,19 @@
                                     dsparamsextra="{'type':'all', 'isCancel_eq': false}"
                                     iterobjname="item"
                                     iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'deviceInfoManage_form_page_line71_txt-3364' | translate}}"
                                     searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
-                        $$$$$${txt-1794}
+                        {{"deviceInfoManage_form_page_line78_txt-1794" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line83_txt-3216" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="oldDeviceNo"
                                ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
@@ -88,18 +88,18 @@
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line91_txt-3201" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
                                remote-Validation
                                remotevtype="cars_sbbh"
                                remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}"
-                               required placeholder="$$$$$${txt-1264}"/>
+                               required placeholder="{{'deviceInfoManage_form_page_line98_txt-1264' | translate}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required">
-                        $$$$$${txt-910}
+                        {{"deviceInfoManage_form_page_line102_txt-910" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
                         {{$remote_msg}}
@@ -107,23 +107,23 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line110_txt-4422" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo"
-                               placeholder="$$$$$${txt-3357}"/>
+                               placeholder="{{'deviceInfoManage_form_page_line113_txt-3357' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line118_txt-3701" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo"
-                               placeholder="$$$$$${txt-3356}"/>
+                               placeholder="{{'deviceInfoManage_form_page_line121_txt-3356' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line126_txt-2258" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
                                   ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
@@ -131,7 +131,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
+                    <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line134_txt-4403" | translate}}</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
                                   ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
@@ -194,12 +194,12 @@
             <div class="form-actions">
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
-                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
+                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"deviceInfoManage_form_page_line197_txt-4173" | translate}}</button>
+                        <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> {{"deviceInfoManage_form_page_line198_txt-3817" | translate}}</a>
                     </div>
                 </div>
             </div>
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-848}</h1>
+        <h1>{{"deviceInfoManage_index_page_line3_txt-848" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_index_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"deviceInfoManage_index_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-848}</span>
+        <span class="active">{{"deviceInfoManage_index_page_line17_txt-848" | translate}}</span>
     </li>
 </ul>
@@ -24,12 +24,12 @@
             <div class="portlet-title">
                 <div class="caption font-dark">
                     <i class="fa fa-database font-dark"></i>
-                    <span class="caption-subject bold uppercase">$$$$$${txt-2233}</span>
+                    <span class="caption-subject bold uppercase">{{"deviceInfoManage_index_page_line27_txt-2233" | translate}}</span>
                 </div>
                 <div class="actions">
                     <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
                         <i class="fa fa-plus"></i>
-                        $$$$$${txt-1791}
+                        {{"deviceInfoManage_index_page_line32_txt-1791" | translate}}
                     </a>
                     <!--<div class="btn-group">-->
@@ -55,4 +55,4 @@
             </div>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -10,19 +10,19 @@
     </style>
-    <div style="width: 100%; height: 100%; overflow: auto">
+    <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 70px;">$$$$$${txt-3934}</th>
-                <th style="width: 15%;">$$$$$${txt-3347}</th>
-                <th style="width: 10%;">$$$$$${txt-2597}</th>
-                <th style="width: 160px;">$$$$$${txt-3211}</th>
-                <th>$$$$$${txt-2185}</th>
-                <th>$$$$$${txt-2184}</th>
-                <th style="width: 180px;">$$$$$${txt-4389}</th>
-                <th style="width: 80px;" >$$$$$${txt-3874}</th>
-                <th style="width: 150pt;">$$$$$${txt-3942}</th>
+                <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line17_txt-3934" | translate}}</th>
+                <th style="width: 170px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line18_txt-3347" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line19_txt-2597" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line20_txt-3211" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line21_txt-2185" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line22_txt-2184" | translate}}</th>
+                <th style="width: 160px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line23_txt-4389" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line24_txt-3874" | translate}}</th>
+                <th style="width: 200px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line25_txt-3942" | translate}}</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -35,13 +35,14 @@
                                 dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.name"
-                                searchph="$$$$$${txt-3364}"
+                                searchph="{{'deviceInfoManage_list_page_line38_txt-3364' | translate}}"
                                 searchexp="this.name"
+                                width="140"
                                 required >
                     </sa-Select5>
                 </td>
                 <td>
-                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clZbh_like']" placeholder="$$$$$${txt-1773}"/>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clZbh_like']" placeholder="{{'deviceInfoManage_list_page_line44_txt-1773' | translate}}"/>
                 </td>
                 <td></td>
                 <td></td>
@@ -49,14 +50,14 @@
                 <td></td>
                 <td>
                     <label class="checkbox-inline input">
-                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />$$$$$${txt-4162}
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />{{"deviceInfoManage_list_page_line52_txt-4162" | translate}}
                     </label>
                 </td>
                 <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
-                            <i class="fa fa-search"></i> $$$$$${txt-4001}</button>
+                            <i class="fa fa-search"></i> {{"deviceInfoManage_list_page_line59_txt-4001" | translate}}</button>
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
                                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
@@ -66,7 +67,7 @@
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
                                     <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-                                    $$$$$${txt-3385}
+                                    {{"deviceInfoManage_list_page_line69_txt-3385" | translate}}
                                 </a>
                             </li>
                         </ul>
@@ -74,7 +75,7 @@
                     <button class="btn btn-sm red btn-outline filter-cancel"
                             ng-click="ctrl.reset()">
-                        <i class="fa fa-times"></i> $$$$$${txt-4000}</button>
+                        <i class="fa fa-times"></i> {{"deviceInfoManage_list_page_line77_txt-4000" | translate}}</button>
                 </td>
             </tr>
@@ -119,12 +120,12 @@
                 </td>
                 <td>
-                    <span ng-bind="info.isCancel | dict:'truefalseType':'$$$$$${txt-4058}' "></span>
+                    <span ng-bind="info.isCancel | dict:'truefalseType':('deviceInfoManage_list_page_line122_txt-4058' | translate) "></span>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
-                    <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>
+                    <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> {{"deviceInfoManage_list_page_line127_txt-3866" | translate}} </a>
                     <!--<a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>-->
                     <!--<a sweetalert-->
                        <!--sweet-options="{title: '是否作废车辆设备历史信息？',text: '内部编号：' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
@@ -140,8 +141,11 @@
     </div>
     <div class="pageBar">
-        <div class="pageBarLeft">
-            $$$$$${txt-3053}
+        <div class="pageBarLeft"
+             translate="employeeInfoManage_list_page_line189_txt-3053"
+             translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
+             translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
+             translate-value-total="{{ ctrl.page()['totalElements'] }}">
         </div>
         <div class="pageBarRight">
@@ -151,10 +155,10 @@
                             rotate="false"
                             max-size="10"
                             boundary-links="true"
-                            first-text="$$$$$${txt-4430}"
-                            previous-text="$$$$$${txt-3613}"
-                            next-text="$$$$$${txt-3614}"
-                            last-text="$$$$$${txt-4068}">
+                            first-text="{{'deviceInfoManage_list_page_line157_txt-4430' | translate}}"
+                            previous-text="{{'deviceInfoManage_list_page_line158_txt-3613' | translate}}"
+                            next-text="{{'deviceInfoManage_list_page_line159_txt-3614' | translate}}"
+                            last-text="{{'deviceInfoManage_list_page_line160_txt-4068' | translate}}">
             </uib-pagination>
         </div>
     </div>
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     [
         'DeviceInfoManageService_g',
         'UserPrincipal',
-        function(service, UserPrincipal) {
+        '$translate',
+        function(service, UserPrincipal, translate) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
@@ -22,11 +23,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             // 字段描述
             var columns = [
-                {name: "xl", desc: i18n('txt-3347')},
-                {name: "clZbh", desc: i18n('txt-1476')},
-                {name: "qyrq", desc: i18n('txt-3211')},
-                {name: "oldDeviceNo", desc: i18n('txt-2185')},
-                {name: "newDeviceNo", desc: i18n('txt-3201')}
+                {name: "xl", desc: translate.instant("deviceInfoManage_module_js_line26_txt-3347")},
+                {name: "clZbh", desc: translate.instant("deviceInfoManage_module_js_line27_txt-1476")},
+                {name: "qyrq", desc: translate.instant("deviceInfoManage_module_js_line28_txt-3211")},
+                {name: "oldDeviceNo", desc: translate.instant("deviceInfoManage_module_js_line29_txt-2185")},
+                {name: "newDeviceNo", desc: translate.instant("deviceInfoManage_module_js_line30_txt-3201")}
             ];
             // 排序字段
             var orderColumns = {
@@ -117,7 +118,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'DeviceInfoManageService',
         '$uibModal',
-        function(service, $uibModal) {
+        '$translate',
+        function(service, $uibModal, translate) {
             var self = this;
             var CarDevice = service.getQueryClass();
@@ -143,7 +145,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.toggleCarDevice = function(id) {
                 CarDevice.delete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
-                        alert(i18n('txt-3729') + result.msg);
+                        alert(translate.instant("deviceInfoManage_module_js_line148_txt-3729") + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -252,7 +254,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'DeviceInfoManageService',
         '$stateParams',
-        function(service, $stateParams) {
+        '$translate',
+        function(service, $stateParams, translate) {
             var self = this;
             var CarDevice = service.getQueryClass();
             var id = $stateParams.id;
@@ -263,9 +266,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 当转向到此页面时，就获取明细信息并绑定
             CarDevice.get({id: id}, function(value) {
                 self.deviceInfoForDetail = value;
-                self.title = i18n('txt-3243',[self.deviceInfoForDetail.clZbh]);
+                self.title = translate.instant("deviceInfoManage_module_js_line269_txt-3243", {clZbh: self.deviceInfoForDetail.clZbh});
             });
         }
     ]
-);
 \ No newline at end of file
+);
@@ -2,7 +2,7 @@
     <div class="modal-title">
         <h3>
             <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-            <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span>
+            <span class="caption-subject bold uppercase">{{"deviceInfoManage_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
         </h3>
     </div>
 </div>
@@ -14,5 +14,5 @@
     </sa-Orderoption>
 </div>
 <div class="modal-footer">
-    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>
-</div>
 \ No newline at end of file
+    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"deviceInfoManage_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-1650}</h1>
+        <h1>{{"employeeInfoManage_detail_page_line3_txt-1650" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_detail_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"employeeInfoManage_detail_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
+        <a ui-sref="employeeInfoManage">{{"employeeInfoManage_detail_page_line17_txt-1658" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1650}</span>
+        <span class="active">{{"employeeInfoManage_detail_page_line21_txt-1650" | translate}}</span>
     </li>
 </ul>
@@ -35,58 +35,58 @@
         <form class="form-horizontal" novalidate name="myForm">
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line38_txt-2686" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="company"
                                ng-model="ctrl.employeeInfoForDetail.company" readonly/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-1765}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line45_txt-1765" | translate}}</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="brancheCompany"
                                ng-model="ctrl.employeeInfoForDetail.brancheCompany" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3955}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line52_txt-3955" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="jobCode"
                                ng-model="ctrl.employeeInfoForDetail.jobCode" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line59_txt-3949" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="personnelName"
                                ng-model="ctrl.employeeInfoForDetail.personnelName" readonly/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-902}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line66_txt-902" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" name="papersCode"
                                ng-model="ctrl.employeeInfoForDetail.papersCode" readonly/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-903}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line73_txt-903" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" name="icCardCode"
                                ng-model="ctrl.employeeInfoForDetail.icCardCode" readonly/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line80_txt-3698" | translate}}</label>
                     <div class="col-md-4">
                         <sa-Radiogroup model="ctrl.employeeInfoForDetail.personnelType" disabled="true" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line86_txt-3703" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" name="posts"
-                               ng-value="ctrl.employeeInfoForDetail.posts | dict:'gzType':'$$$$$${txt-4058}'" readonly/>
+                               ng-value="ctrl.employeeInfoForDetail.posts | dict:'gzType':('employeeInfoManage_detail_page_line89_txt-4058' | translate)" readonly/>
                     </div>
                 </div>
@@ -96,4 +96,4 @@
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-1643}</h1>
+        <h1>{{"employeeInfoManage_edit_page_line3_txt-1643" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_edit_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"employeeInfoManage_edit_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
+        <a ui-sref="employeeInfoManage">{{"employeeInfoManage_edit_page_line17_txt-1658" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1643}</span>
+        <span class="active">{{"employeeInfoManage_edit_page_line21_txt-1643" | translate}}</span>
     </li>
 </ul>
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"employeeInfoManage_edit_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
@@ -34,7 +34,7 @@
         <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line37_txt-2686" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="gs"
                                     model="ctrl.employeeInfoForSave"
@@ -44,7 +44,7 @@
                                     dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
-                                    searchph="$$$$$${txt-973}"
+                                    searchph="{{'employeeInfoManage_edit_page_line47_txt-973' | translate}}"
                                     searchexp="this.businessName"
                                     required
                                 >
@@ -52,12 +52,12 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
-                        $$$$$${txt-1792}
+                        {{"employeeInfoManage_edit_page_line55_txt-1792" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3777}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line60_txt-3777" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="fgs"
                                     model="ctrl.employeeInfoForSave"
@@ -67,33 +67,32 @@
                                     dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
-                                    searchph="$$$$$${txt-973}"
+                                    searchph="{{'employeeInfoManage_edit_page_line70_txt-973' | translate}}"
                                     searchexp="this.businessName"
                                     required
                                 >
                         </sa-Select5>
                     </div>
-
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.fgs.$error.required">
-                        $$$$$${txt-923}
+                        {{"employeeInfoManage_edit_page_line79_txt-923" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3940}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line84_txt-3940" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCodeori"
-                               required placeholder="$$$$$${txt-2346}"
+                               required placeholder="{{'employeeInfoManage_edit_page_line88_txt-2346' | translate}}"
                                remote-Validation
                                remotevtype="ee_gh"
                                remotevparam="{{ {'id_eq': ctrl.employeeInfoForSave.id, 'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
-                        $$$$$${txt-1793}
+                        {{"employeeInfoManage_edit_page_line95_txt-1793" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
                         {{$remote_msg}}
@@ -101,43 +100,43 @@
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line103_txt-3949" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="personnelName" ng-model="ctrl.employeeInfoForSave.personnelName"
-                               required placeholder="$$$$$${txt-2345}"/>
+                               required placeholder="{{'employeeInfoManage_edit_page_line107_txt-2345' | translate}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.personnelName.$error.required">
-                        $$$$$${txt-1787}
+                        {{"employeeInfoManage_edit_page_line111_txt-1787" | translate}}
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-902}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line116_txt-902" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.papersCode"
-                               placeholder="$$$$$${txt-516}"/>
+                               placeholder="{{'employeeInfoManage_edit_page_line119_txt-516' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-2244}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line124_txt-2244" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.icCardCode"
-                               placeholder="$$$$$${txt-517}"/>
+                               placeholder="{{'employeeInfoManage_edit_page_line127_txt-517' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line132_txt-3698" | translate}}</label>
                     <div class="col-md-4">
                         <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line139_txt-3703" | translate}}</label>
                     <div class="col-md-4">
                         <sa-Select5 name="posts"
                                     model="ctrl.employeeInfoForSave"
@@ -147,7 +146,7 @@
                                     dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'employeeInfoManage_edit_page_line149_txt-3364' | translate}}"
                                     searchexp="this.name"
                                 >
                         </sa-Select5>
@@ -155,7 +154,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3449}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line157_txt-3449" | translate}}</label>
                     <div class="col-md-3">
                             <textarea class="form-control"
                                       ng-model="ctrl.employeeInfoForSave.remark"
@@ -172,8 +171,8 @@
             <div class="form-actions">
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
-                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
+                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeInfoManage_edit_page_line174_txt-4173" | translate}}</button>
+                        <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> {{"employeeInfoManage_edit_page_line175_txt-3817" | translate}}</a>
                     </div>
                 </div>
             </div>
@@ -181,4 +180,4 @@
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-1648}</h1>
+        <h1>{{"employeeInfoManage_form_page_line3_txt-1648" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_form_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"employeeInfoManage_form_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
+        <a ui-sref="employeeInfoManage">{{"employeeInfoManage_form_page_line17_txt-1658" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1648}</span>
+        <span class="active">{{"employeeInfoManage_form_page_line21_txt-1648" | translate}}</span>
     </li>
 </ul>
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"employeeInfoManage_form_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
@@ -34,7 +34,7 @@
         <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line37_txt-2686" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="gs"
                                     model="ctrl.employeeInfoForSave"
@@ -44,7 +44,7 @@
                                     dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
-                                    searchph="$$$$$${txt-973}"
+                                    searchph="{{'employeeInfoManage_form_page_line47_txt-973' | translate}}"
                                     searchexp="this.businessName"
                                     required
                                 >
@@ -52,12 +52,12 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
-                        $$$$$${txt-1792}
+                        {{"employeeInfoManage_form_page_line55_txt-1792" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3777}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line60_txt-3777" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="fgs"
                                     model="ctrl.employeeInfoForSave"
@@ -67,7 +67,7 @@
                                     dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
-                                    searchph="$$$$$${txt-973}"
+                                    searchph="{{'employeeInfoManage_form_page_line70_txt-973' | translate}}"
                                     searchexp="this.businessName"
                                     required
                                 >
@@ -76,23 +76,23 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.fgs.$error.required">
-                        $$$$$${txt-923}
+                        {{"employeeInfoManage_form_page_line79_txt-923" | translate}}
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3940}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line84_txt-3940" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCodeori"
-                               required placeholder="$$$$$${txt-2346}"
+                               required placeholder="{{'employeeInfoManage_form_page_line88_txt-2346' | translate}}"
                                remote-Validation
                                remotevtype="ee_gh"
                                remotevparam="{{ {'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
-                        $$$$$${txt-1793}
+                        {{"employeeInfoManage_form_page_line95_txt-1793" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
                         {{$remote_msg}}
@@ -100,43 +100,43 @@
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line103_txt-3949" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="personnelName" ng-model="ctrl.employeeInfoForSave.personnelName"
-                               required placeholder="$$$$$${txt-2345}"/>
+                               required placeholder="{{'employeeInfoManage_form_page_line107_txt-2345' | translate}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.personnelName.$error.required">
-                        $$$$$${txt-1787}
+                        {{"employeeInfoManage_form_page_line111_txt-1787" | translate}}
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-902}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line116_txt-902" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.papersCode"
-                               placeholder="$$$$$${txt-516}"/>
+                               placeholder="{{'employeeInfoManage_form_page_line119_txt-516' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-2244}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line124_txt-2244" | translate}}</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.icCardCode"
-                               placeholder="$$$$$${txt-517}"/>
+                               placeholder="{{'employeeInfoManage_form_page_line127_txt-517' | translate}}"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line132_txt-3698" | translate}}</label>
                     <div class="col-md-4">
                         <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
+                    <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line139_txt-3703" | translate}}</label>
                     <div class="col-md-4">
                         <sa-Select5 name="posts"
                                     model="ctrl.employeeInfoForSave"
@@ -146,7 +146,7 @@
                                     dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'employeeInfoManage_form_page_line149_txt-3364' | translate}}"
                                     searchexp="this.name"
                                      >
                         </sa-Select5>
@@ -154,7 +154,7 @@
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">$$$$$${txt-3449}</label>
+                    <label class="col-md-2 control-label">{{'employeeInfoManage_form_page_line157_txt-3449' | translate}}</label>
                     <div class="col-md-3">
                             <textarea class="form-control"
                                       ng-model="ctrl.employeeInfoForSave.remark"
@@ -171,8 +171,8 @@
             <div class="form-actions">
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
-                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
+                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeInfoManage_form_page_line174_txt-4173" | translate}}</button>
+                        <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> {{"employeeInfoManage_form_page_line175_txt-3817" | translate}}</a>
                     </div>
                 </div>
             </div>
@@ -180,4 +180,4 @@
         </form>
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-1658}</h1>
+        <h1>{{"employeeInfoManage_index_page_line3_txt-1658" | translate}}</h1>
     </div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_index_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2398}</span>
+        <span class="active">{{"employeeInfoManage_index_page_line13_txt-2398" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1658}</span>
+        <span class="active">{{"employeeInfoManage_index_page_line17_txt-1658" | translate}}</span>
     </li>
 </ul>
@@ -33,25 +33,25 @@
             <div class="portlet-title">
                 <div class="caption font-dark">
                     <i class="fa fa-database font-dark"></i>
-                    <span class="caption-subject bold uppercase">$$$$$${txt-2234}</span>
+                    <span class="caption-subject bold uppercase">{{"employeeInfoManage_index_page_line36_txt-2234" | translate}}</span>
                 </div>
                 <div class="actions">
                     <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()" ng-if="ctrl.userInfo.getRole().indexOf('_ADMIN') > -1">
                         <i class="fa fa-plus"></i>
-                        $$$$$${txt-1648}{{}}
+                        {{"employeeInfoManage_index_page_line41_txt-1648" | translate}}
                     </a>
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>$$$$$${txt-3339}</span>
+                            <span>{{"employeeInfoManage_index_page_line47_txt-3339" | translate}}</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
                                     <i class="fa fa-file-excel-o"></i>
-                                    $$$$$${txt-4493}
+                                    {{"employeeInfoManage_index_page_line54_txt-4493" | translate}}
                                 </a>
                             </li>
                             <!--<li class="divider"></li>-->
@@ -71,4 +71,4 @@
             </div>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -4,32 +4,32 @@
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width:70px;">$$$$$${txt-3934}</th>
-                <th style="width: 100px;">$$$$$${txt-3949}</th>
-                <th style="width: 100px;">$$$$$${txt-3955}</th>
-                <th style="width: 100px;">$$$$$${txt-3940}</th>
-                <th style="width: 100px;">$$$$$${txt-3095}</th>
-                <th style="width: 60px;">$$$$$${txt-4086}</th>
-                <th style="width: 150px;">$$$$$${txt-3096}</th>
-                <th >$$$$$${txt-3777}</th>
-                <th >$$$$$${txt-4093}</th>
-                <th style="width: 80px;">$$$$$${txt-4085}</th>
-                <th >$$$$$${txt-3942}</th>
+                <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line7_txt-3934" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line8_txt-3949" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line9_txt-3955" | translate}}</th>
+                <th style="width: 100px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line10_txt-3940" | translate}}</th>
+                <th style="width: 100px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line11_txt-3095" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line12_txt-4086" | translate}}</th>
+                <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line13_txt-3096" | translate}}</th>
+                <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line14_txt-3777" | translate}}</th>
+                <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line15_txt-4093" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line16_txt-4085" | translate}}</th>
+                <th style="width: 230px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line17_txt-3942" | translate}}</th>
             </tr>
             <tr role="row" class="filter">
                 <td>
                 </td>
                 <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="$$$$$${txt-3231}"/>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="{{'employeeInfoManage_list_page_line23_txt-3231' | translate}}"/>
                 </td>
                 <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="$$$$$${txt-3233}"/>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="{{'employeeInfoManage_list_page_line26_txt-3233' | translate}}"/>
                 </td>
                 <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="$$$$$${txt-3232}"/>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="{{'employeeInfoManage_list_page_line29_txt-3232' | translate}}"/>
                 </td>
                 <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="$$$$$${txt-3232}"/>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="{{'employeeInfoManage_list_page_line32_txt-3232' | translate}}"/>
                 </td>
                 <td>
                 </td>
@@ -42,8 +42,9 @@
                                 dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.businessName"
-                                searchph="$$$$$${txt-3364}"
+                                searchph="{{'employeeInfoManage_list_page_line45_txt-3364' | translate}}"
                                 searchexp="this.businessName"
+                                width="100"
                                 required
                             >
                     </sa-Select5>
@@ -57,8 +58,9 @@
                                 dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().companyCode_eq }, atype:'gs' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.businessName"
-                                searchph="$$$$$${txt-3364}"
+                                searchph="{{'employeeInfoManage_list_page_line60_txt-3364' | translate}}"
                                 searchexp="this.businessName"
+                                width="100"
                                 required
                             >
                     </sa-Select5>
@@ -72,21 +74,22 @@
                                 dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.name"
-                                searchph="$$$$$${txt-3364}"
+                                searchph="{{'employeeInfoManage_list_page_line75_txt-3364' | translate}}"
+                                width="100"
                                 searchexp="this.name"
                                 >
                     </sa-Select5>
                 </td>
                 <td>
                     <label class="checkbox-inline">
-                        <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>$$$$$${txt-4085}
+                        <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>{{"employeeInfoManage_list_page_line82_txt-4085" | translate}}
                     </label>
                 </td>
                 <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
-                            <i class="fa fa-search"></i> $$$$$${txt-4001}</button>
+                            <i class="fa fa-search"></i> {{"employeeInfoManage_list_page_line89_txt-4001" | translate}}</button>
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
                                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
@@ -96,7 +99,7 @@
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
                                     <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-                                    $$$$$${txt-3385}
+                                    {{"employeeInfoManage_list_page_line99_txt-3385" | translate}}
                                 </a>
                             </li>
                         </ul>
@@ -104,7 +107,7 @@
                     <button class="btn btn-sm red btn-outline filter-cancel"
                             ng-click="ctrl.reset()">
-                        <i class="fa fa-times"></i> $$$$$${txt-4000}</button>
+                        <i class="fa fa-times"></i> {{"employeeInfoManage_list_page_line107_txt-4000" | translate}}</button>
                 </td>
@@ -117,7 +120,7 @@
                         <a href="#"
                             tooltip-animation="false"
                             tooltip-placement="top"
-                            uib-tooltip="{{'$$$$$${txt-4426}' + info.personnelName + '/' + info.jobCodeori}}"
+                            uib-tooltip="{{('employeeInfoManage_list_page_line120_txt-4426' | translate) + info.personnelName + '/' + info.jobCodeori}}"
                             tooltip-class="headClass">
                             <i class="fa fa-list-ol" aria-hidden="true"></i>
@@ -139,7 +142,7 @@
                     <span ng-bind="info.jdCodeori"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.personnelType | dict:'sexType':'$$$$$${txt-4058}'"></span>
+                    <span ng-bind="info.personnelType | dict:'sexType':('employeeInfoManage_list_page_line142_txt-4058' | translate)"></span>
                     <!--<div ng-if="info.personnelType == '1'">-->
                         <!--<a href="#">-->
@@ -160,7 +163,7 @@
                     <span ng-bind="info.brancheCompany"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.posts | dict:'gzType':'$$$$$${txt-4058}'"></span>
+                    <span ng-bind="info.posts | dict:'gzType':('employeeInfoManage_list_page_line163_txt-4058' | translate)"></span>
                 </td>
                 <td>
                     <span class="glyphicon glyphicon-ok" ng-if="info.destroy != '1'"></span>
@@ -168,12 +171,16 @@
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
-                    <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>
-                    <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-4028} </a>
+                    <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> {{"employeeInfoManage_list_page_line171_txt-3866" | translate}} </a>
+                    <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> {{"employeeInfoManage_list_page_line172_txt-4028" | translate}} </a>
                     <a sweetalert
-                       sweet-options="{title: '$$$$$${txt-675}',text: '$$$$$${txt-3719}' + info.personnelName + '</br>$$$$$${txt-3761}' + info.jobCode + '</br>$$$$$${txt-40}', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '$$$$$${txt-4257}',cancelButtonText: '$$$$$${txt-3817}'}"
+                       sweet-options="{title: ('employeeInfoManage_list_page_line174_txt-675' | translate),
+                                       text: ('employeeInfoManage_list_page_line175_txt-3719' | translate) + info.personnelName + '</br>' + ('employeeInfoManage_list_page_line175_txt-3761' | translate) + info.jobCode + '</br>' + ('employeeInfoManage_list_page_line175_txt-40' | translate),
+                                       html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',
+                                       confirmButtonText: ('employeeInfoManage_list_page_line177_txt-4257' | translate),
+                                       cancelButtonText: ('employeeInfoManage_list_page_line178_txt-3817' | translate)}"
                        sweet-on-confirm="ctrl.deleteEmp(info.id)"
-                       class="btn btn-danger btn-sm">$$$$$${txt-3868}</a>
+                       class="btn btn-danger btn-sm">{{"employeeInfoManage_list_page_line180_txt-3868" | translate}}</a>
                 </td>
             </tr>
             </tbody>
@@ -181,8 +188,11 @@
     </div>
     <div class="pageBar">
-        <div class="pageBarLeft">
-            $$$$$${txt-3053}
+        <div class="pageBarLeft"
+             translate="employeeInfoManage_list_page_line189_txt-3053"
+             translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
+             translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
+             translate-value-total="{{ ctrl.page()['totalElements'] }}">
         </div>
         <div class="pageBarRight">
@@ -192,11 +202,11 @@
                             rotate="false"
                             max-size="10"
                             boundary-links="true"
-                            first-text="$$$$$${txt-4430}"
-                            previous-text="$$$$$${txt-3613}"
-                            next-text="$$$$$${txt-3614}"
-                            last-text="$$$$$${txt-4068}">
+                            first-text="{{'employeeInfoManage_list_page_line202_txt-4430' | translate}}"
+                            previous-text="{{'employeeInfoManage_list_page_line203_txt-3613' | translate}}"
+                            next-text="{{'employeeInfoManage_list_page_line204_txt-3614' | translate}}"
+                            last-text="{{'employeeInfoManage_list_page_line205_txt-4068' | translate}}">
             </uib-pagination>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     [
         'EmployeeInfoManageService_g',
         'UserPrincipal',
-        function(service, UserPrincipal) {
+        '$translate',
+        function(service, UserPrincipal, translate) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {
@@ -29,12 +30,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             // 字段描述
             var columns = [
-                {name: "personnelName", desc: i18n('txt-3949')},
-                {name: "jobCodeori", desc: i18n('txt-3940')},
-                {name: "personnelType", desc: i18n('txt-4086')},
-                {name: "company", desc: i18n('txt-3096')},
-                {name: "brancheCompany", desc: i18n('txt-3777')},
-                {name: "posts", desc: i18n('txt-4093')}
+                {name: "personnelName", desc: translate.instant("employeeInfoManage_module_js_line33_txt-3949")},
+                {name: "jobCodeori", desc: translate.instant("employeeInfoManage_module_js_line34_txt-3940")},
+                {name: "personnelType", desc: translate.instant("employeeInfoManage_module_js_line35_txt-4086")},
+                {name: "company", desc: translate.instant("employeeInfoManage_module_js_line36_txt-3096")},
+                {name: "brancheCompany", desc: translate.instant("employeeInfoManage_module_js_line37_txt-3777")},
+                {name: "posts", desc: translate.instant("employeeInfoManage_module_js_line38_txt-4093")}
             ];
             // 排序字段
             var orderColumns = {
@@ -135,7 +136,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$uibModal',
         'FileDownload_g',
         'UserInfo',
-        function(employeeInfoManageService, $state, $uibModal, fileDownload, userInfo) {
+        '$translate',
+        function(employeeInfoManageService, $state, $uibModal, fileDownload, userInfo, translate) {
             var self = this;
             self.userInfo = userInfo;
@@ -177,7 +179,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 if (p) {
                     p.then(
                         function(result) {
-                            fileDownload.downloadFile(result.data, "application/octet-stream", i18n('txt-1614') + ".xls");
+                            fileDownload.downloadFile(result.data, "application/octet-stream", translate.instant("employeeInfoManage_module_js_line182_txt-1614") + ".xls");
                         },
                         function(result) {
                             console.log("exportData failed：" + result);
@@ -248,7 +250,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         'EmployeeInfoManageService',
         '$uibModal',
         'UserInfo',
-        function(service, $uibModal, userInfo) {
+        '$translate',
+        function(service, $uibModal, userInfo, translate) {
             var self = this;
             self.userInfo = userInfo;
             var Employee = service.getQueryClass();
@@ -280,7 +283,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.deleteEmp = function(id) {
                 Employee.delete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
-                        alert(i18n('txt-3729') + result.msg);
+                        alert(translate.instant("employeeInfoManage_module_js_line286_txt-3729") + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -394,7 +397,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'EmployeeInfoManageService',
         '$stateParams',
-        function(service, $stateParams) {
+        '$translate',
+        function(service, $stateParams, translate) {
             var self = this;
             var Employee = service.getQueryClass();
             var id = $stateParams.id;
@@ -404,9 +408,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 当转向到此页面时，就获取明细信息并绑定
             self.employeeInfoForDetail = Employee.get({id: id}, function() {
-                self.title = i18n('txt-4081') + " " +
+                self.title = translate.instant("employeeInfoManage_module_js_line411_txt-4081") + " " +
                     self.employeeInfoForDetail.personnelName +
-                    " " + i18n('txt-3066');
+                    " " + translate.instant("employeeInfoManage_module_js_line413_txt-3066");
             });
         }
@@ -2,7 +2,7 @@
     <div class="modal-title">
         <h3>
             <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-            <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span>
+            <span class="caption-subject bold uppercase">{{"employeeInfoManage_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
         </h3>
     </div>
 </div>
@@ -14,5 +14,5 @@
     </sa-Orderoption>
 </div>
 <div class="modal-footer">
-    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>
-</div>
 \ No newline at end of file
+    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"employeeInfoManage_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
+</div>
@@ -15,13 +15,16 @@
  *
  * required（可选）：是否需要form的required验证
  *
+ * width(可选)：内部自动计算select框和删除按钮的宽度，并添加对应的style
+ *
  */
 angular.module('ScheduleApp').directive('saSelect5', [
     '$timeout',
     '$$SearchInfoService_g',
     'UserPrincipal',
     'DataStore',
-    function($timeout, $$searchInfoService_g, UserPrincipal, DataStore) {
+    '$translate',
+    function($timeout, $$searchInfoService_g, UserPrincipal, DataStore, translate) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html',
@@ -65,6 +68,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 var $required_attr = tAttrs["required"]; // 是否需要required验证
+                var $width_attr = tAttrs["width"]; // 宽度
+
                 if (!$name_attr) {
                     throw new Error("name属性必须填写");
                 }
@@ -111,6 +116,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 // dom，span ng-bind属性设置，TODO：暂时无法用transclude设置，先用属性设置
                 tElem.find("ui-select-choices").html("{{" + $iterobjexp_attr + "}}");
+                // 计算宽度
+                if ($width_attr) {
+                    var $button_t_b = 6; // 按钮的padding top bottom
+                    var $button_l_r = 6; // 按钮的padding left right
+                    var $select_width = $width_attr - $button_l_r * 2; // select的width
+                    tElem.find("ui-select").attr("style",
+                        "width: " + $select_width + "px!important;" +
+                        "white-space: nowrap; overflow: hidden;");
+                    tElem.find("button").attr("style", "padding: " + $button_t_b + "px " + $button_l_r + "px;");
+                }
+
                 // 当前的数据模式，ajax,dic,local
                 var dataModelType = undefined;
@@ -357,7 +373,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                          */
                         scope[ctrlAs].$$internal_dic_data = function(dictype) {
                             if (!dictionaryUtils.getByGroup(dictype)) {
-                                throw new error(i18n('txt-1275', [dictype]));
+                                throw new error(translate.instant("saSelect5_js_line375_txt-1275") + dictype);
                             }
                             // 重新创建内部保存的数据
@@ -510,4 +526,4 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
             }
         };
     }
-]);
 \ No newline at end of file
+]);
@@ -16,4 +16,4 @@
             <span class="glyphicon glyphicon-trash"></span>
         </button>
     </span>
-</div>
 \ No newline at end of file
+</div>
@@ -90,8 +90,8 @@
                 </div>
                 <div class="col-md-3 option_dir">
                     <select class="form-control aria-invalid="false" ng-model="$option.dir" ng-change="$saOrderOptionCtrl.$$select_dir_change()">
-                        <option value="ASC" ng-selected="$option.dir=='ASC'">$$$$$${txt-4157}</option>
-                        <option value="DESC" ng-selected="$option.dir=='DESC'">$$$$$${txt-4156}</option>
+                        <option value="ASC" ng-selected="$option.dir=='ASC'">{{"queryOption_saOrderOptionTemplate_line93_txt-4157" | translate}}</option>
+                        <option value="DESC" ng-selected="$option.dir=='DESC'">{{"queryOption_saOrderOptionTemplate_line94_txt-4156" | translate}}</option>
                     </select>
                 </div>
                 <div class="col-md-3 btn-group option_opt">
@@ -107,4 +107,4 @@
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -72,31 +72,32 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
 ScheduleApp.factory('DataStore', [
     '$http',
     '$q',
-    function($http, $q) {
+    '$translate',
+    function($http, $q, translate) {
         // 本地数据存储，如车辆数据，人员数据
         var dataMap = {
             "cl": [], // 车辆信息
             "ry": [], // 人员信息
             "ddreasons": [ // 调度原因（调度执勤日报里的）
-                {code: "0", name: i18n('txt-3966')},
-                {code: "1", name: i18n('txt-3958')},
-                {code: "2", name: i18n('txt-3960')},
-                {code: "3", name: i18n('txt-3837')},
-                {code: "4", name: i18n('txt-3838')},
-                {code: "5", name: i18n('txt-3876')},
-                {code: "6", name: i18n('txt-4026')},
-                {code: "7", name: i18n('txt-3840')},
-                {code: "8", name: i18n('txt-3961')},
-                {code: "9", name: i18n('txt-3962')},
-                {code: "10", name: i18n('txt-3963')},
-                {code: "11", name: i18n('txt-4197')},
-                {code: "12", name: i18n('txt-4102')},
-                {code: "13", name: i18n('txt-3957')},
-                {code: "14", name: i18n('txt-3956')}
+                {code: "0", name: translate.instant("main_js_line_82_txt-3966")},
+                {code: "1", name: translate.instant("main_js_line_83_txt-3958")},
+                {code: "2", name: translate.instant("main_js_line_84_txt-3960")},
+                {code: "3", name: translate.instant("main_js_line_85_txt-3837")},
+                {code: "4", name: translate.instant("main_js_line_86_txt-3838")},
+                {code: "5", name: translate.instant("main_js_line_87_txt-3876")},
+                {code: "6", name: translate.instant("main_js_line_88_txt-4026")},
+                {code: "7", name: translate.instant("main_js_line_89_txt-3840")},
+                {code: "8", name: translate.instant("main_js_line_90_txt-3961")},
+                {code: "9", name: translate.instant("main_js_line_91_txt-3962")},
+                {code: "10", name: translate.instant("main_js_line_92_txt-3963")},
+                {code: "11", name: translate.instant("main_js_line_93_txt-4197")},
+                {code: "12", name: translate.instant("main_js_line_94_txt-4102")},
+                {code: "13", name: translate.instant("main_js_line_95_txt-3957")},
+                {code: "14", name: translate.instant("main_js_line_96_txt-3956")}
             ],
             "zdlytype" : [ // 站点路由类型
-                {name: i18n('txt-2790'), value: 1},
-                {name: i18n('txt-168'), value: 2}
+                {name: translate.instant("main_js_line_99_txt-2790"), value: 1},
+                {name: translate.instant("main_js_line_100_txt-168"), value: 2}
             ]
         };
@@ -280,7 +281,8 @@ ScheduleApp.factory(
     [
         'requestNotificationChannel',
         '$q',
-        function(requestNotificationChannel, $q) {
+        '$translate',
+        function(requestNotificationChannel, $q, translate) {
             return {
                 request: function(config) {
                     requestNotificationChannel.requestStarted(config);
@@ -296,13 +298,13 @@ ScheduleApp.factory(
                     var data = response.data;
                     var output = [];
                     if (data.status == '407') {
-                        alert(i18n('txt-1805'));
+                        alert(translate.instant("main_js_line_301_txt-1805"));
                         return $q.reject(response);
                     } else if (data.status == '500') {
-                        output.push(i18n('txt-2284') + data.status);
-                        output.push(i18n('txt-2285') + data.path);
-                        output.push(i18n('txt-2286') + data.message);
-                        alert(i18n('txt-1807') + "\n" + output.join("\n"));
+                        output.push(translate.instant("main_js_line_304_txt-2284") + data.status);
+                        output.push(translate.instant("main_js_line_305_txt-2285") + data.path);
+                        output.push(translate.instant("main_js_line_306_txt-2286") + data.message);
+                        alert(translate.instant("main_js_line_307_txt-1807") + "\n" + output.join("\n"));
                         return $q.reject(response);
                     } else {
                         return response;
@@ -320,22 +322,22 @@ ScheduleApp.factory(
                     } else if (rejection.status == -1) {
                         // 服务器断开了
                         // alert(i18n('txt-695'));
-                        console.log(i18n('txt-695'));
+                        console.log(translate.instant("main_js_line_325_txt-695"));
                     } else {
-                        output.push(i18n('txt-2284') + rejection.status);
+                        output.push(translate.instant("main_js_line_327_txt-2284") + rejection.status);
                         // output.push("错误内容：" + angular.toJson(rejection.data));
                         if (rejection.data) {
-                            output.push(i18n('txt-2325') + rejection.data.message);
+                            output.push(translate.instant("main_js_line_330_txt-2325") + rejection.data.message);
                         } else {
-                            output.push(i18n('txt-2325') + rejection.message);
+                            output.push(translate.instant("main_js_line_332_txt-2325") + rejection.message);
                         }
                         if (rejection.status == 500) {
-                            alert(i18n('txt-1807') + "\n" + output.join("\n"));
+                            alert(translate.instant("main_js_line_336_txt-1807") + "\n" + output.join("\n"));
                         } else if (rejection.status == 407) {
-                            alert(i18n('txt-1838') + "\n" + output.join("\n"));
+                            alert(translate.instant("main_js_line_338_txt-1838") + "\n" + output.join("\n"));
                         } else {
-                            alert(i18n('txt-2333') + "\n" + output.join("\n"));
+                            alert(translate.instant("main_js_line_340_txt-2333") + "\n" + output.join("\n"));
                         }
                     }
@@ -375,9 +377,10 @@ ScheduleApp.controller(&#39;ScheduleAppController&#39;, [
     '$scope',
     'UserPrincipal',
     'DataStore',
-    function($scope, UserPrincipal, DataStore) {
+    '$translate',
+    function($scope, UserPrincipal, DataStore, translate) {
         $scope.$on('$viewContentLoaded', function(event) {
-            console.log(i18n('txt-1149') + event);
+            console.log(translate.instant("main_js_line_383_txt-1149") + event);
         });
         // 获取一次用户身份信息
-//自定义指令
-/**
- * loading载入中指令。
- */
-angular.module('ScheduleApp').directive(
-    'loadingWidget',
-    [
-        'requestNotificationChannel',
-        function(requestNotificationChannel) {
-            return {
-                restrict: 'A',
-
-                compile: function(tElem, tAttrs) {
-                    var loadingCount = 0;
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-                        post: function(scope, element, attr) {
-                            // 初始隐藏loading界面
-                            element.hide();
-
-                            // 开始请求通知处理
-                            requestNotificationChannel.onRequestStarted(scope, function(requestInfo) {
-                                if (loadingCount == 0) {
-                                    element.show();
-                                }
-                                loadingCount ++;
-                                // TODO：以后在载入中显示requestInfo相关信息
-                                console.log(requestInfo);
-                                console.log(loadingCount);
-                            });
-                            // 请求结束通知处理
-                            requestNotificationChannel.onRequestEnded(scope, function() {
-                                loadingCount --;
-                                if (loadingCount == 0) {
-                                    element.hide();
-                                }
-
-                                console.log(loadingCount);
-                            });
-                        }
-                    };
-                }
-
-            };
-
-        }
-    ]
+//自定义指令
+/**
+ * loading载入中指令。
+ */
+angular.module('ScheduleApp').directive(
+    'loadingWidget',
+    [
+        'requestNotificationChannel',
+        function(requestNotificationChannel) {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+                    var loadingCount = 0;
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+                        post: function(scope, element, attr) {
+                            // 初始隐藏loading界面
+                            element.hide();
+
+                            // 开始请求通知处理
+                            requestNotificationChannel.onRequestStarted(scope, function(requestInfo) {
+                                if (loadingCount == 0) {
+                                    element.show();
+                                }
+                                loadingCount ++;
+                                // TODO：以后在载入中显示requestInfo相关信息
+                                console.log(requestInfo);
+                                console.log(loadingCount);
+                            });
+                            // 请求结束通知处理
+                            requestNotificationChannel.onRequestEnded(scope, function() {
+                                loadingCount --;
+                                if (loadingCount == 0) {
+                                    element.hide();
+                                }
+
+                                console.log(loadingCount);
+                            });
+                        }
+                    };
+                }
+
+            };
+
+        }
+    ]
 );
 /**
  * remoteValidation指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel。
@@ -248,73 +248,73 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidationt2&#39;, [
     }
 ]);
-/**
- * remoteValidationt3 远程验证指令（监控依赖的model变化）
- * 属性如下：
- * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
- * remotemodel（必须）：关联的model
- * remotemodelcol（必须）：关联的model属性
- */
-angular.module('ScheduleApp').directive(
-    'remoteValidation3',
-    [
-        '$$SearchInfoService_g',
-        '$q',
-        function($$SearchInfoService_g, $q) {
-            return {
-                restrict: 'A', // 属性
-                require: '^ngModel', // 依赖所属指令的ngModel
-                compile: function(tElem, tAttrs) {
-                    var remotevtype_attr = tAttrs['remotevtype'];
-                    var remotemodel_attr = tAttrs['remotemodel'];
-                    var remotemodelcol_attr = tAttrs['remotemodelcol'];
-                    if (!remotevtype_attr) {
-                        throw new Error("remotevtype属性必须填写");
-                    }
-                    if (!remotemodel_attr) {
-                        throw new Error("remotemodel属性必须填写");
-                    }
-                    if (!remotemodelcol_attr) {
-                        throw new Error("remotemodelcol属性必须填写");
-                    }
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-
-                        post: function(scope, element, attr, ngModelCtrl) {
-                            ngModelCtrl.$asyncValidators.remote =
-                                function(modelValue, viewValue) {
-                                    var deferred = $q.defer();
-
-                                    // 远端验证service
-                                    var param = JSON.parse(attr['remotemodel']);
-                                    console.log(param);
-                                    param[remotemodelcol_attr] = modelValue;
-                                    $$SearchInfoService_g.validate[remotevtype_attr].remote.do(
-                                        param,
-                                        function(result) {
-                                            if (result.status == "SUCCESS") {
-                                                deferred.resolve();
-                                            } else {
-                                                scope.$remote_msg = result.msg;
-                                                deferred.reject();
-                                            }
-                                        },
-                                        function(result) {
-                                            deferred.reject();
-                                        }
-                                    );
-
-                                    return deferred.promise;
-                                };
-                        }
-                    };
-                }
-            }
-        }
-    ]
+/**
+ * remoteValidationt3 远程验证指令（监控依赖的model变化）
+ * 属性如下：
+ * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
+ * remotemodel（必须）：关联的model
+ * remotemodelcol（必须）：关联的model属性
+ */
+angular.module('ScheduleApp').directive(
+    'remoteValidation3',
+    [
+        '$$SearchInfoService_g',
+        '$q',
+        function($$SearchInfoService_g, $q) {
+            return {
+                restrict: 'A', // 属性
+                require: '^ngModel', // 依赖所属指令的ngModel
+                compile: function(tElem, tAttrs) {
+                    var remotevtype_attr = tAttrs['remotevtype'];
+                    var remotemodel_attr = tAttrs['remotemodel'];
+                    var remotemodelcol_attr = tAttrs['remotemodelcol'];
+                    if (!remotevtype_attr) {
+                        throw new Error("remotevtype属性必须填写");
+                    }
+                    if (!remotemodel_attr) {
+                        throw new Error("remotemodel属性必须填写");
+                    }
+                    if (!remotemodelcol_attr) {
+                        throw new Error("remotemodelcol属性必须填写");
+                    }
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+
+                        post: function(scope, element, attr, ngModelCtrl) {
+                            ngModelCtrl.$asyncValidators.remote =
+                                function(modelValue, viewValue) {
+                                    var deferred = $q.defer();
+
+                                    // 远端验证service
+                                    var param = JSON.parse(attr['remotemodel']);
+                                    console.log(param);
+                                    param[remotemodelcol_attr] = modelValue;
+                                    $$SearchInfoService_g.validate[remotevtype_attr].remote.do(
+                                        param,
+                                        function(result) {
+                                            if (result.status == "SUCCESS") {
+                                                deferred.resolve();
+                                            } else {
+                                                scope.$remote_msg = result.msg;
+                                                deferred.reject();
+                                            }
+                                        },
+                                        function(result) {
+                                            deferred.reject();
+                                        }
+                                    );
+
+                                    return deferred.promise;
+                                };
+                        }
+                    };
+                }
+            }
+        }
+    ]
 );
 /**
  * remoteWarn指令：远程验证警告，作为属性放在某个指令上。
@@ -431,278 +431,278 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteWarn&#39;, [
         };
     }
 ]);
-
-angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
-    return {
-        restrict: 'E',
-        templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelectTemplate.html',
-        scope: {
-            model: "="
-        },
-        controllerAs: "$saSelectCtrl",
-        bindToController: true,
-        controller: function() {
-            var self = this;
-            self.datas = []; // 关联的字典数据，内部格式 {code:{值},name:{名字}}
-        },
-        /**
-         * 此阶段可以改dom结构，此时angular还没扫描指令，
-         * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
-         * @param tElem
-         * @param tAttrs
-         * @returns {{pre: Function, post: Function}}
-         */
-        compile: function(tElem, tAttrs) {
-            // 确定是否使用angularjs required验证
-            // 属性 required
-            // 如果没有填写，内部不添加验证，如果填写了，并且等于true添加验证，否则不添加
-            var required_attr = tAttrs["required"];
-            if (required_attr) {
-                if (required_attr == "true") {
-                    // 添加required属性指令
-                    tElem.find("ui-select").attr("required", "");
-                } else {
-                    // 不等于true，不添加required属性指令
-                }
-            } else {
-                // 不添加required属性指令
-            }
-
-            //console.log("saSelect" + ":compile = >" + tElem.html());
-
-            return {
-                pre: function(scope, element, attr) {
-                    // TODO：
-                },
-                /**
-                 * 相当于link函数。
-                 *
-                 * 重要属性如下：
-                 * model 是绑定外部值。
-                 * dicgroup 字典组的类型
-                 * name input name属性值
-                 */
-                post: function(scope, element, attr) {
-                    // 1、获取属性
-                    var dicgroup_attr = attr['dicgroup']; // 字典组的类型
-                    var name_attr = attr['name']; // input name属性值
-                    var dicname_attr = attr['dicname']; // model关联的字典名字段
-                    var codename_attr = attr['codename']; // model关联的字典值字段
-                    var placeholder_attr = attr['placeholder']; // select placeholder提示
-
-                    // 系统的字典对象，使用dictionaryUtils类获取
-                    var origin_dicgroup;
-                    var dic_key; // 字典key
-
-                    if (dicgroup_attr) { // 赋值指定的字典数据
-                        origin_dicgroup = dictionaryUtils.getByGroup(dicgroup_attr);
-                        for (dic_key in origin_dicgroup) {
-                            var data = {}; // 重新组合的字典元素对象
-                            if (dic_key == "true")
-                                data.code = true;
-                            else
-                                data.code = dic_key;
-                            data.name = origin_dicgroup[dic_key];
-                            scope["$saSelectCtrl"].datas.push(data);
-                        }
-                    }
-
-                    if (name_attr) {
-                        scope["$saSelectCtrl"].nv = name_attr;
-                    }
-                    if (placeholder_attr) {
-                        scope["$saSelectCtrl"].ph = placeholder_attr;
-                    }
-
-                    scope["$saSelectCtrl"].select = function($item) {
-                        if (codename_attr) {
-                            scope["$saSelectCtrl"].model[codename_attr] = $item.code;
-                        }
-                        if (dicname_attr) {
-                            scope["$saSelectCtrl"].model[dicname_attr] = $item.name;
-                        }
-                    };
-
-                    scope["$saSelectCtrl"].remove = function() {
-                        if (codename_attr) {
-                            scope["$saSelectCtrl"].model[codename_attr] = null;
-                        }
-                        if (dicname_attr) {
-                            scope["$saSelectCtrl"].model[dicname_attr] = null;
-                        }
-                        scope["$saSelectCtrl"].cmodel = null;
-                    };
-
-                    $timeout(function() {
-                        // 创建内部使用的绑定对象
-                        var model_code = scope["$saSelectCtrl"].model[codename_attr];
-                        scope["$saSelectCtrl"].cmodel = model_code;
-                    }, 0);
-                }
-            }
-        }
-    };
-}]);
-
-
-
-angular.module('ScheduleApp').directive("saSelect2", [
-    '$timeout', '$$SearchInfoService_g',
-    function($timeout, $$searchInfoService_g) {
-        return {
-            restrict: 'E',
-            templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect2Template.html',
-            scope: {
-                model: "=" // 独立作用域，关联外部的模型对象
-            },
-            controllerAs: "$saSelectCtrl",
-            bindToController: true,
-            controller: function($scope) {
-                var self = this;
-                self.$$data = []; // 内部关联的数据
-            },
-            /**
-             * 此阶段可以改dom结构，此时angular还没扫描指令，
-             * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
-             * @param tElem
-             * @param tAttrs
-             * @returns {{pre: Function, post: Function}}
-             */
-            compile: function(tElem, tAttrs) {
-                // 1、获取此阶段使用的属性
-                var $required_attr = tAttrs["required"]; // 用于和表单验证连接，指定成required="true"才有效。
-
-                // 2、处理属性
-
-                // 确定是否使用angularjs required验证
-                // 属性 required
-                // 如果没有填写，内部不添加验证，如果填写了，并且等于true添加验证，否则不添加
-                if ($required_attr) {
-                    if ($required_attr == "true") {
-                        // 添加required属性指令
-                        tElem.find("ui-select").attr("required", "");
-                    } else {
-                        // 不等于true，不添加required属性指令
-                    }
-                } else {
-                    // 不添加required属性指令
-                }
-
-                //console.log("saSelect" + ":compile = >" + tElem.html());
-
-                return {
-                    pre: function(scope, element, attr) {
-                        // TODO：
-                    },
-                    /**
-                     * 相当于link函数。
-                     *
-                     * 重要属性如下：
-                     * model 是绑定外部值。
-                     * dicgroup 字典组的类型
-                     * name input name属性值
-                     */
-                    post: function(scope, element, attr) {
-                        // 1、获取此阶段使用的属性
-                        var $name_attr = attr["name"]; // 表单验证时需要的名字
-                        var $type_attr = attr["type"]; // 关联的那种数据值（xl/cl/ry）-> 对应线路信息/车辆信息/人员信息，后面有的继续加
-                        var $modelcolname1_attr = attr["modelcolname1"]; // 关联的模型字段名字1（一般应该是编码字段）
-                        var $modelcolname2_attr = attr["modelcolname2"]; // 关联的模型字段名字2（一般应该是名字字段）
-                        var $datacolname1_attr = attr["datacolname1"]; // 内部数据对应的字段名字1（与模型字段1对应）
-                        var $datacolname2_attr = attr["datacolname2"]; // 内部数据对应的字段名字2（与模型字段2对应）
-                        var $showcolname_attr = attr["showcolname"]; // 下拉框显示的内部数据字段名
-                        var $placeholder_attr = attr["placeholder"]; // select placeholder字符串描述
-
-                        // 2、处理属性、转换成$saSelectCtrl内部使用的属性
-                        if ($name_attr) {
-                            scope["$saSelectCtrl"].$name_attr = $name_attr;
-                        }
-                        if ($placeholder_attr) {
-                            scope["$saSelectCtrl"].$placeholder_attr = $placeholder_attr;
-                        }
-                        if ($showcolname_attr) {
-                            scope["$saSelectCtrl"].$showcolname_attr = $showcolname_attr;
-                        }
-
-                        // 2-1、添加内部方法，根据type值，改变$$data的值
-                        scope["$saSelectCtrl"].$$internal_data_change_fn = function() {
-                            // 根据type属性动态载入数据
-                            if ($type_attr) {
-                                $$searchInfoService_g[$type_attr].list(
-                                    {type: "all"},
-                                    function(result) {
-                                        scope["$saSelectCtrl"].$$data = [];
-                                        for (var i = 0; i < result.length; i ++) {
-                                            var data = {}; // data是result的一部分属性集合，根据配置来确定
-                                            if ($datacolname1_attr) {
-                                                data[$datacolname1_attr] = result[i][$datacolname1_attr];
-                                            }
-                                            if ($datacolname2_attr) {
-                                                data[$datacolname2_attr] = result[i][$datacolname2_attr];
-                                            }
-                                            if ($showcolname_attr) {
-                                                // 动态添加基于名字的拼音
-                                                data[$showcolname_attr] = result[i][$showcolname_attr];
-                                                if (data[$showcolname_attr]) {
-                                                    data["fullChars"] = pinyin.getFullChars(result[i][$showcolname_attr]).toUpperCase(); // 全拼
-                                                    data["camelChars"] = pinyin.getCamelChars(result[i][$showcolname_attr]); // 简拼
-                                                }
-                                            }
-                                            if (data["fullChars"])
-                                                scope["$saSelectCtrl"].$$data.push(data);
-                                        }
-                                    },
-                                    function(result) {
-
-                                    }
-                                );
-                            }
-                        };
-
-                        // 3、选择、删除事件映射模型和内部数据对应的字段
-                        scope["$saSelectCtrl"].$select_fn_attr = function($item) {
-                            if ($modelcolname1_attr && $datacolname1_attr) {
-                                scope["$saSelectCtrl"].model[$modelcolname1_attr] = $item[$datacolname1_attr];
-                            }
-                            if ($modelcolname2_attr && $datacolname2_attr) {
-                                scope["$saSelectCtrl"].model[$modelcolname2_attr] = $item[$datacolname2_attr];
-                            }
-                        };
-                        scope["$saSelectCtrl"].$remove_fn_attr = function() {
-                            if ($modelcolname1_attr) {
-                                scope["$saSelectCtrl"].model[$modelcolname1_attr] = null;
-                            }
-                            if ($modelcolname2_attr) {
-                                scope["$saSelectCtrl"].model[$modelcolname2_attr] = null;
-                            }
-                            scope["$saSelectCtrl"].$$cmodel = null; // 内部模型清空
-
-                            scope["$saSelectCtrl"].$$internal_data_change_fn();
-                        };
-
-                        // 4、搜索事件
-                        scope["$saSelectCtrl"].$refreshdata_fn_attr = function($search) {
-                            //var fullChars = pinyin.getFullChars($search).toUpperCase();
-                            //var camelChars = pinyin.getCamelChars($search);
-                            //
-                            //console.log(fullChars + " " + camelChars);
-                            // TODO：事件暂时没用，放着以后再说
-                        };
-
-                        // 5、全部载入后，输入的
-                        $timeout(function() {
-                            // 创建内部使用的绑定对象，用于确认选中那个值
-                            scope["$saSelectCtrl"].$$cmodel = scope["$saSelectCtrl"].model[$modelcolname1_attr];
-
-                            scope["$saSelectCtrl"].$$internal_data_change_fn();
-                        }, 0);
-                    }
-                }
-            }
-        };
-    }
-]);
-
+
+angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
+    return {
+        restrict: 'E',
+        templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelectTemplate.html',
+        scope: {
+            model: "="
+        },
+        controllerAs: "$saSelectCtrl",
+        bindToController: true,
+        controller: function() {
+            var self = this;
+            self.datas = []; // 关联的字典数据，内部格式 {code:{值},name:{名字}}
+        },
+        /**
+         * 此阶段可以改dom结构，此时angular还没扫描指令，
+         * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
+         * @param tElem
+         * @param tAttrs
+         * @returns {{pre: Function, post: Function}}
+         */
+        compile: function(tElem, tAttrs) {
+            // 确定是否使用angularjs required验证
+            // 属性 required
+            // 如果没有填写，内部不添加验证，如果填写了，并且等于true添加验证，否则不添加
+            var required_attr = tAttrs["required"];
+            if (required_attr) {
+                if (required_attr == "true") {
+                    // 添加required属性指令
+                    tElem.find("ui-select").attr("required", "");
+                } else {
+                    // 不等于true，不添加required属性指令
+                }
+            } else {
+                // 不添加required属性指令
+            }
+
+            //console.log("saSelect" + ":compile = >" + tElem.html());
+
+            return {
+                pre: function(scope, element, attr) {
+                    // TODO：
+                },
+                /**
+                 * 相当于link函数。
+                 *
+                 * 重要属性如下：
+                 * model 是绑定外部值。
+                 * dicgroup 字典组的类型
+                 * name input name属性值
+                 */
+                post: function(scope, element, attr) {
+                    // 1、获取属性
+                    var dicgroup_attr = attr['dicgroup']; // 字典组的类型
+                    var name_attr = attr['name']; // input name属性值
+                    var dicname_attr = attr['dicname']; // model关联的字典名字段
+                    var codename_attr = attr['codename']; // model关联的字典值字段
+                    var placeholder_attr = attr['placeholder']; // select placeholder提示
+
+                    // 系统的字典对象，使用dictionaryUtils类获取
+                    var origin_dicgroup;
+                    var dic_key; // 字典key
+
+                    if (dicgroup_attr) { // 赋值指定的字典数据
+                        origin_dicgroup = dictionaryUtils.getByGroup(dicgroup_attr);
+                        for (dic_key in origin_dicgroup) {
+                            var data = {}; // 重新组合的字典元素对象
+                            if (dic_key == "true")
+                                data.code = true;
+                            else
+                                data.code = dic_key;
+                            data.name = origin_dicgroup[dic_key];
+                            scope["$saSelectCtrl"].datas.push(data);
+                        }
+                    }
+
+                    if (name_attr) {
+                        scope["$saSelectCtrl"].nv = name_attr;
+                    }
+                    if (placeholder_attr) {
+                        scope["$saSelectCtrl"].ph = placeholder_attr;
+                    }
+
+                    scope["$saSelectCtrl"].select = function($item) {
+                        if (codename_attr) {
+                            scope["$saSelectCtrl"].model[codename_attr] = $item.code;
+                        }
+                        if (dicname_attr) {
+                            scope["$saSelectCtrl"].model[dicname_attr] = $item.name;
+                        }
+                    };
+
+                    scope["$saSelectCtrl"].remove = function() {
+                        if (codename_attr) {
+                            scope["$saSelectCtrl"].model[codename_attr] = null;
+                        }
+                        if (dicname_attr) {
+                            scope["$saSelectCtrl"].model[dicname_attr] = null;
+                        }
+                        scope["$saSelectCtrl"].cmodel = null;
+                    };
+
+                    $timeout(function() {
+                        // 创建内部使用的绑定对象
+                        var model_code = scope["$saSelectCtrl"].model[codename_attr];
+                        scope["$saSelectCtrl"].cmodel = model_code;
+                    }, 0);
+                }
+            }
+        }
+    };
+}]);
+
+
+
+angular.module('ScheduleApp').directive("saSelect2", [
+    '$timeout', '$$SearchInfoService_g',
+    function($timeout, $$searchInfoService_g) {
+        return {
+            restrict: 'E',
+            templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect2Template.html',
+            scope: {
+                model: "=" // 独立作用域，关联外部的模型对象
+            },
+            controllerAs: "$saSelectCtrl",
+            bindToController: true,
+            controller: function($scope) {
+                var self = this;
+                self.$$data = []; // 内部关联的数据
+            },
+            /**
+             * 此阶段可以改dom结构，此时angular还没扫描指令，
+             * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
+             * @param tElem
+             * @param tAttrs
+             * @returns {{pre: Function, post: Function}}
+             */
+            compile: function(tElem, tAttrs) {
+                // 1、获取此阶段使用的属性
+                var $required_attr = tAttrs["required"]; // 用于和表单验证连接，指定成required="true"才有效。
+
+                // 2、处理属性
+
+                // 确定是否使用angularjs required验证
+                // 属性 required
+                // 如果没有填写，内部不添加验证，如果填写了，并且等于true添加验证，否则不添加
+                if ($required_attr) {
+                    if ($required_attr == "true") {
+                        // 添加required属性指令
+                        tElem.find("ui-select").attr("required", "");
+                    } else {
+                        // 不等于true，不添加required属性指令
+                    }
+                } else {
+                    // 不添加required属性指令
+                }
+
+                //console.log("saSelect" + ":compile = >" + tElem.html());
+
+                return {
+                    pre: function(scope, element, attr) {
+                        // TODO：
+                    },
+                    /**
+                     * 相当于link函数。
+                     *
+                     * 重要属性如下：
+                     * model 是绑定外部值。
+                     * dicgroup 字典组的类型
+                     * name input name属性值
+                     */
+                    post: function(scope, element, attr) {
+                        // 1、获取此阶段使用的属性
+                        var $name_attr = attr["name"]; // 表单验证时需要的名字
+                        var $type_attr = attr["type"]; // 关联的那种数据值（xl/cl/ry）-> 对应线路信息/车辆信息/人员信息，后面有的继续加
+                        var $modelcolname1_attr = attr["modelcolname1"]; // 关联的模型字段名字1（一般应该是编码字段）
+                        var $modelcolname2_attr = attr["modelcolname2"]; // 关联的模型字段名字2（一般应该是名字字段）
+                        var $datacolname1_attr = attr["datacolname1"]; // 内部数据对应的字段名字1（与模型字段1对应）
+                        var $datacolname2_attr = attr["datacolname2"]; // 内部数据对应的字段名字2（与模型字段2对应）
+                        var $showcolname_attr = attr["showcolname"]; // 下拉框显示的内部数据字段名
+                        var $placeholder_attr = attr["placeholder"]; // select placeholder字符串描述
+
+                        // 2、处理属性、转换成$saSelectCtrl内部使用的属性
+                        if ($name_attr) {
+                            scope["$saSelectCtrl"].$name_attr = $name_attr;
+                        }
+                        if ($placeholder_attr) {
+                            scope["$saSelectCtrl"].$placeholder_attr = $placeholder_attr;
+                        }
+                        if ($showcolname_attr) {
+                            scope["$saSelectCtrl"].$showcolname_attr = $showcolname_attr;
+                        }
+
+                        // 2-1、添加内部方法，根据type值，改变$$data的值
+                        scope["$saSelectCtrl"].$$internal_data_change_fn = function() {
+                            // 根据type属性动态载入数据
+                            if ($type_attr) {
+                                $$searchInfoService_g[$type_attr].list(
+                                    {type: "all"},
+                                    function(result) {
+                                        scope["$saSelectCtrl"].$$data = [];
+                                        for (var i = 0; i < result.length; i ++) {
+                                            var data = {}; // data是result的一部分属性集合，根据配置来确定
+                                            if ($datacolname1_attr) {
+                                                data[$datacolname1_attr] = result[i][$datacolname1_attr];
+                                            }
+                                            if ($datacolname2_attr) {
+                                                data[$datacolname2_attr] = result[i][$datacolname2_attr];
+                                            }
+                                            if ($showcolname_attr) {
+                                                // 动态添加基于名字的拼音
+                                                data[$showcolname_attr] = result[i][$showcolname_attr];
+                                                if (data[$showcolname_attr]) {
+                                                    data["fullChars"] = pinyin.getFullChars(result[i][$showcolname_attr]).toUpperCase(); // 全拼
+                                                    data["camelChars"] = pinyin.getCamelChars(result[i][$showcolname_attr]); // 简拼
+                                                }
+                                            }
+                                            if (data["fullChars"])
+                                                scope["$saSelectCtrl"].$$data.push(data);
+                                        }
+                                    },
+                                    function(result) {
+
+                                    }
+                                );
+                            }
+                        };
+
+                        // 3、选择、删除事件映射模型和内部数据对应的字段
+                        scope["$saSelectCtrl"].$select_fn_attr = function($item) {
+                            if ($modelcolname1_attr && $datacolname1_attr) {
+                                scope["$saSelectCtrl"].model[$modelcolname1_attr] = $item[$datacolname1_attr];
+                            }
+                            if ($modelcolname2_attr && $datacolname2_attr) {
+                                scope["$saSelectCtrl"].model[$modelcolname2_attr] = $item[$datacolname2_attr];
+                            }
+                        };
+                        scope["$saSelectCtrl"].$remove_fn_attr = function() {
+                            if ($modelcolname1_attr) {
+                                scope["$saSelectCtrl"].model[$modelcolname1_attr] = null;
+                            }
+                            if ($modelcolname2_attr) {
+                                scope["$saSelectCtrl"].model[$modelcolname2_attr] = null;
+                            }
+                            scope["$saSelectCtrl"].$$cmodel = null; // 内部模型清空
+
+                            scope["$saSelectCtrl"].$$internal_data_change_fn();
+                        };
+
+                        // 4、搜索事件
+                        scope["$saSelectCtrl"].$refreshdata_fn_attr = function($search) {
+                            //var fullChars = pinyin.getFullChars($search).toUpperCase();
+                            //var camelChars = pinyin.getCamelChars($search);
+                            //
+                            //console.log(fullChars + " " + camelChars);
+                            // TODO：事件暂时没用，放着以后再说
+                        };
+
+                        // 5、全部载入后，输入的
+                        $timeout(function() {
+                            // 创建内部使用的绑定对象，用于确认选中那个值
+                            scope["$saSelectCtrl"].$$cmodel = scope["$saSelectCtrl"].model[$modelcolname1_attr];
+
+                            scope["$saSelectCtrl"].$$internal_data_change_fn();
+                        }, 0);
+                    }
+                }
+            }
+        };
+    }
+]);
+
@@ -1435,13 +1435,16 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect4&#39;, [
  *
  * required（可选）：是否需要form的required验证
  *
+ * width(可选)：内部自动计算select框和删除按钮的宽度，并添加对应的style
+ *
  */
 angular.module('ScheduleApp').directive('saSelect5', [
     '$timeout',
     '$$SearchInfoService_g',
     'UserPrincipal',
     'DataStore',
-    function($timeout, $$searchInfoService_g, UserPrincipal, DataStore) {
+    '$translate',
+    function($timeout, $$searchInfoService_g, UserPrincipal, DataStore, translate) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html',
@@ -1485,6 +1488,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 var $required_attr = tAttrs["required"]; // 是否需要required验证
+                var $width_attr = tAttrs["width"]; // 宽度
+
                 if (!$name_attr) {
                     throw new Error("name属性必须填写");
                 }
@@ -1531,6 +1536,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 // dom，span ng-bind属性设置，TODO：暂时无法用transclude设置，先用属性设置
                 tElem.find("ui-select-choices").html("{{" + $iterobjexp_attr + "}}");
+                // 计算宽度
+                if ($width_attr) {
+                    var $button_t_b = 6; // 按钮的padding top bottom
+                    var $button_l_r = 6; // 按钮的padding left right
+                    var $select_width = $width_attr - $button_l_r * 2; // select的width
+                    tElem.find("ui-select").attr("style",
+                        "width: " + $select_width + "px!important;" +
+                        "white-space: nowrap; overflow: hidden;");
+                    tElem.find("button").attr("style", "padding: " + $button_t_b + "px " + $button_l_r + "px;");
+                }
+
                 // 当前的数据模式，ajax,dic,local
                 var dataModelType = undefined;
@@ -1777,7 +1793,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                          */
                         scope[ctrlAs].$$internal_dic_data = function(dictype) {
                             if (!dictionaryUtils.getByGroup(dictype)) {
-                                throw new error(i18n('txt-1275', [dictype]));
+                                throw new error(translate.instant("saSelect5_js_line375_txt-1275") + dictype);
                             }
                             // 重新创建内部保存的数据
@@ -1931,149 +1947,150 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
         };
     }
 ]);
-/**
- * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选
- * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够
- * cmoptions（必须）：描述绑定的逻辑配置对象，格式如下：
- *
- * // TODO：
- */
-angular.module('ScheduleApp').directive('mySelect', [
-    function() {
-        return {
-            restrict: 'E',
-            template: '<div>bioxuxuan</div>',
-            require: 'ngModel',
-            compile: function(tElem, tAttrs) {
-                return {
-                    pre: function(scope, element, attr) {
-                    },
-                    post: function(scope, element, attr, ngModelCtr) {
-                        // model -> view
-                        ngModelCtr.$formatters.push(function(modelValue) {
-                            // 监控model的变化
-                            if (typeof modelValue != "undefined") {
-                                console.log(modelValue);
-
-                                return modelValue;
-                            }
-                        });
-
-                        ngModelCtr.$render = function() {
-                            if (typeof scope.ctrl.say != "undefined") {
-                                element.find('div').css('color', 'red');
-                            }
-                        };
-
-                        ngModelCtr.$setViewValue("init value");
-
-
-                    }
-                }
-            }
-        }
-    }
+/**
+ * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选
+ * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够
+ * cmoptions（必须）：描述绑定的逻辑配置对象，格式如下：
+ *
+ * // TODO：
+ */
+angular.module('ScheduleApp').directive('mySelect', [
+    function() {
+        return {
+            restrict: 'E',
+            template: '<div>bioxuxuan</div>',
+            require: 'ngModel',
+            compile: function(tElem, tAttrs) {
+                return {
+                    pre: function(scope, element, attr) {
+
+                    },
+                    post: function(scope, element, attr, ngModelCtr) {
+                        // model -> view
+                        ngModelCtr.$formatters.push(function(modelValue) {
+                            // 监控model的变化
+                            if (typeof modelValue != "undefined") {
+                                console.log(modelValue);
+
+                                return modelValue;
+                            }
+                        });
+
+                        ngModelCtr.$render = function() {
+                            if (typeof scope.ctrl.say != "undefined") {
+                                element.find('div').css('color', 'red');
+                            }
+                        };
+
+                        ngModelCtr.$setViewValue("init value");
+
+
+                    }
+                }
+            }
+        }
+    }
 ]);
-
-/**
- * saRadiogroup指令
- * 属性如下：
- * model（必须）：独立作用域，外部绑定的一个值，如：ctrl.timeTableManageForForm.isEnableDisTemplate
- * dicgroup（必须）：关联的字典数据type（TODO：以后增加其他数据源）
- * name（必须）：控件的名字
- * required（可选）：是否要用required验证
- * disabled（可选）：标示单选框是否可选
- *
- */
-angular.module('ScheduleApp').directive("saRadiogroup", [function() {
-    /**
-     * 使用字典数据的单选按钮组的指令。
-     * 指令名称：truefalse-Dic
-     */
-    return {
-        restrict: 'E',
-        templateUrl: '/pages/scheduleApp/module/common/dts1/radioButton/saRadiogroupTemplate.html',
-        scope: {
-            model: "="
-        },
-        controllerAs: "$saRadiogroupCtrl",
-        bindToController: true,
-        controller: function($scope) {
-            //$scope["model"] = {selectedOption: null};
-            //console.log("controller");
-            //console.log("controller:" + $scope["model"]);
-
-            var self = this;
-            self.$$data = null; // 内部数据
-        },
-
-        /**
-         * 此阶段可以改dom结构，此时angular还没扫描指令，
-         * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
-         * @param tElem
-         * @param tAttrs
-         * @returns {{pre: Function, post: Function}}
-         */
-        compile: function(tElem, tAttrs) {
-            // 获取属性
-            var $dicgroup_attr = tAttrs["dicgroup"]; // 关联的字典数据type
-            var $name_attr = tAttrs["name"]; // 控件的名字
-            var $required_attr = tAttrs["required"]; // 是否要用required验证
-            var $disabled_attr = tAttrs["disabled"]; // 标示单选框是否可选
-
-            // controlAs名字
-            var ctrlAs = "$saRadiogroupCtrl";
-
-            // 如果有required属性，添加angularjs required验证
-            if ($required_attr != undefined) {
-                tElem.find("input").attr("required", "");
-            }
-
-            return {
-                pre: function(scope, element, attr) {
-
-                },
-
-                /**
-                 * 相当于link函数。
-                 * @param scope
-                 * @param element
-                 * @param attr
-                 */
-                post: function(scope, element, attr) {
-                    //console.log("link");
-                    //console.log("link:" + scope.model);
-                    //scope["model"] = {selectedOption: null};
-
-                    if ($name_attr) {
-                        scope[ctrlAs].nv = $name_attr;
-                    }
-
-                    if ($disabled_attr) {
-                        scope[ctrlAs].disabled = true;
-                    }
-                    if ($dicgroup_attr) {
-                        var obj = dictionaryUtils.getByGroup($dicgroup_attr);
-                        scope[ctrlAs].$$data = obj;
-                        // 处理 scope["dic"] key值
-                        scope[ctrlAs].dicvalueCalcu = function(value) {
-                            if (value == "true") {
-                                //console.log(value);
-                                return true;
-                            } else if (value == "false") {
-                                //console.log(value);
-                                return false;
-                            } else {
-                                return value;
-                            }
-                        };
-                    }
-                }
-            };
-        }
-    };
-}]);
+
+/**
+ * saRadiogroup指令
+ * 属性如下：
+ * model（必须）：独立作用域，外部绑定的一个值，如：ctrl.timeTableManageForForm.isEnableDisTemplate
+ * dicgroup（必须）：关联的字典数据type（TODO：以后增加其他数据源）
+ * name（必须）：控件的名字
+ * required（可选）：是否要用required验证
+ * disabled（可选）：标示单选框是否可选
+ *
+ */
+angular.module('ScheduleApp').directive("saRadiogroup", [function() {
+    /**
+     * 使用字典数据的单选按钮组的指令。
+     * 指令名称：truefalse-Dic
+     */
+    return {
+        restrict: 'E',
+        templateUrl: '/pages/scheduleApp/module/common/dts1/radioButton/saRadiogroupTemplate.html',
+        scope: {
+            model: "="
+        },
+        controllerAs: "$saRadiogroupCtrl",
+        bindToController: true,
+        controller: function($scope) {
+            //$scope["model"] = {selectedOption: null};
+            //console.log("controller");
+            //console.log("controller:" + $scope["model"]);
+
+            var self = this;
+            self.$$data = null; // 内部数据
+        },
+
+        /**
+         * 此阶段可以改dom结构，此时angular还没扫描指令，
+         * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
+         * @param tElem
+         * @param tAttrs
+         * @returns {{pre: Function, post: Function}}
+         */
+        compile: function(tElem, tAttrs) {
+            // 获取属性
+            var $dicgroup_attr = tAttrs["dicgroup"]; // 关联的字典数据type
+            var $name_attr = tAttrs["name"]; // 控件的名字
+            var $required_attr = tAttrs["required"]; // 是否要用required验证
+            var $disabled_attr = tAttrs["disabled"]; // 标示单选框是否可选
+
+            // controlAs名字
+            var ctrlAs = "$saRadiogroupCtrl";
+
+            // 如果有required属性，添加angularjs required验证
+            if ($required_attr != undefined) {
+                tElem.find("input").attr("required", "");
+            }
+
+            return {
+                pre: function(scope, element, attr) {
+
+                },
+
+                /**
+                 * 相当于link函数。
+                 * @param scope
+                 * @param element
+                 * @param attr
+                 */
+                post: function(scope, element, attr) {
+                    //console.log("link");
+                    //console.log("link:" + scope.model);
+                    //scope["model"] = {selectedOption: null};
+
+                    if ($name_attr) {
+                        scope[ctrlAs].nv = $name_attr;
+                    }
+
+                    if ($disabled_attr) {
+                        scope[ctrlAs].disabled = true;
+                    }
+                    if ($dicgroup_attr) {
+                        var obj = dictionaryUtils.getByGroup($dicgroup_attr);
+                        scope[ctrlAs].$$data = obj;
+                        // 处理 scope["dic"] key值
+                        scope[ctrlAs].dicvalueCalcu = function(value) {
+                            if (value == "true") {
+                                //console.log(value);
+                                return true;
+                            } else if (value == "false") {
+                                //console.log(value);
+                                return false;
+                            } else {
+                                return value;
+                            }
+                        };
+                    }
+                }
+            };
+        }
+    };
+}]);
@@ -2236,387 +2253,387 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saCheckboxgroup&#39;, [
 ]);
+
+
+/**
+ * saDategroup指令
+ * 属性如下：
+ * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
+ * dcvalue（必须）：绑定的model字段值，如：dcvalue={{ctrl.employeeInfoForSave.xl.id}}
+ * dcname（必须）：绑定的model字段名，如：dcname=xl.id
+ * name（必须）：控件的名字
+ * required（可选）：是否要用required验证
+ * disabled（可选）：标示框是否可选
+ *
+ */
+angular.module('ScheduleApp').directive('saDategroup', [
+    '$filter',
+    function($filter) {
+        return {
+            restrict: 'E',
+            templateUrl: '/pages/scheduleApp/module/common/dts2/dateGroup/saDategroupTemplate.html',
+            scope: {
+                model: "=" // 独立作用域，关联外部的模型object
+            },
+            controllerAs: "$saDategroupCtrl",
+            bindToController: true,
+            controller: function($scope) {
+                var self = this;
+                self.$$data = []; // 内部的数据
+                self.$$date_select; // 内部选中的日期
+
+                //// 测试数据
+                //self.$$data = [
+                //    {datestr: '2011-01-01', ischecked: true},
+                //    {datestr: '2011-01-01', ischecked: true},
+                //    {datestr: '2011-01-01', ischecked: true}
+                //];
+            },
+
+            /**
+             * 此阶段可以改dom结构，此时angular还没扫描指令，
+             * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
+             * @param tElem
+             * @param tAttrs
+             * @returns {{pre: Function, post: Function}}
+             */
+            compile: function(tElem, tAttrs) {
+                // 获取所有的属性
+                var $name_attr = tAttrs["name"]; // 控件的名字
+                var $required_attr = tAttrs["required"]; // 是否需要required验证
+                var $disabled_attr = tAttrs["disabled"]; // 是否禁用
+                var $dcname_attr = tAttrs["dcname"]; // 绑定的model字段名
+
+                // controlAs名字
+                var ctrlAs = '$saDategroupCtrl';
+
+                // 如果有required属性，添加angularjs required验证
+                if ($required_attr != undefined) {
+                    //console.log(tElem.html());
+                    tElem.find("div").attr("required", "");
+                }
+                // 如果有disabled属性，添加禁用标志
+                if ($disabled_attr != undefined) {
+                    tElem.find("input").attr("ng-disabled", "true");
+                    tElem.find("div").attr("ng-disabled", "true");
+                }
+
+                return {
+                    pre: function (scope, element, attr) {
+                        // TODO：
+                    },
+                    /**
+                     * 相当于link函数。
+                     * @param scope
+                     * @param element
+                     * @param attr
+                     */
+                    post: function (scope, element, attr) {
+                        // name属性
+                        if ($name_attr) {
+                            scope[ctrlAs]["$name_attr"] = $name_attr;
+                        }
+
+
+                        // 日期open属性，及方法
+                        scope[ctrlAs].$$specialDateOpen = false;
+                        scope[ctrlAs].$$specialDate_open = function() {
+                            scope[ctrlAs].$$specialDateOpen = true;
+                        };
+
+                        // 监控选择的日期
+                        scope.$watch(
+                            function() {
+                                return scope[ctrlAs]['$$date_select'];
+                            },
+                            function(newValue, oldValue) {
+                                if (newValue) {
+                                    //console.log("saDategroup--->selectdate：" + newValue);
+                                    // 调用内置filter，转换日期到yyyy-MM-dd格式
+                                    var text = $filter('date')(newValue, 'yyyy-MM-dd');
+                                    var i;
+                                    var isexist = false; // 日期是否已经选择标识
+                                    for (i = 0; i < scope[ctrlAs]["$$data"].length; i++) {
+                                        if (scope[ctrlAs]["$$data"][i].datestr == text) {
+                                            isexist = true;
+                                            break;
+                                        }
+                                    }
+                                    if (!isexist) {
+                                        scope[ctrlAs]["$$data"].push(
+                                            {
+                                                datestr: text,
+                                                ischecked: true
+                                            }
+                                        );
+                                    }
+
+                                }
+
+                            }
+                        );
+
+                        /**
+                         * 日期点击事件处理函数。
+                         * @param $index 索引
+                         */
+                        scope[ctrlAs].$$internal_datestr_click = function($index) {
+                            scope[ctrlAs].$$data.splice($index, 1);
+                        };
+
+                        // 测试使用watch监控$$data的变化
+                        scope.$watch(
+                            function() {
+                                return scope[ctrlAs]['$$data'];
+                            },
+                            function(newValue, oldValue) {
+                                // 根据$$data生成对应的数据
+                                var special_days_arr = [];
+                                var i;
+                                for (i = 0; i < scope[ctrlAs]["$$data"].length; i++) {
+                                    special_days_arr.push(scope[ctrlAs]["$$data"][i].datestr);
+                                }
+
+                                scope[ctrlAs].$$internalmodel = special_days_arr.join(",");
+                                console.log("bbbbbbbb--->" + scope[ctrlAs].$$internalmodel);
+
+                                // 更新model
+                                if ($dcname_attr) {
+                                    eval("scope[ctrlAs].model" + "." + $dcname_attr + " = special_days_arr.join(',');");
+                                }
+                            },
+                            true
+                        );
+
+                        // 监控dcvalue model值变换
+                        attr.$observe("dcvalue", function(value) {
+                            console.log("saDategroup 监控dc1 model值变换：" + value);
+                            if (value) {
+                                // 根据value值，修改$$data里的值
+                                var date_array = value.split(",");
+                                var i;
+                                scope[ctrlAs]["$$data"] = [];
+                                for (i = 0; i < date_array.length; i++) {
+                                    scope[ctrlAs]["$$data"].push(
+                                        {
+                                            datestr: date_array[i],
+                                            ischecked: true
+                                        }
+                                    );
+                                }
+
+
+
+
+
+
+
+
+
+                            }
+                        });
+
+                    }
+
+                };
+            }
+        }
+    }
+]);
+
+
+/**
+ * saFbgsgroup指令
+ * 属性如下：
+ * name（必须）：控件的名字
+ * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
+ * fbgsvalue（必须）：绑定的model翻班格式值，如：fbgsvalue={{ctrl.employeeInfoForSave.fbgs}}
+ * fbgsname（必须）：绑定的model翻班格式字段名，如：fbgsname=fbgs
+ *
+ * required（可选）：是否要用required验证
+ *
+ */
+angular.module('ScheduleApp').directive(
+    'saFbgsgroup',
+    [
+        function() {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/fbgsGroup/saFbgsgroupTemplate.html',
+                scope: {
+                    model: "=" // 独立作用域，关联外部的模型object
+                },
+                controllerAs: '$saFbgsgroupCtrl',
+                bindToController: true,
+                controller: function() {
+                    var self = this;
+
+                    self.$$dataSelected = []; // 选中的路牌列表
+
+                    // saFbgsgroup组件的ng-model，用于外部绑定等操作
+                    self.$$internalmodel = undefined;
+                },
+
+                /**
+                 * 此阶段可以改dom结构，此时angular还没扫描指令，
+                 * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile: function(tElem, tAttrs) {
+                    // 获取所有属性
+                    var $name_attr = tAttrs["name"]; // 控件的名字
+                    var $required_attr = tAttrs["required"]; // 是否需要required验证
+                    var $fbgsname_attr = tAttrs["fbgsname"]; // 绑定的model翻班格式字段名
+
+                    // controlAs名字
+                    var ctrlAs = '$saFbgsgroupCtrl';
+
+                    // 如果有required属性，添加angularjs required验证
+                    if ($required_attr != undefined) {
+                        //console.log(tElem.html());
+                        tElem.find("div").attr("required", "");
+                    }
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+
+                        /**
+                         * 相当于link函数。
+                         * @param scope
+                         * @param element
+                         * @param attr
+                         */
+                        post: function(scope, element, attr) {
+                            // name属性
+                            if ($name_attr) {
+                                scope[ctrlAs]["$name_attr"] = $name_attr;
+                            }
+
+                            /**
+                             * 路牌列表点击（路牌列表中选中路牌）
+                             * @param fbcode
+                             */
+                            scope[ctrlAs].$$internal_fb_click = function(fbcode) {
+                                scope[ctrlAs].$$dataSelected.push(fbcode);
+                            };
+
+                            /**
+                             * 选中的路牌双击（删除选中的路牌）
+                             * @param $index
+                             */
+                            scope[ctrlAs].$$internal_sellplist_dbclick = function($index) {
+                                scope[ctrlAs].$$dataSelected.splice($index, 1);
+                            };
+
+                            /**
+                             * 验证内部数据，更新外部model
+                             */
+                            scope[ctrlAs].$$internal_validate_model = function() {
+                                var data_temp = scope[ctrlAs].$$dataSelected;
+
+                                if (data_temp &&
+                                    data_temp.length > 0) {
+
+                                    // 更新内部model，用于外部验证
+                                    // 内部model的值暂时随意，以后再改
+                                    scope[ctrlAs].$$internalmodel = {desc: "ok"};
+
+                                    // 更新外部model字段
+                                    if ($fbgsname_attr) {
+                                        console.log("$fbgsname=" + data_temp.join(','));
+                                        eval("scope[ctrlAs].model" + "." + $fbgsname_attr + " = data_temp.join(',');");
+                                    }
+
+                                } else {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                }
+                            };
+
+                            // 监控内部数据，$$data_selected 变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].$$dataSelected;
+                                },
+                                function(newValue, oldValue) {
+                                    scope[ctrlAs].$$internal_validate_model();
+                                },
+                                true
+                            );
+
+                            // 监控路牌名称范围值的变化，处理初始化赋值
+                            attr.$observe("fbgsvalue", function(value) {
+                                var data_temp = scope[ctrlAs].$$dataSelected;
+
+                                if (value && value != "" && data_temp && data_temp.length == 0) { // 初始创建
+                                    var data_temp = scope[ctrlAs].$$dataSelected;
+                                    var fbgses = [];
+                                    var i = 0;
+
+                                    // 分隔翻班格式
+                                    if (value.indexOf(",") >= 0) { // 以逗号分隔，如 1,1,0,1
+                                        fbgses = value.split(",");
+                                    } else {
+                                        for (i = 0; i < value.length; i++) { // 字符串形式，如 1101
+                                            fbgses.push(value.substr(i, 1));
+                                        }
+                                    }
+
+                                    for (i = 0; i < fbgses.length; i++) {
+                                        if (fbgses[i] == "1" || fbgses[i] == "0") {
+                                            data_temp.push(fbgses[i]);
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    };
+                }
+            }
+        }
+    ]);
 /**
- * saDategroup指令
+ * saGuideboardgroup指令
  * 属性如下：
- * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
- * dcvalue（必须）：绑定的model字段值，如：dcvalue={{ctrl.employeeInfoForSave.xl.id}}
- * dcname（必须）：绑定的model字段名，如：dcname=xl.id
  * name（必须）：控件的名字
+ * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
+ * xlidvalue（必须）：绑定的model线路id值，如：xlidvalue={{ctrl.employeeInfoForSave.xl.id}}
+ * lprangevalue（必须）：绑定的model路牌名字范围值，如：lprangevalue={{ctrl.employeeInfoForSave.lprange}}
+ * lprangename（必须）：绑定的model路牌名字范围字段名，如：lprangename=lprange
+ * lpidrangevalue（必须）：绑定的model路牌id范围值，如：lprangevalue={{ctrl.employeeInfoForSave.lprange}}
+ * lpidrangename（必须）：绑定的model路牌id范围字段名，如：lprangename=lprange
+ * lpstartvalue（必须）：绑定的model起始路牌值，如：lpstartvalue={{ctrl.employeeInfoForSave.lpstart}}
+ * lpstartname（必须）：绑定的model起始路牌字段名，如：lpstartname=lpstart
+ *
  * required（可选）：是否要用required验证
- * disabled（可选）：标示框是否可选
  *
  */
-angular.module('ScheduleApp').directive('saDategroup', [
-    '$filter',
-    function($filter) {
+angular.module('ScheduleApp').directive('saGuideboardgroup', [
+    'GuideboardManageService_g',
+    function(guideboardManageService_g) {
         return {
             restrict: 'E',
-            templateUrl: '/pages/scheduleApp/module/common/dts2/dateGroup/saDategroupTemplate.html',
+            templateUrl: '/pages/scheduleApp/module/common/dts2/guideboardGroup/saGuideboardgroupTemplate.html',
             scope: {
                 model: "=" // 独立作用域，关联外部的模型object
             },
-            controllerAs: "$saDategroupCtrl",
+            controllerAs: '$saGuideboardgroupCtrl',
             bindToController: true,
             controller: function($scope) {
                 var self = this;
-                self.$$data = []; // 内部的数据
-                self.$$date_select; // 内部选中的日期
+                self.$$dataReal = []; // 选择线路后，该线路的路牌数据
+                self.$$data = []; // 页面最多显示10条，可以通过$$searchText筛选
-                //// 测试数据
+                // 测试数据
                 //self.$$data = [
-                //    {datestr: '2011-01-01', ischecked: true},
-                //    {datestr: '2011-01-01', ischecked: true},
-                //    {datestr: '2011-01-01', ischecked: true}
-                //];
-            },
-
-            /**
-             * 此阶段可以改dom结构，此时angular还没扫描指令，
-             * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
-             * @param tElem
-             * @param tAttrs
-             * @returns {{pre: Function, post: Function}}
-             */
-            compile: function(tElem, tAttrs) {
-                // 获取所有的属性
-                var $name_attr = tAttrs["name"]; // 控件的名字
-                var $required_attr = tAttrs["required"]; // 是否需要required验证
-                var $disabled_attr = tAttrs["disabled"]; // 是否禁用
-                var $dcname_attr = tAttrs["dcname"]; // 绑定的model字段名
-
-                // controlAs名字
-                var ctrlAs = '$saDategroupCtrl';
-
-                // 如果有required属性，添加angularjs required验证
-                if ($required_attr != undefined) {
-                    //console.log(tElem.html());
-                    tElem.find("div").attr("required", "");
-                }
-                // 如果有disabled属性，添加禁用标志
-                if ($disabled_attr != undefined) {
-                    tElem.find("input").attr("ng-disabled", "true");
-                    tElem.find("div").attr("ng-disabled", "true");
-                }
-
-                return {
-                    pre: function (scope, element, attr) {
-                        // TODO：
-                    },
-                    /**
-                     * 相当于link函数。
-                     * @param scope
-                     * @param element
-                     * @param attr
-                     */
-                    post: function (scope, element, attr) {
-                        // name属性
-                        if ($name_attr) {
-                            scope[ctrlAs]["$name_attr"] = $name_attr;
-                        }
-
-
-                        // 日期open属性，及方法
-                        scope[ctrlAs].$$specialDateOpen = false;
-                        scope[ctrlAs].$$specialDate_open = function() {
-                            scope[ctrlAs].$$specialDateOpen = true;
-                        };
-
-                        // 监控选择的日期
-                        scope.$watch(
-                            function() {
-                                return scope[ctrlAs]['$$date_select'];
-                            },
-                            function(newValue, oldValue) {
-                                if (newValue) {
-                                    //console.log("saDategroup--->selectdate：" + newValue);
-                                    // 调用内置filter，转换日期到yyyy-MM-dd格式
-                                    var text = $filter('date')(newValue, 'yyyy-MM-dd');
-                                    var i;
-                                    var isexist = false; // 日期是否已经选择标识
-                                    for (i = 0; i < scope[ctrlAs]["$$data"].length; i++) {
-                                        if (scope[ctrlAs]["$$data"][i].datestr == text) {
-                                            isexist = true;
-                                            break;
-                                        }
-                                    }
-                                    if (!isexist) {
-                                        scope[ctrlAs]["$$data"].push(
-                                            {
-                                                datestr: text,
-                                                ischecked: true
-                                            }
-                                        );
-                                    }
-
-                                }
-
-                            }
-                        );
-
-                        /**
-                         * 日期点击事件处理函数。
-                         * @param $index 索引
-                         */
-                        scope[ctrlAs].$$internal_datestr_click = function($index) {
-                            scope[ctrlAs].$$data.splice($index, 1);
-                        };
-
-                        // 测试使用watch监控$$data的变化
-                        scope.$watch(
-                            function() {
-                                return scope[ctrlAs]['$$data'];
-                            },
-                            function(newValue, oldValue) {
-                                // 根据$$data生成对应的数据
-                                var special_days_arr = [];
-                                var i;
-                                for (i = 0; i < scope[ctrlAs]["$$data"].length; i++) {
-                                    special_days_arr.push(scope[ctrlAs]["$$data"][i].datestr);
-                                }
-
-                                scope[ctrlAs].$$internalmodel = special_days_arr.join(",");
-                                console.log("bbbbbbbb--->" + scope[ctrlAs].$$internalmodel);
-
-                                // 更新model
-                                if ($dcname_attr) {
-                                    eval("scope[ctrlAs].model" + "." + $dcname_attr + " = special_days_arr.join(',');");
-                                }
-                            },
-                            true
-                        );
-
-                        // 监控dcvalue model值变换
-                        attr.$observe("dcvalue", function(value) {
-                            console.log("saDategroup 监控dc1 model值变换：" + value);
-                            if (value) {
-                                // 根据value值，修改$$data里的值
-                                var date_array = value.split(",");
-                                var i;
-                                scope[ctrlAs]["$$data"] = [];
-                                for (i = 0; i < date_array.length; i++) {
-                                    scope[ctrlAs]["$$data"].push(
-                                        {
-                                            datestr: date_array[i],
-                                            ischecked: true
-                                        }
-                                    );
-                                }
-
-
-
-
-
-
-
-
-
-                            }
-                        });
-
-                    }
-
-                };
-            }
-        }
-    }
-]);
-
-
-/**
- * saFbgsgroup指令
- * 属性如下：
- * name（必须）：控件的名字
- * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
- * fbgsvalue（必须）：绑定的model翻班格式值，如：fbgsvalue={{ctrl.employeeInfoForSave.fbgs}}
- * fbgsname（必须）：绑定的model翻班格式字段名，如：fbgsname=fbgs
- *
- * required（可选）：是否要用required验证
- *
- */
-angular.module('ScheduleApp').directive(
-    'saFbgsgroup',
-    [
-        function() {
-            return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/fbgsGroup/saFbgsgroupTemplate.html',
-                scope: {
-                    model: "=" // 独立作用域，关联外部的模型object
-                },
-                controllerAs: '$saFbgsgroupCtrl',
-                bindToController: true,
-                controller: function() {
-                    var self = this;
-
-                    self.$$dataSelected = []; // 选中的路牌列表
-
-                    // saFbgsgroup组件的ng-model，用于外部绑定等操作
-                    self.$$internalmodel = undefined;
-                },
-
-                /**
-                 * 此阶段可以改dom结构，此时angular还没扫描指令，
-                 * 这里就可以动态添加其他angularjs的指令字符串，如required指令字符串。
-                 * @param tElem
-                 * @param tAttrs
-                 * @returns {{pre: Function, post: Function}}
-                 */
-                compile: function(tElem, tAttrs) {
-                    // 获取所有属性
-                    var $name_attr = tAttrs["name"]; // 控件的名字
-                    var $required_attr = tAttrs["required"]; // 是否需要required验证
-                    var $fbgsname_attr = tAttrs["fbgsname"]; // 绑定的model翻班格式字段名
-
-                    // controlAs名字
-                    var ctrlAs = '$saFbgsgroupCtrl';
-
-                    // 如果有required属性，添加angularjs required验证
-                    if ($required_attr != undefined) {
-                        //console.log(tElem.html());
-                        tElem.find("div").attr("required", "");
-                    }
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-
-                        /**
-                         * 相当于link函数。
-                         * @param scope
-                         * @param element
-                         * @param attr
-                         */
-                        post: function(scope, element, attr) {
-                            // name属性
-                            if ($name_attr) {
-                                scope[ctrlAs]["$name_attr"] = $name_attr;
-                            }
-
-                            /**
-                             * 路牌列表点击（路牌列表中选中路牌）
-                             * @param fbcode
-                             */
-                            scope[ctrlAs].$$internal_fb_click = function(fbcode) {
-                                scope[ctrlAs].$$dataSelected.push(fbcode);
-                            };
-
-                            /**
-                             * 选中的路牌双击（删除选中的路牌）
-                             * @param $index
-                             */
-                            scope[ctrlAs].$$internal_sellplist_dbclick = function($index) {
-                                scope[ctrlAs].$$dataSelected.splice($index, 1);
-                            };
-
-                            /**
-                             * 验证内部数据，更新外部model
-                             */
-                            scope[ctrlAs].$$internal_validate_model = function() {
-                                var data_temp = scope[ctrlAs].$$dataSelected;
-
-                                if (data_temp &&
-                                    data_temp.length > 0) {
-
-                                    // 更新内部model，用于外部验证
-                                    // 内部model的值暂时随意，以后再改
-                                    scope[ctrlAs].$$internalmodel = {desc: "ok"};
-
-                                    // 更新外部model字段
-                                    if ($fbgsname_attr) {
-                                        console.log("$fbgsname=" + data_temp.join(','));
-                                        eval("scope[ctrlAs].model" + "." + $fbgsname_attr + " = data_temp.join(',');");
-                                    }
-
-                                } else {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                }
-                            };
-
-                            // 监控内部数据，$$data_selected 变化
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].$$dataSelected;
-                                },
-                                function(newValue, oldValue) {
-                                    scope[ctrlAs].$$internal_validate_model();
-                                },
-                                true
-                            );
-
-                            // 监控路牌名称范围值的变化，处理初始化赋值
-                            attr.$observe("fbgsvalue", function(value) {
-                                var data_temp = scope[ctrlAs].$$dataSelected;
-
-                                if (value && value != "" && data_temp && data_temp.length == 0) { // 初始创建
-                                    var data_temp = scope[ctrlAs].$$dataSelected;
-                                    var fbgses = [];
-                                    var i = 0;
-
-                                    // 分隔翻班格式
-                                    if (value.indexOf(",") >= 0) { // 以逗号分隔，如 1,1,0,1
-                                        fbgses = value.split(",");
-                                    } else {
-                                        for (i = 0; i < value.length; i++) { // 字符串形式，如 1101
-                                            fbgses.push(value.substr(i, 1));
-                                        }
-                                    }
-
-                                    for (i = 0; i < fbgses.length; i++) {
-                                        if (fbgses[i] == "1" || fbgses[i] == "0") {
-                                            data_temp.push(fbgses[i]);
-                                        }
-                                    }
-                                }
-                            });
-                        }
-                    };
-                }
-            }
-        }
-    ]);
-
-
-/**
- * saGuideboardgroup指令
- * 属性如下：
- * name（必须）：控件的名字
- * model（必须）：指定一个外部object，独立作用域，如：model=ctrl.employeeInfoForSave
- * xlidvalue（必须）：绑定的model线路id值，如：xlidvalue={{ctrl.employeeInfoForSave.xl.id}}
- * lprangevalue（必须）：绑定的model路牌名字范围值，如：lprangevalue={{ctrl.employeeInfoForSave.lprange}}
- * lprangename（必须）：绑定的model路牌名字范围字段名，如：lprangename=lprange
- * lpidrangevalue（必须）：绑定的model路牌id范围值，如：lprangevalue={{ctrl.employeeInfoForSave.lprange}}
- * lpidrangename（必须）：绑定的model路牌id范围字段名，如：lprangename=lprange
- * lpstartvalue（必须）：绑定的model起始路牌值，如：lpstartvalue={{ctrl.employeeInfoForSave.lpstart}}
- * lpstartname（必须）：绑定的model起始路牌字段名，如：lpstartname=lpstart
- *
- * required（可选）：是否要用required验证
- *
- */
-angular.module('ScheduleApp').directive('saGuideboardgroup', [
-    'GuideboardManageService_g',
-    function(guideboardManageService_g) {
-        return {
-            restrict: 'E',
-            templateUrl: '/pages/scheduleApp/module/common/dts2/guideboardGroup/saGuideboardgroupTemplate.html',
-            scope: {
-                model: "=" // 独立作用域，关联外部的模型object
-            },
-            controllerAs: '$saGuideboardgroupCtrl',
-            bindToController: true,
-            controller: function($scope) {
-                var self = this;
-                self.$$dataReal = []; // 选择线路后，该线路的路牌数据
-                self.$$data = []; // 页面最多显示10条，可以通过$$searchText筛选
-
-                // 测试数据
-                //self.$$data = [
-                //    {lpid: 1, lpname: '路1', isstart: false},
-                //    {lpid: 2, lpname: '路2', isstart: true},
-                //    {lpid: 3, lpname: '路3', isstart: false}
+                //    {lpid: 1, lpname: '路1', isstart: false},
+                //    {lpid: 2, lpname: '路2', isstart: true},
+                //    {lpid: 3, lpname: '路3', isstart: false}
                 //];
                 self.$$searchText = undefined; // 搜索值
@@ -4434,441 +4451,441 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     ]
 );
+/**
+ * saTimetablePreview指令，时刻表预览模式视图。
+ */
+angular.module("ScheduleApp").directive(
+    "saTimetable2",
+    [
+        '$timeout',
+        function($timeout) {
+            return {
+                restrict : 'E',
+                templateUrl : '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreViewTemplate.html',
+                scope : { // 独立作用域
+                    // 使用外部数据源，内部重新组合显示
+                    ds : "=ngModel"
+                },
+                controllerAs : "$saTimeTablePreviewCtrl",
+                bindToController: true,
+                controller : function() {
+                    var self = this;
+
+                    // 内部班次时刻模型
+                    self.internalBcModel = {
+                        up_qdz_name : "", // 上行起点站名字
+                        down_qdz_name : "", // 下行起点站名字
+                        up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                        down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                    };
+
+                    // 内部各个路牌block车次链模型
+                    self.internalLpBlockModel = {
+                        // key：路牌名字
+                        // value: 数组（按照发车时间排序）
+                        // value 数据内对象 {fcsj:发车时间,isUp:是否上行,fcno:发车顺序号,index:对应的班次列表索引}
+                    };
+
+                    // TODO：
+                },
+
+                /**，
+                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile : function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw new Error("saTimeTablePreview指令 name属性required");
+                    }
+
+                    // 内部controlAs名字
+                    var ctrlAs = "$saTimeTablePreviewCtrl";
+
+                    // TODO：
+
+                    //------------------ 内部方法 --------------------//
+                    var date_wrap_prefix = "2000-01-01 "; // 包装日期的前缀
+                    var date_wrap_format = "YYYY-MM-DD HH:mm"; // 日期格式
+                    /**
+                     * 将时间包装成日期，方便计算。
+                     * @param timeStr 时间格式，如 06:30
+                     * @returns moment对象
+                     */
+                    var _fun_WrapTime = function(timeStr) {
+                        return moment(
+                            date_wrap_prefix + timeStr,
+                            date_wrap_format
+                        );
+                    };
+
+                    /**
+                     * 点击班次html元素（dl），触发班次移动，如下：
+                     * 1、点击上行班次，下一个下行班次在下行班次列表中移到中间位置
+                     * 2、点击下行班次，下一个上行班次在上行班次列表中移到中间位置
+                     * @param ctrl 内部控制器
+                     * @param index 班次索引
+                     * @param isUp 是否上行
+                     * @private
+                     */
+                    var _fun_bcDDViewMove = function(ctrl, index, isUp) {
+                        // 获取当前点击班次对象
+                        var oBc;
+                        if (isUp) {
+                            oBc = ctrl.internalBcModel.up_bc_list_asc[index];
+                        } else {
+                            oBc = ctrl.internalBcModel.down_bc_list_asc[index];
+                        }
+
+                        // 找出车次链中的下一个班次索引，没有就undefined
+                        var nextIndex = undefined;
+                        var nextBlockBc = undefined;
+                        var currentBlockBcIndex = undefined;
+                        angular.forEach(ctrl.internalLpBlockModel[oBc.lpName], function(data, i) {
+                            if (data.fcsj == oBc.fcsj) {
+                                currentBlockBcIndex = i;
+                            }
+                        });
+                        if (currentBlockBcIndex != undefined &&
+                            currentBlockBcIndex < (ctrl.internalLpBlockModel[oBc.lpName].length - 1)) {
+                            nextBlockBc = ctrl.internalLpBlockModel[oBc.lpName][currentBlockBcIndex + 1];
+                            nextIndex = nextBlockBc.index;
+                        }
+                        // 先删除click标记，再添加
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        oBc.isClick = true;
+                        if (nextIndex) {
+                            if (nextBlockBc.isUp) {
+                                ctrl.internalBcModel.up_bc_list_asc[nextIndex].isClick = true;
+                            } else {
+                                ctrl.internalBcModel.down_bc_list_asc[nextIndex].isClick = true;
+                            }
+                        }
+
+                        // 移动，同方向不移动
+                        var clientHeight = angular.element("#temp").height() - 34;
+                        if (nextBlockBc && isUp != nextBlockBc.isUp) {
+                            if (isUp) { // 移动下行
+                                angular.element(".ttpv_table_scrollbar:eq(1)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            } else { // 移动上行
+                                angular.element(".ttpv_table_scrollbar:eq(0)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            }
+                        }
+
+                    };
+
+                    /**
+                     * 刷新内部数据。
+                     * @param ctrl 内部控制器对象（$saTimeTablePreviewCtrl）
+                     * @private
+                     */
+                    var _fun_refreshInternalModel = function(ctrl) {
+                        // 初始化内部数据
+                        ctrl.internalBcModel = {
+                            up_qdz_name : "", // 上行起点站名字
+                            up_zdz_name : "", // 上行终点站名字
+                            down_qdz_name : "", // 下行起点站名字
+                            down_zdz_name : "", // 下行终点站名字
+                            up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                            down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                        };
+                        ctrl.internalLpBlockModel = {
+
+                        };
+
+                        // ngModel传入的数据
+                        var dataSource = ctrl.ds.bcList;
+
+                        // 构造上下行班次列表，并确定上下行的首发站点
+                        angular.forEach(dataSource, function(bcObj) {
+                            var _internalBcObj = {};
+                            // 构造内部班次对象
+                            _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
+                            _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
+                            _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
+                            _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
+                            _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
+                            _internalBcObj.bcType = bcObj.bcType; // 班次类型
+                            _internalBcObj.isTs = bcObj.isTS; // 是否停驶
+                            _internalBcObj.isFb = bcObj.isFB; // 是否分班
+                            _internalBcObj.remark = bcObj.remark; // 备注
+                            _internalBcObj._fcno = bcObj.fcno; // 发车顺序号
+
+                            if (bcObj.xlDir == "0") { // 上行
+                                ctrl.internalBcModel.up_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.up_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.up_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
+                            if (bcObj.xlDir == "1") { // 下行
+                                ctrl.internalBcModel.down_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.down_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.down_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
+
+                        });
+
+                        // 发车时间升序排序上行班次
+                        ctrl.internalBcModel.up_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
+
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+
+                        });
+                        // 发车时间升序排序下行班次
+                        ctrl.internalBcModel.down_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
+
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+                        });
+
+                        // 构造路牌block车次链，按照发车顺序排序
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : true,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : false,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalLpBlockModel, function(value, key) {
+                            value.sort(function (a, b) {
+                                if (a.fcno < b.fcno) {
+                                    return -1;
+                                } else if (a.fcno > b.fcno) {
+                                    return 1;
+                                } else {
+                                    return 0;
+                                }
+                            });
+                        });
+
+
+                    };
+
+                    return {
+                        pre : function(scope, element, attr) {
+                            // TODO：
+                        },
+                        post : function(scope, element, attr) {
+                            // 班次html点击事件
+                            scope[ctrlAs].$$bcDD_Click = function(index, xlDir) {
+                                _fun_bcDDViewMove(scope[ctrlAs], index, xlDir);
+                            };
+
+                            // 监控ngModel绑定的外部数据源的刷新状态变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds.refreshInfos;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue === undefined && oldValue === undefined) {
+                                        return;
+                                    }
+                                    console.log("saTimetable2 refresh");
+                                    _fun_refreshInternalModel(scope[ctrlAs]);
+                                },
+                                true
+                            );
+                        }
+                    };
+                }
+            };
+        }
+    ]
+);
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly1',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(".tt_table_head").css("top", element.scrollTop());
+                                angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
+                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly2',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(attr.scrclass).css("top", element.scrollTop());
+                                // angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
+                                // angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
 /**
- * saTimetablePreview指令，时刻表预览模式视图。
+ * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
+ * 属性如下：
+ * name（必须）：控件的名字
+ * columns（必须，独立作用域）：字段名字列表，格式：[{name:[字段名],desc:[字段描述]}...]
+ * ordercolumns（必须，独立作用域）：字段排序列表，格式：{order: '字段1,字段2',direction: 'ASC,DESC'}
  */
-angular.module("ScheduleApp").directive(
-    "saTimetable2",
+angular.module('ScheduleApp').directive(
+    'saOrderoption',
     [
-        '$timeout',
-        function($timeout) {
+        function() {
             return {
-                restrict : 'E',
-                templateUrl : '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreViewTemplate.html',
-                scope : { // 独立作用域
-                    // 使用外部数据源，内部重新组合显示
-                    ds : "=ngModel"
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html',
+                scope: {
+                    columns: '=',
+                    ordercolumns: '='
                 },
-                controllerAs : "$saTimeTablePreviewCtrl",
+                controllerAs: '$saOrderOptionCtrl',
                 bindToController: true,
-                controller : function() {
-                    var self = this;
-
-                    // 内部班次时刻模型
-                    self.internalBcModel = {
-                        up_qdz_name : "", // 上行起点站名字
-                        down_qdz_name : "", // 下行起点站名字
-                        up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
-                        down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
-                    };
-
-                    // 内部各个路牌block车次链模型
-                    self.internalLpBlockModel = {
-                        // key：路牌名字
-                        // value: 数组（按照发车时间排序）
-                        // value 数据内对象 {fcsj:发车时间,isUp:是否上行,fcno:发车顺序号,index:对应的班次列表索引}
-                    };
-
-                    // TODO：
-                },
-
-                /**，
-                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
-                 * @param tElem
-                 * @param tAttrs
-                 * @returns {{pre: Function, post: Function}}
-                 */
-                compile : function(tElem, tAttrs) {
-                    // 获取属性
-                    var $attr_name = tAttrs["name"]; // 控件的名字
-                    if (!$attr_name) {
-                        throw new Error("saTimeTablePreview指令 name属性required");
-                    }
-
-                    // 内部controlAs名字
-                    var ctrlAs = "$saTimeTablePreviewCtrl";
-
-                    // TODO：
-
-                    //------------------ 内部方法 --------------------//
-                    var date_wrap_prefix = "2000-01-01 "; // 包装日期的前缀
-                    var date_wrap_format = "YYYY-MM-DD HH:mm"; // 日期格式
-                    /**
-                     * 将时间包装成日期，方便计算。
-                     * @param timeStr 时间格式，如 06:30
-                     * @returns moment对象
-                     */
-                    var _fun_WrapTime = function(timeStr) {
-                        return moment(
-                            date_wrap_prefix + timeStr,
-                            date_wrap_format
-                        );
-                    };
-
-                    /**
-                     * 点击班次html元素（dl），触发班次移动，如下：
-                     * 1、点击上行班次，下一个下行班次在下行班次列表中移到中间位置
-                     * 2、点击下行班次，下一个上行班次在上行班次列表中移到中间位置
-                     * @param ctrl 内部控制器
-                     * @param index 班次索引
-                     * @param isUp 是否上行
-                     * @private
-                     */
-                    var _fun_bcDDViewMove = function(ctrl, index, isUp) {
-                        // 获取当前点击班次对象
-                        var oBc;
-                        if (isUp) {
-                            oBc = ctrl.internalBcModel.up_bc_list_asc[index];
-                        } else {
-                            oBc = ctrl.internalBcModel.down_bc_list_asc[index];
-                        }
-
-                        // 找出车次链中的下一个班次索引，没有就undefined
-                        var nextIndex = undefined;
-                        var nextBlockBc = undefined;
-                        var currentBlockBcIndex = undefined;
-                        angular.forEach(ctrl.internalLpBlockModel[oBc.lpName], function(data, i) {
-                            if (data.fcsj == oBc.fcsj) {
-                                currentBlockBcIndex = i;
-                            }
-                        });
-                        if (currentBlockBcIndex != undefined &&
-                            currentBlockBcIndex < (ctrl.internalLpBlockModel[oBc.lpName].length - 1)) {
-                            nextBlockBc = ctrl.internalLpBlockModel[oBc.lpName][currentBlockBcIndex + 1];
-                            nextIndex = nextBlockBc.index;
-                        }
-                        // 先删除click标记，再添加
-                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data) {
-                            delete data["isClick"];
-                        });
-                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data) {
-                            delete data["isClick"];
-                        });
-                        oBc.isClick = true;
-                        if (nextIndex) {
-                            if (nextBlockBc.isUp) {
-                                ctrl.internalBcModel.up_bc_list_asc[nextIndex].isClick = true;
-                            } else {
-                                ctrl.internalBcModel.down_bc_list_asc[nextIndex].isClick = true;
-                            }
-                        }
-
-                        // 移动，同方向不移动
-                        var clientHeight = angular.element("#temp").height() - 34;
-                        if (nextBlockBc && isUp != nextBlockBc.isUp) {
-                            if (isUp) { // 移动下行
-                                angular.element(".ttpv_table_scrollbar:eq(1)").animate(
-                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
-                            } else { // 移动上行
-                                angular.element(".ttpv_table_scrollbar:eq(0)").animate(
-                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
-                            }
-                        }
-
-                    };
-
-                    /**
-                     * 刷新内部数据。
-                     * @param ctrl 内部控制器对象（$saTimeTablePreviewCtrl）
-                     * @private
-                     */
-                    var _fun_refreshInternalModel = function(ctrl) {
-                        // 初始化内部数据
-                        ctrl.internalBcModel = {
-                            up_qdz_name : "", // 上行起点站名字
-                            up_zdz_name : "", // 上行终点站名字
-                            down_qdz_name : "", // 下行起点站名字
-                            down_zdz_name : "", // 下行终点站名字
-                            up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
-                            down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
-                        };
-                        ctrl.internalLpBlockModel = {
-
-                        };
-
-                        // ngModel传入的数据
-                        var dataSource = ctrl.ds.bcList;
-
-                        // 构造上下行班次列表，并确定上下行的首发站点
-                        angular.forEach(dataSource, function(bcObj) {
-                            var _internalBcObj = {};
-                            // 构造内部班次对象
-                            _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
-                            _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
-                            _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
-                            _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
-                            _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
-                            _internalBcObj.bcType = bcObj.bcType; // 班次类型
-                            _internalBcObj.isTs = bcObj.isTS; // 是否停驶
-                            _internalBcObj.isFb = bcObj.isFB; // 是否分班
-                            _internalBcObj.remark = bcObj.remark; // 备注
-                            _internalBcObj._fcno = bcObj.fcno; // 发车顺序号
-
-                            if (bcObj.xlDir == "0") { // 上行
-                                ctrl.internalBcModel.up_bc_list_asc.push(_internalBcObj);
-                                // 确定起点站
-                                if (ctrl.internalBcModel.up_qdz_name == "") {
-                                    if (bcObj.bcType == "normal") {
-                                        ctrl.internalBcModel.up_qdz_name = bcObj.qdzName;
-                                    }
-                                }
-                                // 确定终点站
-                                if (ctrl.internalBcModel.up_zdz_name == "") {
-                                    if (bcObj.bcType == "normal") {
-                                        ctrl.internalBcModel.up_zdz_name = bcObj.zdzName;
-                                    }
-                                }
-                            }
-                            if (bcObj.xlDir == "1") { // 下行
-                                ctrl.internalBcModel.down_bc_list_asc.push(_internalBcObj);
-                                // 确定起点站
-                                if (ctrl.internalBcModel.down_qdz_name == "") {
-                                    if (bcObj.bcType == "normal") {
-                                        ctrl.internalBcModel.down_qdz_name = bcObj.qdzName;
-                                    }
-                                }
-                                // 确定终点站
-                                if (ctrl.internalBcModel.down_zdz_name == "") {
-                                    if (bcObj.bcType == "normal") {
-                                        ctrl.internalBcModel.down_zdz_name = bcObj.zdzName;
-                                    }
-                                }
-                            }
-
-                        });
-
-                        // 发车时间升序排序上行班次
-                        ctrl.internalBcModel.up_bc_list_asc.sort(function(a, b) {
-                            var a_wrapTime = _fun_WrapTime(a.fcsj);
-                            var b_wrapTime = _fun_WrapTime(b.fcsj);
-
-                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
-                            // TODO：以后要配合首班车的发车时间判定
-                            if (a.fcsj.indexOf("00:") == 0 ||
-                                a.fcsj.indexOf("01:") == 0 ||
-                                a.fcsj.indexOf("02:") == 0) {
-                                a_wrapTime.add(1, "day");
-                            }
-                            if (b.fcsj.indexOf("00:") == 0 ||
-                                b.fcsj.indexOf("01:") == 0 ||
-                                b.fcsj.indexOf("02:") == 0) {
-                                b_wrapTime.add(1, "day");
-                            }
-
-                            if (a_wrapTime.isBefore(b_wrapTime)) {
-                                return -1;
-                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
-                                return 1;
-                            } else {
-                                return 0;
-                            }
-
-                        });
-                        // 发车时间升序排序下行班次
-                        ctrl.internalBcModel.down_bc_list_asc.sort(function(a, b) {
-                            var a_wrapTime = _fun_WrapTime(a.fcsj);
-                            var b_wrapTime = _fun_WrapTime(b.fcsj);
-
-                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
-                            // TODO：以后要配合首班车的发车时间判定
-                            if (a.fcsj.indexOf("00:") == 0 ||
-                                a.fcsj.indexOf("01:") == 0 ||
-                                a.fcsj.indexOf("02:") == 0) {
-                                a_wrapTime.add(1, "day");
-                            }
-                            if (b.fcsj.indexOf("00:") == 0 ||
-                                b.fcsj.indexOf("01:") == 0 ||
-                                b.fcsj.indexOf("02:") == 0) {
-                                b_wrapTime.add(1, "day");
-                            }
-
-                            if (a_wrapTime.isBefore(b_wrapTime)) {
-                                return -1;
-                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
-                                return 1;
-                            } else {
-                                return 0;
-                            }
-                        });
-
-                        // 构造路牌block车次链，按照发车顺序排序
-                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data, index) {
-                            if (!ctrl.internalLpBlockModel[data.lpName]) {
-                                ctrl.internalLpBlockModel[data.lpName] = [];
-                            }
-                            ctrl.internalLpBlockModel[data.lpName].push({
-                                fcsj : data.fcsj,
-                                isUp : true,
-                                fcno : data._fcno,
-                                index : index
-                            });
-                        });
-                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data, index) {
-                            if (!ctrl.internalLpBlockModel[data.lpName]) {
-                                ctrl.internalLpBlockModel[data.lpName] = [];
-                            }
-                            ctrl.internalLpBlockModel[data.lpName].push({
-                                fcsj : data.fcsj,
-                                isUp : false,
-                                fcno : data._fcno,
-                                index : index
-                            });
-                        });
-                        angular.forEach(ctrl.internalLpBlockModel, function(value, key) {
-                            value.sort(function (a, b) {
-                                if (a.fcno < b.fcno) {
-                                    return -1;
-                                } else if (a.fcno > b.fcno) {
-                                    return 1;
-                                } else {
-                                    return 0;
-                                }
-                            });
-                        });
-
-
-                    };
-
-                    return {
-                        pre : function(scope, element, attr) {
-                            // TODO：
-                        },
-                        post : function(scope, element, attr) {
-                            // 班次html点击事件
-                            scope[ctrlAs].$$bcDD_Click = function(index, xlDir) {
-                                _fun_bcDDViewMove(scope[ctrlAs], index, xlDir);
-                            };
-
-                            // 监控ngModel绑定的外部数据源的刷新状态变化
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].ds.refreshInfos;
-                                },
-                                function(newValue, oldValue) {
-                                    if (newValue === undefined && oldValue === undefined) {
-                                        return;
-                                    }
-                                    console.log("saTimetable2 refresh");
-                                    _fun_refreshInternalModel(scope[ctrlAs]);
-                                },
-                                true
-                            );
-                        }
-                    };
-                }
-            };
-        }
-    ]
-);
-/**
- * 滚动事件控制指令。
- */
-angular.module('ScheduleApp').directive(
-    'saTscrolly1',
-    [
-        function() {
-            return {
-                restrict: 'A',
-
-                compile: function(tElem, tAttrs) {
-
-                    return {
-                        pre: function(scope, element, attr) {
-                            // TODO：
-                            //alert(element.find("#tooltipTest").html());
-                            //$compile(element.find("#tooltipTest"))(scope);
-
-                        },
-
-                        post: function(scope, element, attr) {
-                            //var head = element[0];
-
-                            //console.log("llllllllload");
-                            //console.log(element.name);
-
-                            element.bind('scroll', function() {
-                                //console.log("top=", angular.element(".tt_table_head").css("top"));
-                                //console.log("left=", angular.element(".tt_table_head").css("left"));
-                                //console.log("s top=" + element.scrollTop());
-
-                                angular.element(".tt_table_head").css("top", element.scrollTop());
-                                angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
-                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
-
-                            });
-                        }
-
-                    };
-                }
-            }
-        }
-    ]
-);
-/**
- * 滚动事件控制指令。
- */
-angular.module('ScheduleApp').directive(
-    'saTscrolly2',
-    [
-        function() {
-            return {
-                restrict: 'A',
-
-                compile: function(tElem, tAttrs) {
-
-                    return {
-                        pre: function(scope, element, attr) {
-                            // TODO：
-                            //alert(element.find("#tooltipTest").html());
-                            //$compile(element.find("#tooltipTest"))(scope);
-
-                        },
-
-                        post: function(scope, element, attr) {
-                            //var head = element[0];
-
-                            //console.log("llllllllload");
-                            //console.log(element.name);
-
-                            element.bind('scroll', function() {
-                                //console.log("top=", angular.element(".tt_table_head").css("top"));
-                                //console.log("left=", angular.element(".tt_table_head").css("left"));
-                                //console.log("s top=" + element.scrollTop());
-
-                                angular.element(attr.scrclass).css("top", element.scrollTop());
-                                // angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
-                                // angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
-
-                            });
-                        }
-
-                    };
-                }
-            }
-        }
-    ]
-);
-/**
- * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
- * 属性如下：
- * name（必须）：控件的名字
- * columns（必须，独立作用域）：字段名字列表，格式：[{name:[字段名],desc:[字段描述]}...]
- * ordercolumns（必须，独立作用域）：字段排序列表，格式：{order: '字段1,字段2',direction: 'ASC,DESC'}
- */
-angular.module('ScheduleApp').directive(
-    'saOrderoption',
-    [
-        function() {
-            return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html',
-                scope: {
-                    columns: '=',
-                    ordercolumns: '='
-                },
-                controllerAs: '$saOrderOptionCtrl',
-                bindToController: true,
-                controller: function() {
+                controller: function() {
                     var self = this;
                     // 字段列表是否预载入
@@ -5448,1163 +5465,1163 @@ angular.module(&#39;ScheduleApp&#39;).directive(
         }
     ]
 );
-/**
- * saPlaninfoedit指令，排班明细编辑控件，用在调度执勤日报的修改功能
- * name（必须），控件的名字
- * ds，外部数据源
- * cl1，车辆1属性
- * cl2，车辆2属性
- * j1，驾驶员1属性
- * j2，驾驶员2属性
- * s1，售票员1属性
- * s2，售票员2属性
- */
-angular.module('ScheduleApp').directive(
-    'saPlaninfoedit',
-    [
-        function() {
-            return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html',
-                scope: { // 独立作用域
-                    ds: '=ngModel'
-                },
-                controllerAs: '$saPlanInfoEditCtrl',
-                bindToController: true,
-                controller: function() {
-                    //var self = this;
-
-                },
-
-                compile: function(tElem, tAttrs) {
-                    // 获取属性
-                    var $attr_name = tAttrs["name"]; // 控件的名字
-                    if (!$attr_name) {
-                        throw {msg: "saPlaninfoedit指令name属性不能为空"};
-                    }
-
-                    // 内部controlAs名字
-                    var ctrlAs = '$saPlanInfoEditCtrl';
-
-
-                    // 内部变量，原始车辆，人员数据
-                    var old_cl = {}; // key:{车辆id_车辆自编号}，value:所在list下标数组
-                    var old_j = {}; // key:{驾驶员id_姓名_工号}, value:所在list下标数组
-                    var old_s = {}; // key:{售票员id_姓名_工号}, value:所在list下标数组
-                    var old_isfb = false; // 是否有分班
-                    var old_isfb_index = 0; // 分班开始索引
-                    var old_hasJCBC = false; // 是否有进场班次
-                    var old_max_fcno = 0; // 最大发车顺序号
-                    var old_firstJCBCFcno = 0; // 第一个进场班次发车顺序号
-                    var old_half_bcs = 0; // 一般的班次数量
-
-                    // 内部变量，变更的车辆，变更的人员
-                    var new_cl1 = undefined; // 新的车辆1（车辆id_车辆自编号）
-                    var new_cl2 = undefined; // 新的车辆2（车辆id_车辆自编号）
-                    var new_j1 = undefined; // 新的驾驶员1（驾驶员id_姓名_工号）
-                    var new_j2 = undefined; // 新的驾驶员2（驾驶员id_姓名_工号）
-                    var new_s1 = undefined; // 新的售票员1（售票员id_姓名_工号）
-                    var new_s2 = undefined; // 新的售票员2（售票员id_姓名_工号）
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-                        post: function(scope, element, attr) {
-
-                            /**
-                             * 刷新车辆数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_cl = function() {
-                                if (new_cl1) {
-                                    var new_cl1_id = new_cl1.split("_")[0];
-                                    var new_cl1_zbh = new_cl1.split("_")[1];
-
-                                    if (new_cl2) {
-                                        var new_cl2_id = new_cl2.split("_")[0];
-                                        var new_cl2_zbh = new_cl2.split("_")[1];
-
-                                        if (old_isfb) { // 使用分班判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_isfb_index) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-
-                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                                if (obj.fcno <= old_firstJCBCFcno) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-                                        } else { // 使用一半一半班次判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_half_bcs) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-                                        }
-
-                                    } else {
-                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                            obj.cl = new_cl1_id;
-                                            obj.clZbh = new_cl1_zbh;
-                                        });
-                                    }
-
-                                } else {
-                                    // 使用旧的
-                                    angular.forEach(old_cl, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            scope[ctrlAs].ds[i].cl = key.split("_")[0];
-                                            scope[ctrlAs].ds[i].clZbh = key.split("_")[1];
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新驾驶员数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_j = function() {
-                                if (new_j1) {
-                                    var new_j1_id = new_j1.split("_")[0];
-                                    var new_j1_name = new_j1.split("_")[1];
-                                    var new_j1_gh = new_j1.split("_")[2];
-                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
-                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
-                                    }
-
-                                    if (new_j2) {
-                                        var new_j2_id = new_j2.split("_")[0];
-                                        var new_j2_name = new_j2.split("_")[1];
-                                        var new_j2_gh = new_j2.split("_")[2];
-                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
-                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
-                                        }
-
-                                        if (old_isfb) { // 使用分班判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_isfb_index) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-
-                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                                if (obj.fcno <= old_firstJCBCFcno) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-                                        } else { // 使用一半一半班次判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_half_bcs) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-                                        }
-
-                                    } else {
-                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                            obj.j = new_j1_id;
-                                            obj.jGh = new_j1_gh;
-                                            obj.jName = new_j1_name;
-                                        });
-                                    }
-
-                                } else {
-                                    // 使用旧的
-                                    angular.forEach(old_j, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            scope[ctrlAs].ds[i].j = key.split("_")[0];
-                                            scope[ctrlAs].ds[i].jName = key.split("_")[1];
-                                            scope[ctrlAs].ds[i].jGh = key.split("_")[2];
-                                        });
-                                    });
-                                }
-                            };
-                            /**
-                             * 刷新售票员数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_s = function() {
-                                if (new_s1) {
-                                    var new_s1_id = new_s1.split("_")[0];
-                                    var new_s1_name = new_s1.split("_")[1];
-                                    var new_s1_gh = new_s1.split("_")[2];
-                                    if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
-                                        new_s1_gh = new_s1_gh.substr(3);
-                                    }
-
-                                    if (new_s2) {
-                                        var new_s2_id = new_s2.split("_")[0];
-                                        var new_s2_name = new_s2.split("_")[1];
-                                        var new_s2_gh = new_s2.split("_")[2];
-                                        if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
-                                            new_s2_gh = new_s2_gh.substr(3);
-                                        }
-
-                                        if (old_isfb) { // 使用分班判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_isfb_index) {
-                                                    obj.s = new_s1_id;
-
-                                                    obj.sGh = new_s1_gh;
-                                                    obj.sName = new_s1_name;
-                                                } else {
-                                                    obj.s = new_s2_id;
-                                                    obj.sGh = new_s2_gh;
-                                                    obj.sName = new_s2_name;
-                                                }
-                                            });
-
-                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                                if (obj.fcno <= old_firstJCBCFcno) {
-                                                    obj.s = new_s1_id;
-                                                    obj.sGh = new_s1_gh;
-                                                    obj.sName = new_s1_name;
-                                                } else {
-                                                    obj.s = new_s2_id;
-                                                    obj.sGh = new_s2_gh;
-                                                    obj.sName = new_s2_name;
-                                                }
-                                            });
-                                        } else { // 使用一半一半班次判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_half_bcs) {
-                                                    obj.s = new_s1_id;
-                                                    obj.sGh = new_s1_gh;
-                                                    obj.sName = new_s1_name;
-                                                } else {
-                                                    obj.s = new_s2_id;
-                                                    obj.sGh = new_s2_gh;
-                                                    obj.sName = new_s2_name;
-                                                }
-                                            });
-                                        }
-
-                                    } else {
-                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                            obj.s = new_s1_id;
-                                            obj.sGh = new_s1_gh;
-                                            obj.sName = new_s1_name;
-                                        });
-                                    }
-
-                                } else {
-                                    // 先清空
-                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                        obj.s = undefined;
-                                        obj.sGh = undefined;
-                                        obj.sName = undefined;
-                                    });
-
-                                    // 使用旧的
-                                    angular.forEach(old_s, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            scope[ctrlAs].ds[i].s = key.split("_")[0];
-                                            scope[ctrlAs].ds[i].sName = key.split("_")[1];
-                                            scope[ctrlAs].ds[i].sGh = key.split("_")[2];
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新内部数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata = function() {
-                                // 更新车辆
-                                scope[ctrlAs].$$internal_refresh_dsdata_cl();
-
-                                // 更新驾驶员
-                                scope[ctrlAs].$$internal_refresh_dsdata_j();
-
-                                // 更新售票员
-                                scope[ctrlAs].$$internal_refresh_dsdata_s();
-                            };
-
-                            // -------------- 监控function ---------------//
-                            attr.$observe('cl1', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.zbh) {
-                                        new_cl1 = obj.id + "_" + obj.zbh;
-                                    } else {
-                                        new_cl1 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            attr.$observe('cl2', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.zbh) {
-                                        new_cl2 = obj.id + "_" + obj.zbh;
-                                    } else {
-                                        new_cl2 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            attr.$observe('j1', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.name && obj.jobCode) {
-                                        new_j1 = obj.id + "_" + obj.name + "_" + obj.jobCode;
-                                    } else {
-                                        new_j1 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            attr.$observe('j2', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.name && obj.jobCode) {
-                                        new_j2 = obj.id + "_" + obj.name + "_" + obj.jobCode;
-                                    } else {
-                                        new_j2 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            attr.$observe('s1', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.name && obj.jobCode) {
-                                        new_s1 = obj.id + "_" + obj.name + "_" + obj.jobCode;
-                                    } else {
-                                        new_s1 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            attr.$observe('s2', function(value) {
-                                if (value && value != "") {
-                                    var obj = JSON.parse(value);
-                                    if (obj.id && obj.name && obj.jobCode) {
-                                        new_s2 = obj.id + "_" + obj.name + "_" + obj.jobCode;
-                                    } else {
-                                        new_s2 = undefined;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata();
-                                }
-                            });
-
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].ds;
-                                },
-                                function(newValue, oldValue) {
-                                    if (newValue && newValue.length > 0) {
-
-                                        var j1 = newValue[0].j;
-
-                                        angular.forEach(newValue, function(obj, index) {
-                                            var k1 = obj.cl + "_" + obj.clZbh;
-                                            var k2 = !obj.j? undefined: obj.j + "_" + obj.jName + "_" + obj.jGh;
-                                            var k3 = !obj.s? undefined: obj.s + "_" + obj.sName + "_" + obj.sGh;
-
-                                            if (!old_cl[k1]) {
-                                                old_cl[k1] = [];
-                                            }
-                                            if (!old_j[k2] && k2) {
-                                                old_j[k2] = [];
-                                            }
-                                            if (!old_s[k3] && k3) {
-                                                old_s[k3] = [];
-                                            }
-
-                                            // 闭包
-                                            (function(i) {
-                                                old_cl[k1].push(i);
-                                                if (k2) {
-                                                    old_j[k2].push(i);
-                                                }
-                                                if (k3) {
-                                                    old_s[k3].push(i);
-                                                }
-                                            })(index);
-
-                                            // 判断是否分班
-                                            if (j1 != obj.j && !old_isfb) {
-                                                old_isfb = true;
-                                                old_isfb_index = index;
-                                            }
-
-                                            // 判断进出场
-                                            if (obj.bcType == 'in' && !old_hasJCBC) {
-                                                old_hasJCBC = true;
-                                                old_firstJCBCFcno = obj.fcno;
-                                            }
-                                        });
-
-                                        old_max_fcno = newValue[newValue.length - 1].fcno;
-                                        old_half_bcs = newValue.length / 2;
-
-                                        // 可以用resource封装一下
-                                        // TODO：
-                                    }
-                                }
-                            );
-                        }
-                    }
-                }
-            };
-        }
-    ]
+/**
+ * saPlaninfoedit指令，排班明细编辑控件，用在调度执勤日报的修改功能
+ * name（必须），控件的名字
+ * ds，外部数据源
+ * cl1，车辆1属性
+ * cl2，车辆2属性
+ * j1，驾驶员1属性
+ * j2，驾驶员2属性
+ * s1，售票员1属性
+ * s2，售票员2属性
+ */
+angular.module('ScheduleApp').directive(
+    'saPlaninfoedit',
+    [
+        function() {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html',
+                scope: { // 独立作用域
+                    ds: '=ngModel'
+                },
+                controllerAs: '$saPlanInfoEditCtrl',
+                bindToController: true,
+                controller: function() {
+                    //var self = this;
+
+                },
+
+                compile: function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw {msg: "saPlaninfoedit指令name属性不能为空"};
+                    }
+
+                    // 内部controlAs名字
+                    var ctrlAs = '$saPlanInfoEditCtrl';
+
+
+                    // 内部变量，原始车辆，人员数据
+                    var old_cl = {}; // key:{车辆id_车辆自编号}，value:所在list下标数组
+                    var old_j = {}; // key:{驾驶员id_姓名_工号}, value:所在list下标数组
+                    var old_s = {}; // key:{售票员id_姓名_工号}, value:所在list下标数组
+                    var old_isfb = false; // 是否有分班
+                    var old_isfb_index = 0; // 分班开始索引
+                    var old_hasJCBC = false; // 是否有进场班次
+                    var old_max_fcno = 0; // 最大发车顺序号
+                    var old_firstJCBCFcno = 0; // 第一个进场班次发车顺序号
+                    var old_half_bcs = 0; // 一般的班次数量
+
+                    // 内部变量，变更的车辆，变更的人员
+                    var new_cl1 = undefined; // 新的车辆1（车辆id_车辆自编号）
+                    var new_cl2 = undefined; // 新的车辆2（车辆id_车辆自编号）
+                    var new_j1 = undefined; // 新的驾驶员1（驾驶员id_姓名_工号）
+                    var new_j2 = undefined; // 新的驾驶员2（驾驶员id_姓名_工号）
+                    var new_s1 = undefined; // 新的售票员1（售票员id_姓名_工号）
+                    var new_s2 = undefined; // 新的售票员2（售票员id_姓名_工号）
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+                        post: function(scope, element, attr) {
+
+                            /**
+                             * 刷新车辆数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_cl = function() {
+                                if (new_cl1) {
+                                    var new_cl1_id = new_cl1.split("_")[0];
+                                    var new_cl1_zbh = new_cl1.split("_")[1];
+
+                                    if (new_cl2) {
+                                        var new_cl2_id = new_cl2.split("_")[0];
+                                        var new_cl2_zbh = new_cl2.split("_")[1];
+
+                                        if (old_isfb) { // 使用分班判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_isfb_index) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+
+                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                                if (obj.fcno <= old_firstJCBCFcno) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+                                        } else { // 使用一半一半班次判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_half_bcs) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+                                        }
+
+                                    } else {
+                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                            obj.cl = new_cl1_id;
+                                            obj.clZbh = new_cl1_zbh;
+                                        });
+                                    }
+
+                                } else {
+                                    // 使用旧的
+                                    angular.forEach(old_cl, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            scope[ctrlAs].ds[i].cl = key.split("_")[0];
+                                            scope[ctrlAs].ds[i].clZbh = key.split("_")[1];
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新驾驶员数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_j = function() {
+                                if (new_j1) {
+                                    var new_j1_id = new_j1.split("_")[0];
+                                    var new_j1_name = new_j1.split("_")[1];
+                                    var new_j1_gh = new_j1.split("_")[2];
+                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
+                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                    }
+
+                                    if (new_j2) {
+                                        var new_j2_id = new_j2.split("_")[0];
+                                        var new_j2_name = new_j2.split("_")[1];
+                                        var new_j2_gh = new_j2.split("_")[2];
+                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
+                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                        }
+
+                                        if (old_isfb) { // 使用分班判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_isfb_index) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+
+                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                                if (obj.fcno <= old_firstJCBCFcno) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+                                        } else { // 使用一半一半班次判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_half_bcs) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+                                        }
+
+                                    } else {
+                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                            obj.j = new_j1_id;
+                                            obj.jGh = new_j1_gh;
+                                            obj.jName = new_j1_name;
+                                        });
+                                    }
+
+                                } else {
+                                    // 使用旧的
+                                    angular.forEach(old_j, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            scope[ctrlAs].ds[i].j = key.split("_")[0];
+                                            scope[ctrlAs].ds[i].jName = key.split("_")[1];
+                                            scope[ctrlAs].ds[i].jGh = key.split("_")[2];
+                                        });
+                                    });
+                                }
+                            };
+                            /**
+                             * 刷新售票员数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_s = function() {
+                                if (new_s1) {
+                                    var new_s1_id = new_s1.split("_")[0];
+                                    var new_s1_name = new_s1.split("_")[1];
+                                    var new_s1_gh = new_s1.split("_")[2];
+                                    if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                        new_s1_gh = new_s1_gh.substr(3);
+                                    }
+
+                                    if (new_s2) {
+                                        var new_s2_id = new_s2.split("_")[0];
+                                        var new_s2_name = new_s2.split("_")[1];
+                                        var new_s2_gh = new_s2.split("_")[2];
+                                        if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                            new_s2_gh = new_s2_gh.substr(3);
+                                        }
+
+                                        if (old_isfb) { // 使用分班判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_isfb_index) {
+                                                    obj.s = new_s1_id;
+
+                                                    obj.sGh = new_s1_gh;
+                                                    obj.sName = new_s1_name;
+                                                } else {
+                                                    obj.s = new_s2_id;
+                                                    obj.sGh = new_s2_gh;
+                                                    obj.sName = new_s2_name;
+                                                }
+                                            });
+
+                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                                if (obj.fcno <= old_firstJCBCFcno) {
+                                                    obj.s = new_s1_id;
+                                                    obj.sGh = new_s1_gh;
+                                                    obj.sName = new_s1_name;
+                                                } else {
+                                                    obj.s = new_s2_id;
+                                                    obj.sGh = new_s2_gh;
+                                                    obj.sName = new_s2_name;
+                                                }
+                                            });
+                                        } else { // 使用一半一半班次判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_half_bcs) {
+                                                    obj.s = new_s1_id;
+                                                    obj.sGh = new_s1_gh;
+                                                    obj.sName = new_s1_name;
+                                                } else {
+                                                    obj.s = new_s2_id;
+                                                    obj.sGh = new_s2_gh;
+                                                    obj.sName = new_s2_name;
+                                                }
+                                            });
+                                        }
+
+                                    } else {
+                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                            obj.s = new_s1_id;
+                                            obj.sGh = new_s1_gh;
+                                            obj.sName = new_s1_name;
+                                        });
+                                    }
+
+                                } else {
+                                    // 先清空
+                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                        obj.s = undefined;
+                                        obj.sGh = undefined;
+                                        obj.sName = undefined;
+                                    });
+
+                                    // 使用旧的
+                                    angular.forEach(old_s, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            scope[ctrlAs].ds[i].s = key.split("_")[0];
+                                            scope[ctrlAs].ds[i].sName = key.split("_")[1];
+                                            scope[ctrlAs].ds[i].sGh = key.split("_")[2];
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新内部数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata = function() {
+                                // 更新车辆
+                                scope[ctrlAs].$$internal_refresh_dsdata_cl();
+
+                                // 更新驾驶员
+                                scope[ctrlAs].$$internal_refresh_dsdata_j();
+
+                                // 更新售票员
+                                scope[ctrlAs].$$internal_refresh_dsdata_s();
+                            };
+
+                            // -------------- 监控function ---------------//
+                            attr.$observe('cl1', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.zbh) {
+                                        new_cl1 = obj.id + "_" + obj.zbh;
+                                    } else {
+                                        new_cl1 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            attr.$observe('cl2', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.zbh) {
+                                        new_cl2 = obj.id + "_" + obj.zbh;
+                                    } else {
+                                        new_cl2 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            attr.$observe('j1', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.name && obj.jobCode) {
+                                        new_j1 = obj.id + "_" + obj.name + "_" + obj.jobCode;
+                                    } else {
+                                        new_j1 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            attr.$observe('j2', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.name && obj.jobCode) {
+                                        new_j2 = obj.id + "_" + obj.name + "_" + obj.jobCode;
+                                    } else {
+                                        new_j2 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            attr.$observe('s1', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.name && obj.jobCode) {
+                                        new_s1 = obj.id + "_" + obj.name + "_" + obj.jobCode;
+                                    } else {
+                                        new_s1 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            attr.$observe('s2', function(value) {
+                                if (value && value != "") {
+                                    var obj = JSON.parse(value);
+                                    if (obj.id && obj.name && obj.jobCode) {
+                                        new_s2 = obj.id + "_" + obj.name + "_" + obj.jobCode;
+                                    } else {
+                                        new_s2 = undefined;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata();
+                                }
+                            });
+
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue && newValue.length > 0) {
+
+                                        var j1 = newValue[0].j;
+
+                                        angular.forEach(newValue, function(obj, index) {
+                                            var k1 = obj.cl + "_" + obj.clZbh;
+                                            var k2 = !obj.j? undefined: obj.j + "_" + obj.jName + "_" + obj.jGh;
+                                            var k3 = !obj.s? undefined: obj.s + "_" + obj.sName + "_" + obj.sGh;
+
+                                            if (!old_cl[k1]) {
+                                                old_cl[k1] = [];
+                                            }
+                                            if (!old_j[k2] && k2) {
+                                                old_j[k2] = [];
+                                            }
+                                            if (!old_s[k3] && k3) {
+                                                old_s[k3] = [];
+                                            }
+
+                                            // 闭包
+                                            (function(i) {
+                                                old_cl[k1].push(i);
+                                                if (k2) {
+                                                    old_j[k2].push(i);
+                                                }
+                                                if (k3) {
+                                                    old_s[k3].push(i);
+                                                }
+                                            })(index);
+
+                                            // 判断是否分班
+                                            if (j1 != obj.j && !old_isfb) {
+                                                old_isfb = true;
+                                                old_isfb_index = index;
+                                            }
+
+                                            // 判断进出场
+                                            if (obj.bcType == 'in' && !old_hasJCBC) {
+                                                old_hasJCBC = true;
+                                                old_firstJCBCFcno = obj.fcno;
+                                            }
+                                        });
+
+                                        old_max_fcno = newValue[newValue.length - 1].fcno;
+                                        old_half_bcs = newValue.length / 2;
+
+                                        // 可以用resource封装一下
+                                        // TODO：
+                                    }
+                                }
+                            );
+                        }
+                    }
+                }
+            };
+        }
+    ]
 );
-/**
- * saPlaninfoedit2指令，排班明细编辑控件，用在调度执勤日报的修改功能
- * name（必须），控件的名字
- * ds，外部数据源
- * fd, 表单数据源
- */
-angular.module('ScheduleApp').directive(
-    'saPlaninfoedit2',
-    [
-        function() {
-            return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html',
-                scope: { // 独立作用域
-                    ds: '=ngModel', // 时刻明细数据源头
-                    fd: '=formData' // 表单数据源（车辆、驾驶员、售票员信息）
-                },
-                controllerAs: '$saPlanInfoEditCtrl',
-                bindToController: true,
-                controller: function() {
-                    //var self = this;
-
-                },
-
-                compile: function(tElem, tAttrs) {
-                    // 获取属性
-                    var $attr_name = tAttrs["name"]; // 控件的名字
-                    if (!$attr_name) {
-                        throw {msg: "saPlaninfoedit2指令name属性不能为空"};
-                    }
-
-                    // 内部controlAs名字
-                    var ctrlAs = '$saPlanInfoEditCtrl';
-
-
-                    // 内部变量，原始车辆，人员数据
-                    var old_cl = {}; // key:{车辆id_车辆自编号}，value:所在list下标数组
-                    var old_j = {}; // key:{驾驶员id_姓名_工号}, value:所在list下标数组
-                    var old_s = {}; // key:{售票员id_姓名_工号}, value:所在list下标数组
-                    var old_isfb = false; // 是否有分班
-                    var old_isfb_index = 0; // 分班开始索引
-                    var old_hasJCBC = false; // 是否有进场班次
-                    var old_max_fcno = 0; // 最大发车顺序号
-                    var old_firstJCBCFcno = 0; // 第一个进场班次发车顺序号
-                    var old_half_bcs = 0; // 一般的班次数量
-                    var old_ddreason = {}; // key:{调度原因}, value:所在list下标数组
-                    var old_dddesc = {}; // key:{调度描述}, value:所在list下标数组
-
-                    // 内部变量，变更的车辆，变更的人员
-                    var new_cl1 = undefined; // 新的车辆1（车辆id_车辆自编号）
-                    var new_cl2 = undefined; // 新的车辆2（车辆id_车辆自编号）
-                    var new_j1 = undefined; // 新的驾驶员1（驾驶员id_姓名_工号）
-                    var new_j2 = undefined; // 新的驾驶员2（驾驶员id_姓名_工号）
-                    var new_s1 = undefined; // 新的售票员1（售票员id_姓名_工号）
-                    var new_s2 = undefined; // 新的售票员2（售票员id_姓名_工号）
-                    var new_ddreason = undefined; // 调度原因
-                    var new_dddesc = undefined; // 调度描述
-
-                    // 表单值，被赋值的次数
-                    var form_data_assign_count = { // 大于1表示已经初始化过了
-                        cl1 : -1,
-                        cl2 : -1,
-                        j1 : -1,
-                        j2 : -1,
-                        j3 : -1,
-                        s1 : -1,
-                        s2 : -1,
-                        s3 : -1
-                    };
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-                        post: function(scope, element, attr) {
-
-                            /**
-                             * 刷新调度原因数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_ddreason = function() {
-                                if (new_ddreason) {
-                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                        obj.modifyReason = new_ddreason;
-                                    });
-                                } else {
-                                    // 清空，不使用旧的
-                                    angular.forEach(old_ddreason, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            scope[ctrlAs].ds[i].modifyReason = undefined;
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新调度描述数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_dddesc = function() {
-                                if (new_dddesc) {
-                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                        obj.modifyRemark = new_dddesc;
-                                    });
-                                } else {
-                                    // 清空，不使用旧的
-                                    angular.forEach(old_dddesc, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            scope[ctrlAs].ds[i].modifyRemark = undefined;
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新车辆数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_cl = function() {
-                                if (new_cl1) {
-                                    var new_cl1_id = new_cl1.split("_")[0];
-                                    var new_cl1_zbh = new_cl1.split("_")[1];
-
-                                    if (new_cl2) {
-                                        var new_cl2_id = new_cl2.split("_")[0];
-                                        var new_cl2_zbh = new_cl2.split("_")[1];
-
-                                        if (old_isfb) { // 使用分班判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_isfb_index) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-
-                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                                if (obj.fcno <= old_firstJCBCFcno) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-                                        } else { // 使用一半一半班次判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_half_bcs) {
-                                                    obj.cl = new_cl1_id;
-                                                    obj.clZbh = new_cl1_zbh;
-                                                } else {
-                                                    obj.cl = new_cl2_id;
-                                                    obj.clZbh = new_cl2_zbh;
-                                                }
-                                            });
-                                        }
-
-                                    } else {
-                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                            obj.cl = new_cl1_id;
-                                            obj.clZbh = new_cl1_zbh;
-                                        });
-                                    }
-
-                                } else {
-                                    // 清空，不使用旧的
-                                    angular.forEach(old_cl, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            //scope[ctrlAs].ds[i].cl = key.split("_")[0];
-                                            //scope[ctrlAs].ds[i].clZbh = key.split("_")[1];
-                                            scope[ctrlAs].ds[i].cl = undefined;
-                                            scope[ctrlAs].ds[i].clZbh = undefined;
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新驾驶员数据。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_j = function() {
-                                if (new_j1) {
-                                    var new_j1_id = new_j1.split("_")[0];
-                                    var new_j1_name = new_j1.split("_")[1];
-                                    var new_j1_gh = new_j1.split("_")[2];
-                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
-                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
-                                    }
-
-                                    if (new_j2) {
-                                        var new_j2_id = new_j2.split("_")[0];
-                                        var new_j2_name = new_j2.split("_")[1];
-                                        var new_j2_gh = new_j2.split("_")[2];
-                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
-                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
-                                        }
-
-                                        if (old_isfb) { // 使用分班判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_isfb_index) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-
-                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
-                                                if (obj.fcno <= old_firstJCBCFcno) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-                                        } else { // 使用一半一半班次判定
-                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                                if (index < old_half_bcs) {
-                                                    obj.j = new_j1_id;
-                                                    obj.jGh = new_j1_gh;
-                                                    obj.jName = new_j1_name;
-                                                } else {
-                                                    obj.j = new_j2_id;
-                                                    obj.jGh = new_j2_gh;
-                                                    obj.jName = new_j2_name;
-                                                }
-                                            });
-                                        }
-
-                                    } else {
-                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                            obj.j = new_j1_id;
-                                            obj.jGh = new_j1_gh;
-                                            obj.jName = new_j1_name;
-                                        });
-                                    }
-
-                                } else {
-                                    // 清空，不使用使用旧的
-                                    angular.forEach(old_j, function(value, key) {
-                                        angular.forEach(value, function(i) {
-                                            //scope[ctrlAs].ds[i].j = key.split("_")[0];
-                                            //scope[ctrlAs].ds[i].jName = key.split("_")[1];
-                                            //scope[ctrlAs].ds[i].jGh = key.split("_")[2];
-                                            scope[ctrlAs].ds[i].j = undefined;
-                                            scope[ctrlAs].ds[i].jName = undefined;
-                                            scope[ctrlAs].ds[i].jGh = undefined;
-                                        });
-                                    });
-                                }
-                            };
-
-                            /**
-                             * 刷新售票员数据（和驾驶员配对的，有驾驶员，才有售票员）。
-                             */
-                            scope[ctrlAs].$$internal_refresh_dsdata_s = function() {
-                                var j_id = undefined;
-                                var s_id = undefined;
-                                var s_gh = undefined;
-                                var s_name = undefined;
-
-                                if (new_j1) {
-                                    j_id = new_j1.split("_")[0];
-                                    if (new_s1) {
-                                        s_id = new_s1.split("_")[0];
-                                        s_name = new_s1.split("_")[1];
-                                        s_gh = new_s1.split("_")[2];
-                                        if (s_gh && s_gh.indexOf("-") > 0) { // 修正工号，把 55- 这种前缀去掉
-                                            s_gh = s_gh.substr(3);
-                                        }
-                                    } else {
-                                        s_id = undefined;
-                                        s_gh = undefined;
-                                        s_name = undefined
-                                    }
-                                    angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                        if (obj.j == j_id) {
-                                            obj.s = s_id;
-                                            obj.sGh = s_gh;
-                                            obj.sName = s_name;
-                                        }
-                                    });
-                                }
-                                if (new_j2) {
-                                    j_id = new_j2.split("_")[0];
-                                    if (new_s2) {
-                                        s_id = new_s2.split("_")[0];
-                                        s_name = new_s2.split("_")[1];
-                                        s_gh = new_s2.split("_")[2];
-                                        if (s_gh && s_gh.indexOf("-") > 0) { // 修正工号，把 55- 这种前缀去掉
-                                            s_gh = s_gh.substr(3);
-                                        }
-                                    } else {
-                                        s_id = undefined;
-                                        s_gh = undefined;
-                                        s_name = undefined
-                                    }
-
-                                    angular.forEach(scope[ctrlAs].ds, function(obj, index) {
-                                        if (obj.j == j_id) {
-                                            obj.s = s_id;
-                                            obj.sGh = s_gh;
-                                            obj.sName = s_name;
-                                        }
-                                    });
-                                }
-                            };
-
-                            //-------------- 监控调度原因的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.ddr;
-                                },
-                                function(newValue, oldValue) {
-                                    if (newValue || newValue == 0) {
-                                        new_ddreason = newValue;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_ddreason();
-                                },
-                                true
-                            );
-
-                            //-------------- 监控调度描述的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.ddrdesc;
-                                },
-                                function(newValue, oldValue) {
-                                    if (newValue || newValue == 0) {
-                                        new_dddesc = newValue;
-                                    }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_dddesc();
-                                },
-                                true
-                            );
-
-
-                            //-------------- 监控表单车辆1的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.cl1;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.cl1 > 2) {
-                                        if (newValue.id) {
-                                            if (newValue.id && newValue.zbh) {
-                                                new_cl1 = newValue.id + "_" + newValue.zbh;
-                                            } else {
-                                                new_cl1 = undefined;
-                                            }
-                                        } else {
-                                            new_cl1 = undefined;
-                                        }
-                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
-                                    }
-
-                                    form_data_assign_count.cl1 ++;
-                                },
-                                true
-                            );
-
-                            //-------------- 监控表单车辆2的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.cl2;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.cl2 > 2) {
-                                        if (newValue.id) {
-                                            if (newValue.id && newValue.zbh) {
-                                                new_cl2 = newValue.id + "_" + newValue.zbh;
-                                            } else {
-                                                new_cl2 = undefined;
-                                            }
-                                        } else {
-                                            new_cl2 = undefined;
-                                        }
-                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
-                                    }
-
-                                    form_data_assign_count.cl2 ++;
-                                },
-                                true
-                            );
-
-                            //-------------- 监控表单驾驶员1的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.j1;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.j1 > 2) {
-                                        if (newValue.id) {
-                                            if (newValue.id && newValue.name && newValue.jobCode) {
-                                                new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
-                                            } else {
-                                                new_j1 = undefined;
-                                            }
-                                        } else {
-                                            new_j1 = undefined;
-                                        }
-
-                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
-                                    }
-
-                                    form_data_assign_count.j1 ++;
-                                },
-                                true
-                            );
-
-                            //-------------- 监控表单售票员1的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.s1;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.s1 > 2) {
-                                        if (newValue.id) {
-                                            if (newValue.id && newValue.name && newValue.jobCode) {
-                                                new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
-                                            } else {
-                                                new_s1 = undefined;
-                                            }
-                                        } else {
-                                            new_s1 = undefined;
-                                        }
-
-                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
-                                    }
-
-                                    form_data_assign_count.s1 ++;
-                                },
-                                true
-                            );
-
-                            //-------------- 监控表单驾驶员2的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.j2;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.j2 > 2) {
-                                        if (newValue.id) {
-                                            if (newValue.id && newValue.name && newValue.jobCode) {
-                                                new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
-                                            } else {
-                                                new_j2 = undefined;
-                                            }
-                                        } else {
-                                            new_j2 = undefined;
-                                        }
-
-                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
-                                    }
-
-                                    form_data_assign_count.j2 ++;
-                                },
-                                true
-                            );
-
-                            //-------------- 监控表单售票员2的变化 ----------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].fd.s2;
-                                },
-                                function(newValue, oldValue) {
-                                    if (form_data_assign_count.s2 > 2) {
-                                        if (newValue && newValue.id) {
-                                            if (newValue.id && newValue.name && newValue.jobCode) {
-                                                new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
-                                            } else {
-                                                new_s2 = undefined;
-                                            }
-                                        } else {
-                                            new_s2 = undefined;
-                                        }
-
-                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
-                                    }
-
-                                    form_data_assign_count.s2 ++;
-                                },
-                                true
-                            );
-
-                            //-------------------- 监控ds的变化，更新数据源，初始化formdata的数据 ---------------//
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].ds;
-                                },
-                                function(newValue, oldValue) {
-                                    if (newValue && newValue.length > 0) {
-                                        var j1 = newValue[0].j;
-
-                                        var cl_idFlags = []; // 车辆idFlags数组（有顺序）
-                                        var j_s_idFlags = []; // 驾驶员idFlags，售票员idFlags，[{j:idFlag,s:idFlag},...]（有顺序）
-                                        var addreason = []; // 营运调度的原因
-                                        var adddesc = []; // 营运导读的备注
-                                        var isRepeat = false;
-                                        var i = 0;
-
-                                        angular.forEach(newValue, function(obj, index) {
-                                            var k1 = obj.cl + "_" + obj.clZbh;
-                                            var k2 = !obj.j? undefined: obj.j + "_" + obj.jName + "_" + obj.jGh;
-                                            var k3 = !obj.s? undefined: obj.s + "_" + obj.sName + "_" + obj.sGh;
-
-                                            if (!old_cl[k1]) {
-                                                old_cl[k1] = [];
-                                            }
-                                            if (!old_j[k2] && k2) {
-                                                old_j[k2] = [];
-                                            }
-                                            if (!old_s[k3] && k3) {
-                                                old_s[k3] = [];
-                                            }
-
-                                            var dd4 = obj.modifyReason == null || obj.modifyReason == undefined ? undefined :
-                                                obj.modifyReason;
-                                            var dd5 = obj.modifyRemark == null || obj.modifyRemark == undefined ? undefined :
-                                                obj.modifyRemark;
-
-                                            if (!old_ddreason[dd4] && dd4) {
-                                                old_ddreason[dd4] = [];
-                                            }
-                                            if (!old_dddesc[dd5] && dd5) {
-                                                old_dddesc[dd5] = [];
-                                            }
-
-                                            // 闭包
-                                            (function(i) {
-                                                old_cl[k1].push(i);
-                                                if (k2) {
-                                                    old_j[k2].push(i);
-                                                }
-                                                if (k3) {
-                                                    old_s[k3].push(i);
-                                                }
-                                                if (dd4) {
-                                                    old_ddreason[dd4].push(i);
-                                                }
-                                                if (dd5) {
-                                                    old_dddesc[dd5].push(i);
-                                                }
-                                            })(index);
-
-                                            // 判断是否分班
-                                            if (j1 != obj.j && !old_isfb) {
-                                                old_isfb = true;
-                                                old_isfb_index = index;
-                                            }
-
-                                            // 判断进出场
-                                            if (obj.bcType == 'in' && !old_hasJCBC) {
-                                                old_hasJCBC = true;
-                                                old_firstJCBCFcno = obj.fcno;
-                                            }
-
-                                            //-------------- formdata用数据处理 -------------//
-                                            // 车辆处理
-                                            isRepeat = false;
-                                            if (obj.cl) {
-                                                for (i = 0; i < cl_idFlags.length; i++) {
-                                                    if (cl_idFlags[i] == (obj.cl + "_" + obj.clZbh)) {
-                                                        isRepeat = true;
-                                                        break;
-                                                    }
-                                                }
-                                                if (!isRepeat) {
-                                                    cl_idFlags.push(obj.cl + "_" + obj.clZbh);
-                                                }
-                                            }
-
-                                            // 人员处理（以驾驶员id为主，没有的话，售票员不管了）
-                                            isRepeat = false;
-                                            if (obj.j) {
-                                                for (i = 0; i < j_s_idFlags.length; i++) {
-                                                    if (j_s_idFlags[i].j == (obj.j + "_" + obj.jName + "_" + obj.jGh)) {
-                                                        isRepeat = true;
-                                                        break;
-                                                    }
-                                                }
-                                                if (!isRepeat) {
-                                                    j_s_idFlags.push({
-                                                        j: obj.j + "_" + obj.jName + "_" + obj.jGh,
-                                                        s: !obj.s? undefined: (obj.s + "_" + obj.sName + "_" + obj.sGh)
-                                                    });
-                                                }
-                                            }
-
-                                            // 调度原因处理
-                                            isRepeat = false;
-                                            if (obj.modifyReason || obj.modifyReason == 0) {
-                                                for (i = 0; i < addreason.length; i++) {
-                                                    if (addreason[i] == obj.modifyReason) {
-                                                        isRepeat = true;
-                                                        break;
-                                                    }
-                                                }
-                                                if (!isRepeat) {
-                                                    addreason.push(obj.modifyReason);
-                                                }
-                                            }
-
-                                            // 调整备注处理
-                                            isRepeat = false;
-                                            if (obj.modifyRemark && obj.modifyRemark != "") {
-                                                for (i = 0; i < adddesc.length; i++) {
-                                                    if (adddesc[i] == obj.modifyRemark) {
-                                                        isRepeat = true;
-                                                        break;
-                                                    }
-                                                }
-                                                if (!isRepeat) {
-                                                    adddesc.push(obj.modifyRemark);
-                                                }
-                                            }
-
-                                        });
-
-                                        old_max_fcno = newValue[newValue.length - 1].fcno;
-                                        old_half_bcs = newValue.length / 2;
-
-                                        // 更新formdata
-                                        for (i = 0; i < cl_idFlags.length; i++) { // 车辆更新前两辆
-                                            if (i == 0) { // 第一组车
-                                                scope[ctrlAs].fd["cl1"].id = cl_idFlags[i].split("_")[0];
-                                                new_cl1 = cl_idFlags[i];
-                                            } else if (i == 1) { // 第二组车
-                                                scope[ctrlAs].fd["cl2"].id = cl_idFlags[i].split("_")[0];
-                                                new_cl2 = cl_idFlags[i];
-                                            } else { // 第三组及以上车全部忽略
-                                                break;
-                                            }
-                                        }
-                                        for (i = 0; i < j_s_idFlags.length; i++) { // 人员更新
-                                            if (i == 0) { // 第一组人员
-                                                scope[ctrlAs].fd["j1"].id = j_s_idFlags[i].j.split("_")[0];
-                                                scope[ctrlAs].fd["s1"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
-                                                new_j1 = j_s_idFlags[i].j;
-                                                new_s1 = j_s_idFlags[i].s;
-
-                                            } else if (i == 1) { // 第二组人员
-                                                scope[ctrlAs].fd["j2"].id = j_s_idFlags[i].j.split("_")[0];
-                                                scope[ctrlAs].fd["s2"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
-                                                new_j2 = j_s_idFlags[i].j;
-                                                new_s2 = j_s_idFlags[i].s;
-                                            } else { // 第三组及以上全部忽律
-                                                break;
-                                            }
-                                        }
-                                        // 更新form_data_assign_count，有值设置成2，没值设置成3，表示已经从ds处初始化完毕
-                                        if (new_cl1) {
-                                            form_data_assign_count["cl1"] = 2;
-                                        } else {
-                                            form_data_assign_count["cl1"] = 3;
-                                        }
-                                        if (new_cl2) {
-                                            form_data_assign_count["cl2"] = 2;
-                                        } else {
-                                            form_data_assign_count["cl2"] = 3;
-                                        }
-                                        if (new_j1) {
-                                            form_data_assign_count["j1"] = 2;
-                                        } else {
-                                            form_data_assign_count["j1"] = 3;
-                                        }
-                                        if (new_j2) {
-                                            form_data_assign_count["j2"] = 2;
-                                        } else {
-                                            form_data_assign_count["j2"] = 3;
-                                        }
-                                        if (new_s1) {
-                                            form_data_assign_count["s1"] = 2;
-                                        } else {
-                                            form_data_assign_count["s1"] = 3;
-                                        }
-                                        if (new_s2) {
-                                            form_data_assign_count["s2"] = 2;
-                                        } else {
-                                            form_data_assign_count["s2"] = 3;
-                                        }
-
-
-                                        for (i = 0; i < addreason.length; i++) { // 调度原因更新
-                                            if (i > 1) { // 有多个，只更新第一个
-                                                break;
-                                            } else {
-                                                scope[ctrlAs].fd.ddr = addreason[i];
-                                            }
-                                        }
-                                        for (i = 0; i < adddesc.length; i++) {
-                                            if (i > 1) { // 有多个，只更新第一个
-                                                break;
-                                            } else {
-                                                scope[ctrlAs].fd.ddrdesc = adddesc[i];
-                                            }
-                                        }
-                                    }
-                                }
-                            );
-                        }
-                    }
-                }
-            };
-        }
-    ]
+/**
+ * saPlaninfoedit2指令，排班明细编辑控件，用在调度执勤日报的修改功能
+ * name（必须），控件的名字
+ * ds，外部数据源
+ * fd, 表单数据源
+ */
+angular.module('ScheduleApp').directive(
+    'saPlaninfoedit2',
+    [
+        function() {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html',
+                scope: { // 独立作用域
+                    ds: '=ngModel', // 时刻明细数据源头
+                    fd: '=formData' // 表单数据源（车辆、驾驶员、售票员信息）
+                },
+                controllerAs: '$saPlanInfoEditCtrl',
+                bindToController: true,
+                controller: function() {
+                    //var self = this;
+
+                },
+
+                compile: function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw {msg: "saPlaninfoedit2指令name属性不能为空"};
+                    }
+
+                    // 内部controlAs名字
+                    var ctrlAs = '$saPlanInfoEditCtrl';
+
+
+                    // 内部变量，原始车辆，人员数据
+                    var old_cl = {}; // key:{车辆id_车辆自编号}，value:所在list下标数组
+                    var old_j = {}; // key:{驾驶员id_姓名_工号}, value:所在list下标数组
+                    var old_s = {}; // key:{售票员id_姓名_工号}, value:所在list下标数组
+                    var old_isfb = false; // 是否有分班
+                    var old_isfb_index = 0; // 分班开始索引
+                    var old_hasJCBC = false; // 是否有进场班次
+                    var old_max_fcno = 0; // 最大发车顺序号
+                    var old_firstJCBCFcno = 0; // 第一个进场班次发车顺序号
+                    var old_half_bcs = 0; // 一般的班次数量
+                    var old_ddreason = {}; // key:{调度原因}, value:所在list下标数组
+                    var old_dddesc = {}; // key:{调度描述}, value:所在list下标数组
+
+                    // 内部变量，变更的车辆，变更的人员
+                    var new_cl1 = undefined; // 新的车辆1（车辆id_车辆自编号）
+                    var new_cl2 = undefined; // 新的车辆2（车辆id_车辆自编号）
+                    var new_j1 = undefined; // 新的驾驶员1（驾驶员id_姓名_工号）
+                    var new_j2 = undefined; // 新的驾驶员2（驾驶员id_姓名_工号）
+                    var new_s1 = undefined; // 新的售票员1（售票员id_姓名_工号）
+                    var new_s2 = undefined; // 新的售票员2（售票员id_姓名_工号）
+                    var new_ddreason = undefined; // 调度原因
+                    var new_dddesc = undefined; // 调度描述
+
+                    // 表单值，被赋值的次数
+                    var form_data_assign_count = { // 大于1表示已经初始化过了
+                        cl1 : -1,
+                        cl2 : -1,
+                        j1 : -1,
+                        j2 : -1,
+                        j3 : -1,
+                        s1 : -1,
+                        s2 : -1,
+                        s3 : -1
+                    };
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+                        post: function(scope, element, attr) {
+
+                            /**
+                             * 刷新调度原因数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_ddreason = function() {
+                                if (new_ddreason) {
+                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                        obj.modifyReason = new_ddreason;
+                                    });
+                                } else {
+                                    // 清空，不使用旧的
+                                    angular.forEach(old_ddreason, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            scope[ctrlAs].ds[i].modifyReason = undefined;
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新调度描述数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_dddesc = function() {
+                                if (new_dddesc) {
+                                    angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                        obj.modifyRemark = new_dddesc;
+                                    });
+                                } else {
+                                    // 清空，不使用旧的
+                                    angular.forEach(old_dddesc, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            scope[ctrlAs].ds[i].modifyRemark = undefined;
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新车辆数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_cl = function() {
+                                if (new_cl1) {
+                                    var new_cl1_id = new_cl1.split("_")[0];
+                                    var new_cl1_zbh = new_cl1.split("_")[1];
+
+                                    if (new_cl2) {
+                                        var new_cl2_id = new_cl2.split("_")[0];
+                                        var new_cl2_zbh = new_cl2.split("_")[1];
+
+                                        if (old_isfb) { // 使用分班判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_isfb_index) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+
+                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                                if (obj.fcno <= old_firstJCBCFcno) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+                                        } else { // 使用一半一半班次判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_half_bcs) {
+                                                    obj.cl = new_cl1_id;
+                                                    obj.clZbh = new_cl1_zbh;
+                                                } else {
+                                                    obj.cl = new_cl2_id;
+                                                    obj.clZbh = new_cl2_zbh;
+                                                }
+                                            });
+                                        }
+
+                                    } else {
+                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                            obj.cl = new_cl1_id;
+                                            obj.clZbh = new_cl1_zbh;
+                                        });
+                                    }
+
+                                } else {
+                                    // 清空，不使用旧的
+                                    angular.forEach(old_cl, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            //scope[ctrlAs].ds[i].cl = key.split("_")[0];
+                                            //scope[ctrlAs].ds[i].clZbh = key.split("_")[1];
+                                            scope[ctrlAs].ds[i].cl = undefined;
+                                            scope[ctrlAs].ds[i].clZbh = undefined;
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新驾驶员数据。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_j = function() {
+                                if (new_j1) {
+                                    var new_j1_id = new_j1.split("_")[0];
+                                    var new_j1_name = new_j1.split("_")[1];
+                                    var new_j1_gh = new_j1.split("_")[2];
+                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
+                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                    }
+
+                                    if (new_j2) {
+                                        var new_j2_id = new_j2.split("_")[0];
+                                        var new_j2_name = new_j2.split("_")[1];
+                                        var new_j2_gh = new_j2.split("_")[2];
+                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
+                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                        }
+
+                                        if (old_isfb) { // 使用分班判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_isfb_index) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+
+                                        } else if (old_hasJCBC && old_firstJCBCFcno < old_max_fcno) { // 使用进出场判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj) {
+                                                if (obj.fcno <= old_firstJCBCFcno) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+                                        } else { // 使用一半一半班次判定
+                                            angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                                if (index < old_half_bcs) {
+                                                    obj.j = new_j1_id;
+                                                    obj.jGh = new_j1_gh;
+                                                    obj.jName = new_j1_name;
+                                                } else {
+                                                    obj.j = new_j2_id;
+                                                    obj.jGh = new_j2_gh;
+                                                    obj.jName = new_j2_name;
+                                                }
+                                            });
+                                        }
+
+                                    } else {
+                                        angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                            obj.j = new_j1_id;
+                                            obj.jGh = new_j1_gh;
+                                            obj.jName = new_j1_name;
+                                        });
+                                    }
+
+                                } else {
+                                    // 清空，不使用使用旧的
+                                    angular.forEach(old_j, function(value, key) {
+                                        angular.forEach(value, function(i) {
+                                            //scope[ctrlAs].ds[i].j = key.split("_")[0];
+                                            //scope[ctrlAs].ds[i].jName = key.split("_")[1];
+                                            //scope[ctrlAs].ds[i].jGh = key.split("_")[2];
+                                            scope[ctrlAs].ds[i].j = undefined;
+                                            scope[ctrlAs].ds[i].jName = undefined;
+                                            scope[ctrlAs].ds[i].jGh = undefined;
+                                        });
+                                    });
+                                }
+                            };
+
+                            /**
+                             * 刷新售票员数据（和驾驶员配对的，有驾驶员，才有售票员）。
+                             */
+                            scope[ctrlAs].$$internal_refresh_dsdata_s = function() {
+                                var j_id = undefined;
+                                var s_id = undefined;
+                                var s_gh = undefined;
+                                var s_name = undefined;
+
+                                if (new_j1) {
+                                    j_id = new_j1.split("_")[0];
+                                    if (new_s1) {
+                                        s_id = new_s1.split("_")[0];
+                                        s_name = new_s1.split("_")[1];
+                                        s_gh = new_s1.split("_")[2];
+                                        if (s_gh && s_gh.indexOf("-") > 0) { // 修正工号，把 55- 这种前缀去掉
+                                            s_gh = s_gh.substr(3);
+                                        }
+                                    } else {
+                                        s_id = undefined;
+                                        s_gh = undefined;
+                                        s_name = undefined
+                                    }
+                                    angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                        if (obj.j == j_id) {
+                                            obj.s = s_id;
+                                            obj.sGh = s_gh;
+                                            obj.sName = s_name;
+                                        }
+                                    });
+                                }
+                                if (new_j2) {
+                                    j_id = new_j2.split("_")[0];
+                                    if (new_s2) {
+                                        s_id = new_s2.split("_")[0];
+                                        s_name = new_s2.split("_")[1];
+                                        s_gh = new_s2.split("_")[2];
+                                        if (s_gh && s_gh.indexOf("-") > 0) { // 修正工号，把 55- 这种前缀去掉
+                                            s_gh = s_gh.substr(3);
+                                        }
+                                    } else {
+                                        s_id = undefined;
+                                        s_gh = undefined;
+                                        s_name = undefined
+                                    }
+
+                                    angular.forEach(scope[ctrlAs].ds, function(obj, index) {
+                                        if (obj.j == j_id) {
+                                            obj.s = s_id;
+                                            obj.sGh = s_gh;
+                                            obj.sName = s_name;
+                                        }
+                                    });
+                                }
+                            };
+
+                            //-------------- 监控调度原因的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.ddr;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue || newValue == 0) {
+                                        new_ddreason = newValue;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata_ddreason();
+                                },
+                                true
+                            );
+
+                            //-------------- 监控调度描述的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.ddrdesc;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue || newValue == 0) {
+                                        new_dddesc = newValue;
+                                    }
+                                    scope[ctrlAs].$$internal_refresh_dsdata_dddesc();
+                                },
+                                true
+                            );
+
+
+                            //-------------- 监控表单车辆1的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.cl1;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.cl1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl1 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl1 = undefined;
+                                            }
+                                        } else {
+                                            new_cl1 = undefined;
+                                        }
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
+
+                                    form_data_assign_count.cl1 ++;
+                                },
+                                true
+                            );
+
+                            //-------------- 监控表单车辆2的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.cl2;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.cl2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl2 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl2 = undefined;
+                                            }
+                                        } else {
+                                            new_cl2 = undefined;
+                                        }
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
+
+                                    form_data_assign_count.cl2 ++;
+                                },
+                                true
+                            );
+
+                            //-------------- 监控表单驾驶员1的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.j1;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.j1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j1 = undefined;
+                                            }
+                                        } else {
+                                            new_j1 = undefined;
+                                        }
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
+
+                                    form_data_assign_count.j1 ++;
+                                },
+                                true
+                            );
+
+                            //-------------- 监控表单售票员1的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.s1;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.s1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s1 = undefined;
+                                            }
+                                        } else {
+                                            new_s1 = undefined;
+                                        }
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
+
+                                    form_data_assign_count.s1 ++;
+                                },
+                                true
+                            );
+
+                            //-------------- 监控表单驾驶员2的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.j2;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.j2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j2 = undefined;
+                                            }
+                                        } else {
+                                            new_j2 = undefined;
+                                        }
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
+
+                                    form_data_assign_count.j2 ++;
+                                },
+                                true
+                            );
+
+                            //-------------- 监控表单售票员2的变化 ----------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].fd.s2;
+                                },
+                                function(newValue, oldValue) {
+                                    if (form_data_assign_count.s2 > 2) {
+                                        if (newValue && newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s2 = undefined;
+                                            }
+                                        } else {
+                                            new_s2 = undefined;
+                                        }
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
+
+                                    form_data_assign_count.s2 ++;
+                                },
+                                true
+                            );
+
+                            //-------------------- 监控ds的变化，更新数据源，初始化formdata的数据 ---------------//
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue && newValue.length > 0) {
+                                        var j1 = newValue[0].j;
+
+                                        var cl_idFlags = []; // 车辆idFlags数组（有顺序）
+                                        var j_s_idFlags = []; // 驾驶员idFlags，售票员idFlags，[{j:idFlag,s:idFlag},...]（有顺序）
+                                        var addreason = []; // 营运调度的原因
+                                        var adddesc = []; // 营运导读的备注
+                                        var isRepeat = false;
+                                        var i = 0;
+
+                                        angular.forEach(newValue, function(obj, index) {
+                                            var k1 = obj.cl + "_" + obj.clZbh;
+                                            var k2 = !obj.j? undefined: obj.j + "_" + obj.jName + "_" + obj.jGh;
+                                            var k3 = !obj.s? undefined: obj.s + "_" + obj.sName + "_" + obj.sGh;
+
+                                            if (!old_cl[k1]) {
+                                                old_cl[k1] = [];
+                                            }
+                                            if (!old_j[k2] && k2) {
+                                                old_j[k2] = [];
+                                            }
+                                            if (!old_s[k3] && k3) {
+                                                old_s[k3] = [];
+                                            }
+
+                                            var dd4 = obj.modifyReason == null || obj.modifyReason == undefined ? undefined :
+                                                obj.modifyReason;
+                                            var dd5 = obj.modifyRemark == null || obj.modifyRemark == undefined ? undefined :
+                                                obj.modifyRemark;
+
+                                            if (!old_ddreason[dd4] && dd4) {
+                                                old_ddreason[dd4] = [];
+                                            }
+                                            if (!old_dddesc[dd5] && dd5) {
+                                                old_dddesc[dd5] = [];
+                                            }
+
+                                            // 闭包
+                                            (function(i) {
+                                                old_cl[k1].push(i);
+                                                if (k2) {
+                                                    old_j[k2].push(i);
+                                                }
+                                                if (k3) {
+                                                    old_s[k3].push(i);
+                                                }
+                                                if (dd4) {
+                                                    old_ddreason[dd4].push(i);
+                                                }
+                                                if (dd5) {
+                                                    old_dddesc[dd5].push(i);
+                                                }
+                                            })(index);
+
+                                            // 判断是否分班
+                                            if (j1 != obj.j && !old_isfb) {
+                                                old_isfb = true;
+                                                old_isfb_index = index;
+                                            }
+
+                                            // 判断进出场
+                                            if (obj.bcType == 'in' && !old_hasJCBC) {
+                                                old_hasJCBC = true;
+                                                old_firstJCBCFcno = obj.fcno;
+                                            }
+
+                                            //-------------- formdata用数据处理 -------------//
+                                            // 车辆处理
+                                            isRepeat = false;
+                                            if (obj.cl) {
+                                                for (i = 0; i < cl_idFlags.length; i++) {
+                                                    if (cl_idFlags[i] == (obj.cl + "_" + obj.clZbh)) {
+                                                        isRepeat = true;
+                                                        break;
+                                                    }
+                                                }
+                                                if (!isRepeat) {
+                                                    cl_idFlags.push(obj.cl + "_" + obj.clZbh);
+                                                }
+                                            }
+
+                                            // 人员处理（以驾驶员id为主，没有的话，售票员不管了）
+                                            isRepeat = false;
+                                            if (obj.j) {
+                                                for (i = 0; i < j_s_idFlags.length; i++) {
+                                                    if (j_s_idFlags[i].j == (obj.j + "_" + obj.jName + "_" + obj.jGh)) {
+                                                        isRepeat = true;
+                                                        break;
+                                                    }
+                                                }
+                                                if (!isRepeat) {
+                                                    j_s_idFlags.push({
+                                                        j: obj.j + "_" + obj.jName + "_" + obj.jGh,
+                                                        s: !obj.s? undefined: (obj.s + "_" + obj.sName + "_" + obj.sGh)
+                                                    });
+                                                }
+                                            }
+
+                                            // 调度原因处理
+                                            isRepeat = false;
+                                            if (obj.modifyReason || obj.modifyReason == 0) {
+                                                for (i = 0; i < addreason.length; i++) {
+                                                    if (addreason[i] == obj.modifyReason) {
+                                                        isRepeat = true;
+                                                        break;
+                                                    }
+                                                }
+                                                if (!isRepeat) {
+                                                    addreason.push(obj.modifyReason);
+                                                }
+                                            }
+
+                                            // 调整备注处理
+                                            isRepeat = false;
+                                            if (obj.modifyRemark && obj.modifyRemark != "") {
+                                                for (i = 0; i < adddesc.length; i++) {
+                                                    if (adddesc[i] == obj.modifyRemark) {
+                                                        isRepeat = true;
+                                                        break;
+                                                    }
+                                                }
+                                                if (!isRepeat) {
+                                                    adddesc.push(obj.modifyRemark);
+                                                }
+                                            }
+
+                                        });
+
+                                        old_max_fcno = newValue[newValue.length - 1].fcno;
+                                        old_half_bcs = newValue.length / 2;
+
+                                        // 更新formdata
+                                        for (i = 0; i < cl_idFlags.length; i++) { // 车辆更新前两辆
+                                            if (i == 0) { // 第一组车
+                                                scope[ctrlAs].fd["cl1"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl1 = cl_idFlags[i];
+                                            } else if (i == 1) { // 第二组车
+                                                scope[ctrlAs].fd["cl2"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl2 = cl_idFlags[i];
+                                            } else { // 第三组及以上车全部忽略
+                                                break;
+                                            }
+                                        }
+                                        for (i = 0; i < j_s_idFlags.length; i++) { // 人员更新
+                                            if (i == 0) { // 第一组人员
+                                                scope[ctrlAs].fd["j1"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s1"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j1 = j_s_idFlags[i].j;
+                                                new_s1 = j_s_idFlags[i].s;
+
+                                            } else if (i == 1) { // 第二组人员
+                                                scope[ctrlAs].fd["j2"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s2"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j2 = j_s_idFlags[i].j;
+                                                new_s2 = j_s_idFlags[i].s;
+                                            } else { // 第三组及以上全部忽律
+                                                break;
+                                            }
+                                        }
+                                        // 更新form_data_assign_count，有值设置成2，没值设置成3，表示已经从ds处初始化完毕
+                                        if (new_cl1) {
+                                            form_data_assign_count["cl1"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl1"] = 3;
+                                        }
+                                        if (new_cl2) {
+                                            form_data_assign_count["cl2"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl2"] = 3;
+                                        }
+                                        if (new_j1) {
+                                            form_data_assign_count["j1"] = 2;
+                                        } else {
+                                            form_data_assign_count["j1"] = 3;
+                                        }
+                                        if (new_j2) {
+                                            form_data_assign_count["j2"] = 2;
+                                        } else {
+                                            form_data_assign_count["j2"] = 3;
+                                        }
+                                        if (new_s1) {
+                                            form_data_assign_count["s1"] = 2;
+                                        } else {
+                                            form_data_assign_count["s1"] = 3;
+                                        }
+                                        if (new_s2) {
+                                            form_data_assign_count["s2"] = 2;
+                                        } else {
+                                            form_data_assign_count["s2"] = 3;
+                                        }
+
+
+                                        for (i = 0; i < addreason.length; i++) { // 调度原因更新
+                                            if (i > 1) { // 有多个，只更新第一个
+                                                break;
+                                            } else {
+                                                scope[ctrlAs].fd.ddr = addreason[i];
+                                            }
+                                        }
+                                        for (i = 0; i < adddesc.length; i++) {
+                                            if (i > 1) { // 有多个，只更新第一个
+                                                break;
+                                            } else {
+                                                scope[ctrlAs].fd.ddrdesc = adddesc[i];
+                                            }
+                                        }
+                                    }
+                                }
+                            );
+                        }
+                    }
+                }
+            };
+        }
+    ]
 );
 \ No newline at end of file
@@ -184,96 +184,6 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     ]
 );
-// 车辆信息同步service
-angular.module('ScheduleApp').factory(
-    'VehicleDataSyncManageService_g',
-    [
-        '$resource',
-        function($resource) {
-            return {
-                rest: $resource(
-                    '/dataSync/vehicle/:id',
-                    {order: 'startDate', direction: 'DESC', id: '@id'},
-                    {
-                        list: {
-                            method: 'GET',
-                            params: {
-                                page: 0
-                            },
-                            transformResponse: function(rs) {
-                                var dst = angular.fromJson(rs);
-                                if (dst.status == 'SUCCESS') {
-                                    return dst.data;
-                                } else {
-                                    return dst; // 业务错误留给控制器处理
-                                }
-                            }
-                        },
-                        get: {
-                            method: 'GET',
-                            transformResponse: function(rs) {
-                                var dst = angular.fromJson(rs);
-                                if (dst.status == 'SUCCESS') {
-                                    return dst.data;
-                                } else {
-                                    return dst;
-                                }
-                            }
-                        }
-                    }
-                ),
-                logFileExport: $resource(
-                    '/dataSync/vehicle/logfile/:id/:type',
-                    {id: '@id'},
-                    {
-                        getLog: {
-                            method: 'GET',
-                            responseType: "arraybuffer",
-                            transformResponse: function(data, headers, status){
-                                if (status != 200) {
-                                    return data;
-                                }
-
-                                // console.log(headers("Content-Disposition"));
-                                // 获取文件名，后台根据是否还有中文名字，返回filename=ascii编码的文件名 或 filename*=unicode编码的文件名
-                                var fileName = headers("Content-Disposition").split(";")[1].split("filename=")[1];
-                                var fileNameUnicode = headers("Content-Disposition").split("filename*=")[1];
-                                if (fileNameUnicode) {//当存在 filename* 时，取filename* 并进行解码（为了解决中文乱码问题）
-                                    fileName = decodeURIComponent(fileNameUnicode);
-                                }
-
-                                return {fileData : data, fileName: fileName};
-                            }
-                        }
-                    }
-                ),
-                addTask: $resource(
-                    '/dataSync/vehicle/addTask',
-                    {},
-                    {
-                        save: {
-                            method: 'POST'
-                        }
-                    }
-                ),
-                refreshBuffer: $resource(
-                    '/dataSync/vehicle/refreshBuffer',
-                    {},
-                    {
-                        refresh: {
-                            method: 'GET',
-                            transformResponse: function(rs) {
-                                var dst = angular.fromJson(rs);
-                                return dst;
-                            }
-                        }
-                    }
-                )
-            };
-        }
-    ]
-);
-
 // 车辆配置service
 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
@@ -280,63 +280,6 @@ ScheduleApp.config([
             })
 }]);
-// ui route 配置
-
-/** 车辆信息同步模块route */
-ScheduleApp.config([
-    '$stateProvider',
-    '$urlRouterProvider',
-    function($stateProvider, $urlRouterProvider) {
-        $stateProvider
-            .state("vehicleDataSyncManage", { // index页面
-                url: '/vehicleDataSyncManage',
-                views: {
-                    "": {
-                        templateUrl: 'pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/index.html'
-                    },
-                    "vehicleDataSyncManage_list@vehicleDataSyncManage": {
-                        templateUrl: 'pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/list.html'
-                    }
-                },
-                resolve: {
-                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
-                        return $ocLazyLoad.load({
-                            name: 'vehicleDataSyncManage_module',
-                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
-                            files: [
-                                "assets/bower_components/angular-ui-select/dist/select.min.css",
-                                "assets/bower_components/angular-ui-select/dist/select.min.js",
-                                "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
-                                "pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/module.js"
-                            ]
-                        });
-                    }]
-                }
-            })
-            .state("vehicleDataSyncManage_form", { // 添加车辆form
-                url: '/vehicleDataSyncManage_form',
-                views: {
-                    "": {templateUrl: 'pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/form.html'}
-                },
-                resolve: {
-                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
-                        return $ocLazyLoad.load({
-                            name: 'vehicleDataSyncManage_form_module',
-                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
-                            files: [
-                                "assets/bower_components/angular-ui-select/dist/select.min.css",
-                                "assets/bower_components/angular-ui-select/dist/select.min.js",
-                                "pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/module.js"
-                            ]
-                        });
-                    }]
-                }
-            })
-
-    }
-]);
-
-
 // ui route 配置
 /** 车辆配置模块页面route */