Commit d4c54fa6afb20f611f2e2ec3f809861d21da6a0c
1 parent
27f7547c
修改时刻表明细班次起点站,终点站时,使用站点编码加站点名称匹配选择框显示
修改prj-common-globalservice-legacy.js,在zd_tcc服务里的数据输出创建code_name属性 修改timeTableDetailManage_old.js,self.TimeTableDetailForSave添加临时变量qcode_name,zcode_name,submit后删除 修改起点站,终点站sa-Select5里的dcname和icname里的对应属性名
Showing
4 changed files
with
25 additions
and
4 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
| @@ -126,6 +126,12 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun | @@ -126,6 +126,12 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun | ||
| 126 | transformResponse: function(rs) { | 126 | transformResponse: function(rs) { |
| 127 | var dst = angular.fromJson(rs); | 127 | var dst = angular.fromJson(rs); |
| 128 | if (dst.status == 'SUCCESS') { | 128 | if (dst.status == 'SUCCESS') { |
| 129 | + | ||
| 130 | + // 将编码和名称合并成新的字段 | ||
| 131 | + for (var i = 0; i < dst.data.length; i++) { | ||
| 132 | + dst.data[i]["code_name"] = dst.data[i]["zcode"] + "_" + dst.data[i]["zname"]; | ||
| 133 | + } | ||
| 134 | + | ||
| 129 | return dst.data; | 135 | return dst.data; |
| 130 | } else { | 136 | } else { |
| 131 | return dst; // 业务错误留给控制器处理 | 137 | return dst; // 业务错误留给控制器处理 |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
| @@ -1004,6 +1004,12 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun | @@ -1004,6 +1004,12 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun | ||
| 1004 | transformResponse: function(rs) { | 1004 | transformResponse: function(rs) { |
| 1005 | var dst = angular.fromJson(rs); | 1005 | var dst = angular.fromJson(rs); |
| 1006 | if (dst.status == 'SUCCESS') { | 1006 | if (dst.status == 'SUCCESS') { |
| 1007 | + | ||
| 1008 | + // 将编码和名称合并成新的字段 | ||
| 1009 | + for (var i = 0; i < dst.data.length; i++) { | ||
| 1010 | + dst.data[i]["code_name"] = dst.data[i]["zcode"] + "_" + dst.data[i]["zname"]; | ||
| 1011 | + } | ||
| 1012 | + | ||
| 1007 | return dst.data; | 1013 | return dst.data; |
| 1008 | } else { | 1014 | } else { |
| 1009 | return dst; // 业务错误留给控制器处理 | 1015 | return dst; // 业务错误留给控制器处理 |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
| @@ -97,8 +97,8 @@ | @@ -97,8 +97,8 @@ | ||
| 97 | <sa-Select5 name="qdz" | 97 | <sa-Select5 name="qdz" |
| 98 | model="ctrl.TimeTableDetailForSave" | 98 | model="ctrl.TimeTableDetailForSave" |
| 99 | cmaps="{'qdzCode' : 'zcode', 'qdzName': 'zname'}" | 99 | cmaps="{'qdzCode' : 'zcode', 'qdzName': 'zname'}" |
| 100 | - dcname="qdzCode" | ||
| 101 | - icname="zcode" | 100 | + dcname="qcode_name" |
| 101 | + icname="code_name" | ||
| 102 | dsparams="{{ {type: 'ajax', param: {'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}" | 102 | dsparams="{{ {type: 'ajax', param: {'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}" |
| 103 | iterobjname="item" | 103 | iterobjname="item" |
| 104 | iterobjexp="item.aname" | 104 | iterobjexp="item.aname" |
| @@ -118,8 +118,8 @@ | @@ -118,8 +118,8 @@ | ||
| 118 | <sa-Select5 name="zdz" | 118 | <sa-Select5 name="zdz" |
| 119 | model="ctrl.TimeTableDetailForSave" | 119 | model="ctrl.TimeTableDetailForSave" |
| 120 | cmaps="{'zdzCode' : 'zcode', 'zdzName': 'zname'}" | 120 | cmaps="{'zdzCode' : 'zcode', 'zdzName': 'zname'}" |
| 121 | - dcname="zdzCode" | ||
| 122 | - icname="zcode" | 121 | + dcname="zcode_name" |
| 122 | + icname="code_name" | ||
| 123 | dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}" | 123 | dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}" |
| 124 | iterobjname="item" | 124 | iterobjname="item" |
| 125 | iterobjexp="item.aname" | 125 | iterobjexp="item.aname" |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
| @@ -511,6 +511,10 @@ angular.module('ScheduleApp').controller( | @@ -511,6 +511,10 @@ angular.module('ScheduleApp').controller( | ||
| 511 | "->路牌" + self.TimeTableDetailForSave.lp.lpName + | 511 | "->路牌" + self.TimeTableDetailForSave.lp.lpName + |
| 512 | "->发车顺序号" + self.TimeTableDetailForSave.fcno + | 512 | "->发车顺序号" + self.TimeTableDetailForSave.fcno + |
| 513 | "->班次详细信息"; | 513 | "->班次详细信息"; |
| 514 | + | ||
| 515 | + // 添加编码加名字组合字段 | ||
| 516 | + self.TimeTableDetailForSave["qcode_name"] = self.TimeTableDetailForSave["qdzCode"] + "_" + self.TimeTableDetailForSave["qdzName"]; | ||
| 517 | + self.TimeTableDetailForSave["zcode_name"] = self.TimeTableDetailForSave["zdzCode"] + "_" + self.TimeTableDetailForSave["zdzName"]; | ||
| 514 | }); | 518 | }); |
| 515 | 519 | ||
| 516 | } else { // 此单元格为空,使用columnBcInfo填充 | 520 | } else { // 此单元格为空,使用columnBcInfo填充 |
| @@ -540,6 +544,11 @@ angular.module('ScheduleApp').controller( | @@ -540,6 +544,11 @@ angular.module('ScheduleApp').controller( | ||
| 540 | //if (self.busInfoForSave) { | 544 | //if (self.busInfoForSave) { |
| 541 | // delete $stateParams.id; | 545 | // delete $stateParams.id; |
| 542 | //} | 546 | //} |
| 547 | + | ||
| 548 | + // 删除编码加名字组合字段 | ||
| 549 | + delete self.TimeTableDetailForSave["qcode_name"]; | ||
| 550 | + delete self.TimeTableDetailForSave["zcode_name"]; | ||
| 551 | + | ||
| 543 | self.TimeTableDetailForSave.$save(function(value) { | 552 | self.TimeTableDetailForSave.$save(function(value) { |
| 544 | // 修正内部edit的值 | 553 | // 修正内部edit的值 |
| 545 | var detailInfos = service.getEditInfo().detailInfos; | 554 | var detailInfos = service.getEditInfo().detailInfos; |