Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -75,6 +75,10 @@
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
                                    <label for="serverBox6"> 包车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''} onclick="TCarInfoDlg.jsjServerClick()">
                                    <label for="serverBox7"> 接送机 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>
@@ -96,6 +100,17 @@
                                <option value="">选择车型</option>
                                @for(obj in kcModelList){
                                <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <div class="form-group" id="jsjModelDiv">
                        <label class="col-sm-3 control-label">接送机车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="jsjModel" name="jsjModel">
                                <option value="">选择车型</option>
                                @for(obj in jsjModelList){
                                <option value="${obj.id}" ${obj.id == jsjModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
@@ -214,6 +229,7 @@

        TCarInfoDlg.zcServerClick();
        TCarInfoDlg.kcServerClick();
        TCarInfoDlg.jsjServerClick();

    });
</script>