Merge remote-tracking branch 'origin/master'

WebService/src/main/resources/components/feePackage/add-feeConfig/addFeeConfig.js

@@ -206,6 +206,8 @@
                 });
             },
             clearAddFeeConfigInfo: function() {
+                var _feeTypeCds =  vc.component.addFeeConfigInfo.feeTypeCds;
+                var _computingFormulas = vc.component.addFeeConfigInfo.computingFormulas;
                 vc.component.addFeeConfigInfo = {
                     feeTypeCd: '',
                     feeName: '',
@@ -215,6 +217,8 @@
                     computingFormula: '',
                     squarePrice: '',
                     additionalAmount: '',
+                    feeTypeCds:_feeTypeCds,
+                    computingFormulas:_computingFormulas
 
                 };
             }

WebService/src/main/resources/components/ownerRepairPackage/repairDispatchStep/repairDispatchStep.js

@@ -122,7 +122,7 @@
 
                            vc.message('处理成功',true);
                            //关闭model
-                           vc.jumpToPage("/flow/repairDispatch?" + vc.objToGetParam(JSON.parse(json)));
+                           vc.jumpToPage("/flow/repairDispatchFlow?" + vc.objToGetParam(JSON.parse(json)));
                            return ;
                        }
                        vc.message(json);

WebService/src/main/resources/components/roomPackage/search-room/searchRoom.html

@@ -38,12 +38,10 @@
                                     <thead>
                                     <tr>
                                         <th>房屋ID</th>
+                                        <th>楼栋编号</th>
+                                        <th>单元编号</th>
                                         <th>房屋编号</th>
-                                        <th>单元</th>
                                         <th>楼层</th>
-                                        <th>房间数</th>
-                                        <th>户型</th>
-                                        <th>创建员工</th>
                                         <th>操作</th>
                                     </tr>
                                     </thead>
@@ -52,24 +50,17 @@
                                         <td>
                                             {{room.roomId}}
                                         </td>
-
-                                        <td>
-                                            {{room.roomNum}}
-                                        </td>
-                                        <td>
-                                            {{room.unitNum}}
-                                        </td>
                                         <td>
-                                            {{room.layer}}
+                                            {{room.floorNum}}号楼
                                         </td>
                                         <td>
-                                            {{room.section}}
+                                            {{room.unitNum}}单元
                                         </td>
                                         <td>
-                                            {{room.apartmentName}}
+                                            {{room.roomNum}}室
                                         </td>
                                         <td>
-                                            {{room.userName}}
+                                            {{room.layer}}层
                                         </td>
                                         <td>
                                             <button class="btn btn-primary btn-xs" v-on:click="chooseRoom(room)">选择

WebService/src/main/resources/components/roomPackage/sell-room-select-room/sellRoomSelectRoom.html

@@ -79,6 +79,6 @@
     <vc:create name="searchRoom"
                emitChooseRoom="sellRoomSelectRoom"
                emitLoadData="sellRoomOther"
-               roomFlag="2"
+               roomFlag="1"
     ></vc:create>
 </div>