优化 单元房屋编辑时的显示

WebService/src/main/resources/components/floorPackage/floor-select2/floorSelect2.js

@@ -9,7 +9,7 @@
                 floorId: '-1',
                 floorNum: '',
                 floorName: '',
-                floorSelector:{},
+                floorSelector: {},
             }
         },
         watch: {
@@ -30,12 +30,12 @@
              })*/
             vc.on('floorSelect2', 'setFloor', function (_param) {
                 vc.copyObject(_param, this.floorSelect2Info);
-               /* $("#floorSelector").val({
-                    id:param.floorId,
-                    text:_param.floorNum
-                }).select2();*/
+                /* $("#floorSelector").val({
+                     id:param.floorId,
+                     text:_param.floorNum
+                 }).select2();*/
 
-                var option = new Option(_param.floorNum, _param.floorId, true, true);
+                var option = new Option(_param.floorNum + '号楼', _param.floorId, true, true);
                 this.floorSelect2Info.floorSelector.append(option);
             });
         },
@@ -48,7 +48,9 @@
                 this.floorSelect2Info.floorSelector = $('#floorSelector').select2({
                     placeholder: '必填，请选择楼栋',
                     allowClear: true,//允许清空
-                    escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
+                    escapeMarkup: function (markup) {
+                        return markup;
+                    }, // 自定义格式化防止xss注入
                     ajax: {
                         url: "/callComponent/floorSelect2/list",
                         dataType: 'json',

WebService/src/main/resources/components/roomPackage/room-select2/roomSelect2.js

@@ -12,6 +12,7 @@
                 unitId:'-1',
                 roomId:'',
                 unitName:'',
+                roomSelector:{}
             }
         },
         watch:{
@@ -35,7 +36,10 @@
            });
             vc.on('roomSelect2','setRoom',function (_param) {
                 vc.copyObject(_param, this.roomSelect2Info);
-                $("#roomSelector").val(_param.roomId).select2();
+                /*$("#roomSelector").val(_param.roomId).select2();*/
+
+                var option = new Option(_param.roomNum , _param.roomId, true, true);
+                this.roomSelect2Info.roomSelector.append(option);
             });
         },
         methods: {
@@ -43,8 +47,12 @@
                 console.log("调用_initRoomSelect2 方法");
                 $.fn.modal.Constructor.prototype.enforceFocus = function () {};
                 $.fn.select2.defaults.set('width', '100%');
-                $('#roomSelector').select2({
+                this.roomSelect2Info.roomSelector = $('#roomSelector').select2({
                     placeholder: '必填，请选择房屋',
+                    allowClear: true,//允许清空
+                    escapeMarkup: function (markup) {
+                        return markup;
+                    }, // 自定义格式化防止xss注入
                     ajax: {
                         url: "/callComponent/roomSelect2/listRoom",
                         dataType: 'json',

WebService/src/main/resources/components/unitPackage/unit-select2/unitSelect2.js

@@ -12,6 +12,7 @@
                 unitId: '-1',
                 unitNum: '',
                 unitName: '',
+                unitSelector:{}
             }
         },
         watch: {
@@ -37,7 +38,9 @@
             });
             vc.on('unitSelect2', 'setUnit', function (_param) {
                 vc.copyObject(_param, this.unitSelect2Info);
-                $(".unitSelector").val(_param.unitId).select2();
+               /* $(".unitSelector").val(_param.unitId).select2();*/
+                var option = new Option(_param.unitNum , _param.unitId, true, true);
+                this.unitSelect2Info.unitSelector.append(option);
             });
         },
         methods: {
@@ -46,8 +49,12 @@
                 $.fn.modal.Constructor.prototype.enforceFocus = function () {
                 };
                 $.fn.select2.defaults.set('width', '100%');
-                $('#unitSelector').select2({
+                this.unitSelect2Info.unitSelector = $('#unitSelector').select2({
                     placeholder: '必填，请选择单元',
+                    allowClear: true,//允许清空
+                    escapeMarkup: function (markup) {
+                        return markup;
+                    }, // 自定义格式化防止xss注入
                     ajax: {
                         url: "/callComponent/unitSelect2/loadUnits",
                         dataType: 'json',