添加房屋 bug 优化

WebService/src/main/resources/components/floorPackage/view-floor-info/viewFloorInfo.html

@@ -4,36 +4,48 @@
             <div class="ibox-title">
                 <h5>楼信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" v-if="viewFloorInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectFloorInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择楼</button>
+                    <button type="button" v-if="viewFloorInfo.index != 2" class="btn btn-primary btn-sm"
+                            style="margin-right:10px;" v-on:click="_openSelectFloorInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择楼
+                    </button>
 
-                    <button type="button" v-if="viewFloorInfo.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAddFloorInfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加楼</button>
+                    <button type="button" v-if="viewFloorInfo.index != 2" class="btn btn-primary btn-sm"
+                            v-on:click="_openAddFloorInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加楼
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
                 <div class="row">
-<div class="col-sm-4">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >楼名称：</label>
+                            <label class="col-form-label">楼ID：</label>
+                            <label class="">{{viewFloorInfo.floorId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">楼名称：</label>
                             <label class="">{{viewFloorInfo.name}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >楼编号：</label>
+                            <label class="col-form-label">楼编号：</label>
                             <label class="">{{viewFloorInfo.floorNum}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >备注：</label>
+                            <label class="col-form-label">楼名称：</label>
                             <label class="">{{viewFloorInfo.remark}}</label>
                         </div>
-</div>
-</div>
-
+                    </div>
+                </div>
             </div>
+
         </div>
     </div>
 

WebService/src/main/resources/components/floorPackage/view-floor-info/viewFloorInfo.js

@@ -12,9 +12,10 @@
             viewFloorInfo:{
                 index:0,
                 flowComponent:'viewFloorInfo',
+                floorId:'',
                 name:'',
-floorNum:'',
-remark:'',
+                floorNum:'',
+                remark:'',
 
             }
         },
@@ -26,6 +27,12 @@ remark:'',
             vc.on('viewFloorInfo','chooseFloor',function(_app){
                 vc.copyObject(_app, vc.component.viewFloorInfo);
                 vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewFloorInfo);
+                vc.emit('chooseUnit', 'onFloorInfo', {
+                    floorId: vc.component.viewFloorInfo.floorId
+                });
+                vc.emit('viewUnitInfo', 'onFloorInfo', {
+                    floorId: vc.component.viewFloorInfo.floorId
+                });
             });
 
             vc.on('viewFloorInfo', 'onIndex', function(_index){

WebService/src/main/resources/components/roomPackage/addRoomView/addRoomView.html

@@ -10,49 +10,55 @@
             <div class="ibox-content">
 
                 <div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋编号</label>
-         <div class="col-sm-10">
-           <input v-model="addRoomViewInfo.roomNum"                   type="text" placeholder="必填，请填写房屋编号" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋楼层</label>
-         <div class="col-sm-10">
-           <input v-model="addRoomViewInfo.layer"                   type="text" placeholder="必填，请填写房屋楼层" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房间数</label>
-         <div class="col-sm-10">
-           <input v-model="addRoomViewInfo.section"                   type="text" placeholder="必填，请填写房间数" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋户型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addRoomViewInfo.apartment">
-         <option selected  disabled value="">必填，请选择房屋户型</option>
-         <option  value="一室两厅">1010</option>
-<option  value="两室两厅">2020</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">建筑面积</label>
-         <div class="col-sm-10">
-           <input v-model="addRoomViewInfo.builtUpArea"                   type="text" placeholder="必填，请填写建筑面积" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋单价</label>
-         <div class="col-sm-10">
-           <input v-model="addRoomViewInfo.unitPrice"                   type="text" placeholder="必填，请填写房屋单价" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写备注" class="form-control" v-model="addRoomViewInfo.remark"></textarea>         </div>
-</div>
+                    <label class="col-sm-2 col-form-label">房屋编号</label>
+                    <div class="col-sm-10">
+                        <input v-model="addRoomViewInfo.roomNum" type="text" placeholder="必填，请填写房屋编号"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">房屋楼层</label>
+                    <div class="col-sm-10">
+                        <input v-model="addRoomViewInfo.layer" type="text" placeholder="必填，请填写房屋楼层"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">房间数</label>
+                    <div class="col-sm-10">
+                        <input v-model="addRoomViewInfo.section" type="text" placeholder="必填，请填写房间数"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">房屋户型</label>
+                    <div class="col-sm-10">
+                        <select class="custom-select" v-model="addRoomViewInfo.apartment">
+                            <option selected disabled value="">必填，请选择房屋户型</option>
+                            <option value="1010">一室两厅</option>
+                            <option value="2020">两室两厅</option>
+                        </select></div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">建筑面积</label>
+                    <div class="col-sm-10">
+                        <input v-model="addRoomViewInfo.builtUpArea" type="text" placeholder="必填，请填写建筑面积"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">房屋单价</label>
+                    <div class="col-sm-10">
+                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="必填，请填写房屋单价"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">备注</label>
+                    <div class="col-sm-10">
+                        <textarea placeholder="选填，请填写备注" class="form-control"
+                                  v-model="addRoomViewInfo.remark"></textarea></div>
+                </div>
 
             </div>
         </div>

WebService/src/main/resources/components/servicePackage/service-binding/serviceBinding.js

@@ -52,11 +52,7 @@
             },
             _finishStep:function(){
 
-                var _currentData = vc.component.serviceBindingInfo.infos[vc.component.serviceBindingInfo.index];
-                if( _currentData == null || _currentData == undefined){
-                    vc.message("请选择相关信息");
-                    return ;
-                }
+
 
                 var param = {
                     data:vc.component.serviceBindingInfo.infos

WebService/src/main/resources/components/unitPackage/choose-unit/chooseUnit.js

@@ -8,6 +8,7 @@
             chooseUnitInfo:{
                 units:[],
                 _currentUnitName:'',
+                floorId:'',
             }
         },
         _initMethod:function(){
@@ -18,6 +19,9 @@
                 vc.component._refreshChooseUnitInfo();
                 vc.component._loadAllUnitInfo(1,10,'');
             });
+            vc.on('chooseUnit','onFloorInfo',function(_param){
+                vc.component.chooseUnitInfo.floorId = _param.floorId;
+            });
         },
         methods:{
             _loadAllUnitInfo:function(_page,_row,_name){
@@ -26,6 +30,7 @@
                         page:_page,
                         row:_row,
                         communityId:vc.getCurrentCommunity().communityId,
+                        floorId:vc.component.chooseUnitInfo.floorId,
                         name:_name
                     }
                 };
@@ -36,7 +41,7 @@
                              param,
                              function(json){
                                 var _unitInfo = JSON.parse(json);
-                                vc.component.chooseUnitInfo.units = _unitInfo.units;
+                                vc.component.chooseUnitInfo.units = _unitInfo;
                              },function(){
                                 console.log('请求失败处理');
                              }

WebService/src/main/resources/components/unitPackage/view-unit-info/viewUnitInfo.html

@@ -4,42 +4,54 @@
             <div class="ibox-title">
                 <h5>单元信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" v-if="viewUnitInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectUnitInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择单元</button>
+                    <button type="button" v-if="viewUnitInfo.index != 2 && viewUnitInfo.floorId !=''"
+                            class="btn btn-primary btn-sm" style="margin-right:10px;"
+                            v-on:click="_openSelectUnitInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择单元
+                    </button>
 
-                    <button type="button" v-if="viewUnitInfo.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAddUnitInfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加单元</button>
+                    <button type="button" v-if="viewUnitInfo.index != 2" class="btn btn-primary btn-sm"
+                            v-on:click="_openAddUnitInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加单元
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
                 <div class="row">
-<div class="col-sm-4">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >单元编号：</label>
+                            <label class="col-form-label">单元ID：</label>
+                            <label class="">{{viewUnitInfo.unitId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">单元编号：</label>
                             <label class="">{{viewUnitInfo.unitNum}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >总层数：</label>
+                            <label class="col-form-label">总层数：</label>
                             <label class="">{{viewUnitInfo.layerCount}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >电梯：</label>
+                            <label class="col-form-label">电梯：</label>
                             <label class="">{{viewUnitInfo.lift}}</label>
                         </div>
-</div>
-</div>
-<div class="row">
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >备注：</label>
+                            <label class="col-form-label">备注：</label>
                             <label class="">{{viewUnitInfo.remark}}</label>
                         </div>
-</div>
-</div>
+                    </div>
+                </div>
 
             </div>
         </div>

WebService/src/main/resources/components/unitPackage/view-unit-info/viewUnitInfo.js

@@ -12,10 +12,12 @@
             viewUnitInfo:{
                 index:0,
                 flowComponent:'viewUnitInfo',
+                unitId:'',
                 unitNum:'',
-layerCount:'',
-lift:'',
-remark:'',
+                layerCount:'',
+                lift:'',
+                remark:'',
+                floorId:'',
 
             }
         },
@@ -33,6 +35,10 @@ remark:'',
                 vc.component.viewUnitInfo.index = _index;
             });
 
+            vc.on('viewUnitInfo','onFloorInfo',function(_param){
+                vc.component.viewUnitInfo.floorId = _param.floorId;
+            });
+
         },
         methods:{
 

java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java

@@ -273,6 +273,18 @@ public class GeneratorBindingComponent extends BaseGenerator {
 
         // 替换 数据校验部分代码
 
+        String needCheckCurrentData = "var _currentData = vc.component."+data.getString("templateCode")+"Info.infos[vc.component."+data.getString("templateCode")+"Info.index];\n" +
+                "                if( _currentData == null || _currentData == undefined){\n" +
+                "                    vc.message(\"请选择或填写必选信息\");\n" +
+                "                    return ;\n" +
+                "                }";
+
+        if(data.getBoolean("needAffirm")){
+            fileContext = fileContext.replace("@@needCheckCurrentData@@", "");
+        }else{
+            fileContext = fileContext.replace("@@needCheckCurrentData@@", needCheckCurrentData);
+        }
+
 
         String writePath = this.getClass().getResource("/").getPath()
                 + "out/relationship/component/" + data.getString("package") + "/" + data.getString("templateCode") + "/" + data.getString("templateCode") + ".js";

java110-code-generator/src/main/java/com/java110/code/web/GeneratorViewComponent.java

@@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.code.BaseGenerator;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
+import java.util.Map;
+
 public class GeneratorViewComponent extends BaseGenerator {
 
     public void generator(JSONObject data) {
@@ -34,8 +37,14 @@ public class GeneratorViewComponent extends BaseGenerator {
         StringBuffer thSb = new StringBuffer();
 
         JSONArray columns = data.getJSONArray("columns");
-        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
-            JSONObject column = columns.getJSONObject(columnIndex);
+
+        JSONArray cols = new JSONArray();
+        JSONObject col = new JSONObject();
+        col.put("cnCode", data.getString("templateKeyName"));
+        col.put("code", data.getString("templateKey"));
+        cols.addAll(columns);
+        for (int columnIndex = 0; columnIndex < cols.size(); columnIndex++) {
+            JSONObject column = cols.getJSONObject(columnIndex);
             if(columnIndex % 3 == 0){
                 thSb.append("<div class=\"row\">\n");
             }

java110-code-generator/src/main/resources/relationship/binding/binding.js

@@ -49,11 +49,7 @@
             _finishStep:function(){
 
 
-                var _currentData = vc.component.@@templateCode@@Info.infos[vc.component.@@templateCode@@Info.index];
-                if( _currentData == null || _currentData == undefined){
-                    vc.message("请选择或填写必选信息");
-                    return ;
-                }
+                @@needCheckCurrentData@@
 
                 var param = {
                     data:vc.component.@@templateCode@@Info.infos