|
@@ -11612,7 +11612,8 @@ appFormly.config(function config(formlyConfigProvider) {
|
11612
|
11612
|
// console.log(items)
|
11613
|
11613
|
},
|
11614
|
11614
|
refresh: function (items, search, fn) {
|
11615
|
|
- console.log(items);
|
|
11615
|
+ console.log(items,options);
|
|
11616
|
+
|
11616
|
11617
|
var treedata = [];
|
11617
|
11618
|
|
11618
|
11619
|
function convertListToTree(data, treeMap) {
|
|
@@ -11800,7 +11801,7 @@ appFormly.config(function config(formlyConfigProvider) {
|
11800
|
11801
|
angular.forEach(childrens, function (item, index) {
|
11801
|
11802
|
if (item.id == pmodel.id) {
|
11802
|
11803
|
item.selected = true;
|
11803
|
|
- delete item.children;
|
|
11804
|
+ // delete item.children;
|
11804
|
11805
|
}
|
11805
|
11806
|
if (item && item.children) {
|
11806
|
11807
|
selectItem(pmodel, item.children);
|
|
@@ -11937,6 +11938,33 @@ appFormly.config(function config(formlyConfigProvider) {
|
11937
|
11938
|
options.templateOptions
|
11938
|
11939
|
.refreshData(options.templateOptions.APIService)
|
11939
|
11940
|
.then(function (result) {
|
|
11941
|
+ //回显事件分类,带出绑定的人或组start caocao
|
|
11942
|
+ if(items.$parent.originalModel.incident.category){
|
|
11943
|
+ console.log(result[options.templateOptions.optionsDataKey],items.$parent.model.category.id)
|
|
11944
|
+ var item = result[options.templateOptions.optionsDataKey].find(function(v){
|
|
11945
|
+ return v.id == items.$parent.originalModel.incident.category.id;
|
|
11946
|
+ })
|
|
11947
|
+ console.log(item)//11615
|
|
11948
|
+ if(item.userOrGroupType===1){
|
|
11949
|
+ items.$parent.originalModel.start_code='assignment';
|
|
11950
|
+ items.$parent.originalModel.incident.handlerUser={id:item.handleUser?item.handleUser.id:undefined};
|
|
11951
|
+ items.$parent.originalModel.directClose=true;
|
|
11952
|
+ items.$parent.originalModel.isHandlerUser=false;
|
|
11953
|
+ setTimeout(function(){items.$parent.originalModel.isHandlerUser=true;},0)
|
|
11954
|
+ }else if(item.userOrGroupType===2){
|
|
11955
|
+ items.$parent.originalModel.start_code='assignment';
|
|
11956
|
+ items.$parent.originalModel.candidateGroups=item.group;
|
|
11957
|
+ items.$parent.originalModel.directClose=true;
|
|
11958
|
+ items.$parent.originalModel.isHandlerUser=false;
|
|
11959
|
+ }else{
|
|
11960
|
+ items.$parent.originalModel.start_code='close';
|
|
11961
|
+ items.$parent.originalModel.directClose=false;
|
|
11962
|
+ items.$parent.originalModel.isHandlerUser=false;
|
|
11963
|
+ delete items.$parent.originalModel.candidateGroups;
|
|
11964
|
+ delete items.$parent.originalModel.incident.handlerUser
|
|
11965
|
+ }
|
|
11966
|
+ }
|
|
11967
|
+ //回显事件分类,带出绑定的人或组end
|
11940
|
11968
|
if (!options.templateOptions.options) {
|
11941
|
11969
|
options.templateOptions.options = [];
|
11942
|
11970
|
}
|
|
@@ -11997,7 +12025,7 @@ appFormly.config(function config(formlyConfigProvider) {
|
11997
|
12025
|
items.inputModel = angular.copy(
|
11998
|
12026
|
options.templateOptions.options
|
11999
|
12027
|
);
|
12000
|
|
- selectItem(pmodel, options.templateOptions.options);
|
|
12028
|
+ selectItem(pmodel, options.templateOptions.options);//baba
|
12001
|
12029
|
} else {
|
12002
|
12030
|
// items.inputModel = options.templateOptions.options;
|
12003
|
12031
|
}
|