Pārlūkot izejas kodu

修改根绝owner查不到数据问题

吴学文 7 gadi atpakaļ
vecāks
revīzija
0eab3c5812

+ 1 - 1
UserService/src/main/java/com/java110/user/listener/owner/AbstractOwnerBusinessServiceDataFlowListener.java

@@ -60,7 +60,7 @@ public abstract class AbstractOwnerBusinessServiceDataFlowListener extends Abstr
     protected void autoSaveDelBusinessOwner(Business business, JSONObject businessOwner) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("ownerId", businessOwner.getString("ownerId"));
+        info.put("memberId", businessOwner.getString("memberId"));
         info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentOwnerInfos = getOwnerServiceDaoImpl().getOwnerInfo(info);
         if (currentOwnerInfos == null || currentOwnerInfos.size() != 1) {

+ 4 - 1
WebService/src/main/resources/components/add-owner/addOwner.js

@@ -1,6 +1,9 @@
 (function(vc){
 
     vc.extends({
+        propTypes: {
+               notifyLoadDataComponentName:vc.propTypes.string
+        },
         data:{
             addOwnerInfo:{
                 name:'',
@@ -102,7 +105,7 @@
                             //关闭model
                             $('#addOwnerModel').modal('hide');
                             vc.component.clearAddOwnerInfo();
-                            vc.emit('listOwner','listOwnerData',{});
+                            vc.emit($props.notifyLoadDataComponentName,'listOwnerData',{});
 
                             return ;
                         }

+ 4 - 1
WebService/src/main/resources/components/delete-owner/deleteOwner.js

@@ -1,5 +1,8 @@
 (function(vc){
     vc.extends({
+        propTypes: {
+                notifyLoadDataComponentName:vc.propTypes.string
+        },
         data:{
             deleteOwnerInfo:{}
         },
@@ -28,7 +31,7 @@
                         if(res.status == 200){
                             //关闭model
                             $('#deleteOwnerModel').modal('hide');
-                            vc.emit('listOwner','listOwnerData',{});
+                            vc.emit($props.notifyLoadDataComponentName,'listOwnerData',{});
                             return ;
                         }
                         vc.component.deleteOwnernfo.errorInfo = json;

+ 4 - 1
WebService/src/main/resources/components/edit-owner/editOwner.js

@@ -1,6 +1,9 @@
 (function(vc){
 
     vc.extends({
+        propTypes: {
+            notifyLoadDataComponentName:vc.propTypes.string
+        },
         data:{
             editOwnerInfo:{
                 ownerId:'',
@@ -102,7 +105,7 @@
                             //关闭model
                             $('#editOwnerModel').modal('hide');
                             vc.component.clearEditOwnerInfo();
-                            vc.emit('listOwner','listOwnerData',{});
+                            vc.emit($props.notifyLoadDataComponentName,'listOwnerData',{});
 
                             return ;
                         }

+ 7 - 3
WebService/src/main/resources/components/list-owner-member/listOwnerMember.html

@@ -48,7 +48,7 @@
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(owner)">修改</button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDelOwnerModel(owner)">删除</button>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerModel(owner)">删除</button>
                                 </div>
                             </td>
                         </tr>
@@ -67,6 +67,10 @@
         </div>
     </div>
     <!-- 删除员工权限 -->
-    <vc:create name="editOwner"></vc:create>
-    <vc:create name="deleteOwner"></vc:create>
+    <vc:create name="editOwner"
+               notifyLoadDataComponentName="listOwnerMember"
+    ></vc:create>
+    <vc:create name="deleteOwner"
+               notifyLoadDataComponentName="listOwnerMember"
+    ></vc:create>
 </div>

+ 7 - 7
WebService/src/main/resources/components/list-owner-member/listOwnerMember.js

@@ -12,21 +12,21 @@
         },
         _initEvent:function(){
 
-            vc.on('member','loadOwner',function(_param){
+            vc.on('listOwnerMember','loadOwner',function(_param){
                 vc.component._loadOwners(_param);
             });
-            vc.on('member','loadData',function(_param){
+            vc.on('listOwnerMember','listOwnerData',function(_param){
                 vc.component._loadOwners(_param);
             });
         },
         methods:{
             _loadOwners:function(_param){
-                vc.component.memberInfo._currentOwnerId=_param.ownerId;
+                if(_param.hasOwnProperty('ownerId')){
+                    vc.component.memberInfo._currentOwnerId=_param.ownerId;
+                }
                 var param = {
                     params:{
-                        page:1,
-                        row:15,
-                        ownerId:_param.ownerId,
+                        ownerId:vc.component.memberInfo._currentOwnerId,
                         communityId:vc.getCurrentCommunity().communityId,
                         ownerTypeCd:'1002'
                     }
@@ -49,7 +49,7 @@
             },
             _openEditOwnerModel:function(_member){
                 _member.ownerId = vc.component.memberInfo._currentOwnerId;
-                vc.emit('editOwner','openOwnerModel',_member);
+                vc.emit('editOwner','openEditOwnerModal',_member);
             }
         }
     });

+ 12 - 3
WebService/src/main/resources/components/list-owner/listOwner.html

@@ -76,8 +76,17 @@
         </div>
     </div>
 
-    <vc:create name="addOwner"></vc:create>
-    <vc:create name="editOwner"></vc:create>
-    <vc:create name="deleteOwner"></vc:create>
+    <vc:create
+            name="addOwner"
+            notifyLoadDataComponentName="listOwner"
+    ></vc:create>
+    <vc:create
+            name="editOwner"
+            notifyLoadDataComponentName="listOwner"
+
+    ></vc:create>
+    <vc:create name="deleteOwner"
+               notifyLoadDataComponentName="listOwner"
+    ></vc:create>
 
 </div>

+ 5 - 2
WebService/src/main/resources/components/member-select-owner/memberSelectOwner.html

@@ -67,7 +67,10 @@
     </div>
     <vc:create name="searchOwner"
                emitChooseOwner="memberSelectOwner"
-               emitLoadData="member"
+               emitLoadData="listOwnerMember"
+    ></vc:create>
+    <vc:create
+            name="addOwner"
+            notifyLoadDataComponentName="listOwnerMember"
     ></vc:create>
-    <vc:create name="addOwner"></vc:create>
 </div>

+ 1 - 1
WebService/src/main/resources/components/search-owner/searchOwner.js

@@ -47,7 +47,7 @@
             },
             chooseOwner:function(_owner){
                 vc.emit($props.emitChooseOwner,'chooseOwner',_owner);
-                vc.emit($props.emitLoadData,'loadData',{
+                vc.emit($props.emitLoadData,'listOwnerData',{
                     ownerId:_owner.ownerId
                 });
                 $('#searchOwnerModel').modal('hide');