From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug

---
 WebService/src/main/resources/components/orgPackage/add-org/addOrg.js |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/WebService/src/main/resources/components/orgPackage/add-org/addOrg.js b/WebService/src/main/resources/components/orgPackage/add-org/addOrg.js
index 9538a00..67253cd 100644
--- a/WebService/src/main/resources/components/orgPackage/add-org/addOrg.js
+++ b/WebService/src/main/resources/components/orgPackage/add-org/addOrg.js
@@ -56,9 +56,9 @@
                             errInfo:"缁勭粐绾у埆涓嶈兘涓虹┖"
                         },
  {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"鎶ヤ慨浜哄悕绉板繀椤诲湪2鑷�50瀛楃涔嬮棿"
+                            limit:"num",
+                            param:"",
+                            errInfo:"缁勭粐绾у埆閿欒"
                         },
                     ],
 'addOrgInfo.parentOrgId':[
@@ -74,11 +74,7 @@
                         },
                     ],
 'addOrgInfo.description':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"鎻忚堪涓嶈兘涓虹┖"
-                        },
+
  {
                             limit:"maxLength",
                             param:"200",
@@ -135,28 +131,37 @@
             },
             clearAddOrgInfo:function(){
                 vc.component.addOrgInfo = {
-                                            orgName:'',
-                                            orgLevel:'',
-                                            parentOrgId:'',
-                                            description:'',
+                    orgName:'',
+                    orgLevel:'',
+                    parentOrgId:'',
+                    description:'',
+                    parentOrg:[]
             };
             },
-            _parentOrgInfo:function(){
+            _addOrgListParentOrgInfo:function(){
+
+
+                var _tmpOrgLevel = vc.component.addOrgInfo.orgLevel;
+
+                if(_tmpOrgLevel > 1){
+                    _tmpOrgLevel = _tmpOrgLevel-1;
+                }
 
                 var param = {
                     params:{
-                        orgLevel:vc.component.addOrgInfo.orgLevel
+                        orgLevel:_tmpOrgLevel,
+                        page: 1,
+                        row: 30,
                     }
                  };
 
                //鍙戦�乬et璇锋眰
                vc.http.get('addOrg',
-                            'getParentOrg',
+                            'list',
                              param,
                              function(json,res){
                                 var _orgManageInfo=JSON.parse(json);
                                 vc.component.addOrgInfo.parentOrg = _orgManageInfo.orgs;
-
                              },function(errInfo,error){
                                 console.log('璇锋眰澶辫触澶勭悊');
                              }

--
Gitblit v1.8.0