优化添加时位置信息为空的问题

WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.html

@@ -124,7 +124,7 @@
                             v-on:click="saveApplicationKeyInfo()"><i class="fa fa-check"></i>&nbsp;保存
                     </button>
                     <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                            data-dismiss="modal">取消
+                            v-on:click="_closeAddApplicationKeyView()">取消
                     </button>
                 </div>
 

WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js

@@ -199,13 +199,23 @@
                 });
             },
             saveApplicationKeyInfo: function () {
+                vc.component.addApplicationKeyInfo.communityId = vc.getCurrentCommunity().communityId;
+                if (vc.component.addApplicationKeyInfo.locationTypeCd != '2000' && vc.component.addApplicationKeyInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
+                    vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.communityId;
+                } else if (vc.component.addApplicationKeyInfo.locationTypeCd == '2000') {
+                    vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.unitId;
+                } else if (vc.component.addApplicationKeyInfo.locationTypeCd == '3000') {
+                    vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.roomId;
+                } else {
+                    vc.toast("设备位置值错误");
+                    return;
+                }
                 if (!vc.component.addApplicationKeyValidate()) {
                     vc.message(vc.validate.errInfo);
 
                     return;
                 }
 
-                vc.component.addApplicationKeyInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
                 if (vc.notNull($props.callBackListener)) {
                     vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addApplicationKeyInfo);
@@ -261,7 +271,10 @@
                     roomName: ''
 
                 };
-            }
+            },
+            _closeAddApplicationKeyView: function () {
+                vc.emit('applicationKeyManage', 'listApplicationKey', {});
+            },
         }
     });
 

WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html

@@ -124,7 +124,7 @@
                             v-on:click="editApplicationKey()"><i class="fa fa-check"></i>&nbsp;保存
                     </button>
                     <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                            data-dismiss="modal">取消
+                            v-on:click="_closeEditApplicationKeyView()">取消
                     </button>
                 </div>
 

WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.js

@@ -205,6 +205,17 @@
                 });
             },
             editApplicationKey: function () {
+                vc.component.editApplicationKeyInfo.communityId = vc.getCurrentCommunity().communityId;
+                if (vc.component.editApplicationKeyInfo.locationTypeCd != '2000' && vc.component.editApplicationKeyInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
+                    vc.component.editApplicationKeyInfo.locationObjId = vc.component.editApplicationKeyInfo.communityId;
+                } else if (vc.component.editApplicationKeyInfo.locationTypeCd == '2000') {
+                    vc.component.editApplicationKeyInfo.locationObjId = vc.component.editApplicationKeyInfo.unitId;
+                } else if (vc.component.editApplicationKeyInfo.locationTypeCd == '3000') {
+                    vc.component.editApplicationKeyInfo.locationObjId = vc.component.editApplicationKeyInfo.roomId;
+                } else {
+                    vc.toast("设备位置值错误");
+                    return;
+                }
                 if (!vc.component.editApplicationKeyValidate()) {
                     vc.message(vc.validate.errInfo);
                     return;
@@ -244,9 +255,20 @@
                     idCard: '',
                     startTime: '',
                     endTime: '',
-
+                    floorId: '',
+                    floorNum: '',
+                    floorName: '',
+                    unitId: '',
+                    unitName: '',
+                    roomId: '',
+                    locationTypeCd: '',
+                    locationObjId: '',
+                    roomName: ''
                 }
-            }
+            },
+            _closeEditApplicationKeyView: function () {
+                vc.emit('applicationKeyManage', 'listApplicationKey', {});
+            },
         }
     });