From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js b/WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js
index 08b5607..e969a37 100644
--- a/WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js
+++ b/WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js
@@ -27,14 +27,20 @@
_initEvent: function () {
vc.on('inspectionRouteSelect2', 'setInspectionRoute', function (_param) {
vc.copyObject(_param, this.inspectionRouteSelect2Info);
- // var option = new Option(_param.routeName, _param.inspectionRouteId, true, true);
- // this.inspectionRouteSelect2Info.inspectionRouteSelector.append(option);
- var routeIds = _param.inspectionRouteId.split(",");
- var routeIdArray = new Array()
- for( var i = 0; i < routeIds.length; i++){
- routeIdArray[i] = routeIds[i];
+ var name = _param.routeName.split(",");
+ var ids = _param.inspectionRouteId.split(",");
+ for( var i = 0; i < name.length; i++){
+ var option = new Option(name[i],ids[i], true, true);
+ this.inspectionRouteSelect2Info.inspectionRouteSelector.append(option);
}
- $("#inspectionRouteSelector").val(routeIdArray).trigger("change");
+ //var option = new Option(_param.routeName, _param.inspectionRouteId, true, true);
+
+ // var routeIds = _param.inspectionRouteId.split(",");
+ // var routeIdArray = new Array()
+ // for( var i = 0; i < routeIds.length; i++){
+ // routeIdArray[i] = routeIds[i];
+ // }
+ // $("#inspectionRouteSelector").val(routeIdArray).trigger("change");
});
vc.on('inspectionRouteSelect2', 'clearInspectionRoute', function (_param) {
@@ -44,6 +50,7 @@
routeName: '',
inspectionRouteSelector: {}
};
+ $("#inspectionRouteSelector").val(null).trigger('change');
});
},
methods: {
--
Gitblit v1.8.0