From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName

---
 WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js b/WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js
index a6e0845..c04abda 100644
--- a/WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js
+++ b/WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js
@@ -1,6 +1,10 @@
 (function(vc,vm){
 
     vc.extends({
+        propTypes: {
+                   callBackListener:vc.propTypes.string, //鐖剁粍浠跺悕绉�
+                   callBackFunction:vc.propTypes.string //鐖剁粍浠剁洃鍚柟娉�
+        },
         data:{
             addUnitInfo:{
                 floorId:'',
@@ -15,12 +19,29 @@
 
          },
          _initEvent:function(){
+             vc.on('addUnit','openAddUnitModal',function(_params){
+                 vc.component.refreshAddUnitInfo();
+                $('#addUnitModel').modal('show');
+                 if(_params.hasOwnProperty("floorId") && vc.notNull(_params.floorId)){
+                     vc.component.addUnitInfo.floorId = _params.floorId;
+                 }
+                vc.component.addUnitInfo.communityId = vc.getCurrentCommunity().communityId;
+             });
              vc.on('addUnit','addUnitModel',function(_params){
                 vc.component.refreshAddUnitInfo();
+
                 $('#addUnitModel').modal('show');
-                vc.component.addUnitInfo.floorId = _params.floorId;
+                if(_params.hasOwnProperty("floorId") && vc.notNull(_params.floorId)){
+                    vc.component.addUnitInfo.floorId = _params.floorId;
+                }
                 vc.component.addUnitInfo.communityId = vc.getCurrentCommunity().communityId;
             });
+             vc.on('addUnit','onFloorInfo',function (_params) {
+                 if(_params.hasOwnProperty("floorId") && vc.notNull(_params.floorId)){
+                     vc.component.addUnitInfo.floorId = _params.floorId;
+                 }
+                 vc.component.addUnitInfo.communityId = vc.getCurrentCommunity().communityId;
+             });
         },
         methods:{
             addUnitValidate:function(){
@@ -41,9 +62,9 @@
                                     errInfo:"鍗曞厓缂栧彿涓嶈兘涓虹┖"
                                 },
                                 {
-                                    limit:"maxLength",
-                                    param:"12",
-                                    errInfo:"鍗曞厓缂栧彿闀垮害涓嶈兘瓒呰繃12浣�"
+                                    limit:"num",
+                                    param:"",
+                                    errInfo:"鍗曞厓缂栧彿蹇呴』涓烘暟瀛�"
                                 },
                             ],
                             'addUnitInfo.layerCount':[
@@ -77,7 +98,16 @@
              },
             addUnit:function(){
                 if(!vc.component.addUnitValidate()){
-                    vc.message(vc.validate.errInfo);
+                    vc.toast(vc.validate.errInfo);
+                    return ;
+                }
+
+                 vc.component.addUnitInfo.communityId = vc.getCurrentCommunity().communityId;
+
+                //涓嶆彁浜ゆ暟鎹皢鏁版嵁 鍥炶皟缁欎睛鍚鐞�
+                if(vc.notNull($props.callBackListener)){
+                    vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addUnitInfo);
+                    $('#addUnitModel').modal('hide');
                     return ;
                 }
 

--
Gitblit v1.8.0