diff --git a/public/components/property/addLocation/addLocation.html b/public/components/property/addLocation/addLocation.html
index 53f860f59..47be63ea8 100644
--- a/public/components/property/addLocation/addLocation.html
+++ b/public/components/property/addLocation/addLocation.html
@@ -23,6 +23,7 @@
                                         <option value="2000">单元</option>
                                         <option value="3000">房屋</option>
                                         <option value="4000">停车场</option>
+                                        <option value="5000">部门</option>
                                     </select> </div>
                             </div>
 
diff --git a/public/components/property/addMachine/addMachine.html b/public/components/property/addMachine/addMachine.html
index 59607bd16..323b6c6d1 100644
--- a/public/components/property/addMachine/addMachine.html
+++ b/public/components/property/addMachine/addMachine.html
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加设备门禁</h3>
+                <h3 class="m-t-none m-b ">添加设备</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -102,6 +102,24 @@
                             </div>
                         </div>
 
+                        <div class="form-group row" v-show="addMachineInfo.locationType == '5000'  ">
+                            <label class="col-sm-2 col-form-label">归属部门</label>
+                            <div class="col-sm-10">
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                      <vc:create path="frame/orgSelect2" parentModal="addMachineModel"
+                                        callBackListener="addMachine" callBackFunction="notify"
+                                        namespace="addMachine"></vc:create>
+                                    </div>
+                                    <div class="col-sm-6">
+                                      <vc:create path="frame/departmentSelect2" parentModal="addMachineModel"
+                                        callBackListener="addMachine" callBackFunction="notify"
+                                        namespace="addMachine"></vc:create>
+                                    </div>
+                                  </div>
+                            </div>
+                        </div>
+
                         <div class="form-group row">
                             <label class="col-sm-2 col-form-label">设备IP</label>
                             <div class="col-sm-10">
diff --git a/public/components/property/addMachine/addMachine.js b/public/components/property/addMachine/addMachine.js
index 3cf22efd1..f7963e202 100644
--- a/public/components/property/addMachine/addMachine.js
+++ b/public/components/property/addMachine/addMachine.js
@@ -22,6 +22,7 @@
                 unitName: '',
                 roomId: '',
                 paId: '',
+                orgId: '',
                 locationTypeCd: '',
                 locationObjId: '',
                 roomName: '',
@@ -57,7 +58,13 @@
                 if (_param.hasOwnProperty("paId")) {
                     vc.component.addMachineInfo.paId = _param.paId;
                 }
+                
             });
+            vc.on('addMachine', 'staffSelect2', 'setStaff',function(_param){
+                if (_param.hasOwnProperty("orgId")) {
+                    vc.component.addMachineInfo.orgId = _param.orgId;
+                }
+            })
         },
         methods: {
             addMachineValidate: function () {
@@ -167,6 +174,7 @@
                 if (vc.component.addMachineInfo.locationType != '2000'
                     && vc.component.addMachineInfo.locationType != '3000'
                     && vc.component.addMachineInfo.locationType != '4000'
+                    && vc.component.addMachineInfo.locationType != '5000'
                 ) { //大门时直接写 小区ID
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                 } else if (vc.component.addMachineInfo.locationType == '2000') {
@@ -175,6 +183,8 @@
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
                 } else if (vc.component.addMachineInfo.locationType == '4000') {
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.paId;
+                } else if (vc.component.addMachineInfo.locationType == '5000') {
+                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.orgId;
                 } else {
                     vc.toast("设备位置值错误");
                     return;
@@ -241,7 +251,8 @@
                     unitId: '',
                     unitName: '',
                     roomId: '',
-                    paId: ''
+                    paId: '',
+                    orgId: ''
                 };
             },
             _initAddMachineData: function () {
diff --git a/public/components/property/editLocation/editLocation.html b/public/components/property/editLocation/editLocation.html
index d533f3585..7fa29d2a6 100644
--- a/public/components/property/editLocation/editLocation.html
+++ b/public/components/property/editLocation/editLocation.html
@@ -23,6 +23,7 @@
                                         <option value="2000">单元</option>
                                         <option value="3000">房屋</option>
                                         <option value="4000">停车场</option>
+                                        <option value="5000">部门</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/components/property/editMachine/editMachine.html b/public/components/property/editMachine/editMachine.html
index 3c8ac0121..8a9f9a550 100644
--- a/public/components/property/editMachine/editMachine.html
+++ b/public/components/property/editMachine/editMachine.html
@@ -92,7 +92,7 @@
                                 </vc:create>
                             </div>
                         </div>
-                        <div class="form-group row" v-show="addMachineInfo.locationType == '4000'  ">
+                        <div class="form-group row" v-show="editMachineInfo.locationType == '4000'  ">
                             <label class="col-sm-2 col-form-label">归属停车场</label>
                             <div class="col-sm-10">
                                 <vc:create path="property/parkingAreaSelect2" parentModal="editMachineModel"
@@ -100,6 +100,24 @@
                                 </vc:create>
                             </div>
                         </div>
+
+                        <div class="form-group row" v-show="editMachineInfo.locationType == '5000'  ">
+                            <label class="col-sm-2 col-form-label">归属部门</label>
+                            <div class="col-sm-10">
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                      <vc:create path="frame/orgSelect2" parentModal="editMachineModel"
+                                        callBackListener="editMachine" callBackFunction="notify"
+                                        namespace="editMachine"></vc:create>
+                                    </div>
+                                    <div class="col-sm-6">
+                                      <vc:create path="frame/departmentSelect2" parentModal="editMachineModel"
+                                        callBackListener="editMachine" callBackFunction="notify"
+                                        namespace="editMachine"></vc:create>
+                                    </div>
+                                  </div>
+                            </div>
+                        </div>
                         <div class="form-group row">
                             <label class="col-sm-2 col-form-label">设备IP</label>
                             <div class="col-sm-10">
diff --git a/public/components/property/editMachine/editMachine.js b/public/components/property/editMachine/editMachine.js
index 145881f88..93e7d15b8 100644
--- a/public/components/property/editMachine/editMachine.js
+++ b/public/components/property/editMachine/editMachine.js
@@ -18,6 +18,7 @@
                 unitNum: '',
                 roomId: '',
                 paId: '',
+                orgId: '',
                 locationTypeCd: '',
                 locationObjId: '',
                 roomNum: '',
@@ -75,6 +76,11 @@
                         paId: vc.component.editMachineInfo.paId,
                         num: vc.component.editMachineInfo.num
                     });
+                } else if (vc.component.editMachineInfo.locationTypeCd == '5000') {
+                    vc.emit('editMachine', 'orgSelect2', 'setOrg', {
+                        orgId: vc.component.editMachineInfo.orgId,
+                        num: vc.component.editMachineInfo.num
+                    });
                 }
 
                 if (_params.hasOwnProperty('machineAttrs')) {
@@ -104,6 +110,11 @@
                     vc.component.editMachineInfo.roomId = _param.roomId;
                 }
             });
+            vc.on('editMachine', 'staffSelect2', 'setStaff',function(_param){
+                if (_param.hasOwnProperty("orgId")) {
+                    vc.component.addMachineInfo.orgId = _param.orgId;
+                }
+            })
         },
         methods: {
             _initMachineUrl: function () {
@@ -234,7 +245,8 @@
                 vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
                 if (vc.component.editMachineInfo.locationType != '2000'
                     && vc.component.editMachineInfo.locationType != '3000'
-                    && vc.component.editMachineInfo.locationType != '4000') { //大门时直接写 小区ID
+                    && vc.component.editMachineInfo.locationType != '4000'
+                    && vc.component.editMachineInfo.locationType != '5000') { //大门时直接写 小区ID
                     vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId;
                 } else if (vc.component.editMachineInfo.locationType == '2000') {
                     vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId;
@@ -242,6 +254,8 @@
                     vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId;
                 } else if (vc.component.editMachineInfo.locationType == '4000') {
                     vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.paId;
+                } else if (vc.component.addMachineInfo.locationType == '5000') {
+                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.orgId;
                 } else {
                     vc.toast("设备位置值错误");
                     return;