Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

Merge remote-tracking branch 'origin/master'

 .idea/workspace.xml

@@ -19,16 +19,20 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="后台代码删除">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="后台代码">
      <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/entity/TCityManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/entity/TCityManager.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar_info.js" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -77,12 +81,13 @@
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1686656087610" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-account/src/main/resources/mapper" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="project.structure.last.edited" value="Global Libraries" />
    <property name="project.structure.proportion" value="0.0" />
    <property name="project.structure.side.proportion" value="0.2" />
    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
  </component>
  <component name="ReactorSettings">
@@ -97,11 +102,11 @@
      <recent name="com.dsh.account.controller" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\static\modular\system" />
      <recent name="F:\code\PlayPai\cloud-server-account\src\main\resources\mapper" />
      <recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system" />
      <recent name="F:\code\PlayPai\cloud-server-competition\src\main\java\com\dsh" />
      <recent name="F:\code\PlayPai\cloud-server-management\src\main\resources\mapper" />
      <recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\static\modular\system" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -198,7 +203,7 @@
      <updated>1686653431962</updated>
      <workItem from="1686653433491" duration="2267000" />
      <workItem from="1690190039038" duration="16883000" />
      <workItem from="1690333209172" duration="23458000" />
      <workItem from="1690333209172" duration="26986000" />
    </task>
    <task id="LOCAL-00001" summary="后台代码删除">
      <created>1690249807612</created>
@@ -270,7 +275,28 @@
      <option name="project" value="LOCAL" />
      <updated>1690362658673</updated>
    </task>
    <option name="localTasksCounter" value="11" />
    <task id="LOCAL-00011" summary="后台代码删除">
      <created>1690363462474</created>
      <option name="number" value="00011" />
      <option name="presentableId" value="LOCAL-00011" />
      <option name="project" value="LOCAL" />
      <updated>1690363462474</updated>
    </task>
    <task id="LOCAL-00012" summary="后台代码">
      <created>1690364368448</created>
      <option name="number" value="00012" />
      <option name="presentableId" value="LOCAL-00012" />
      <option name="project" value="LOCAL" />
      <updated>1690364368448</updated>
    </task>
    <task id="LOCAL-00013" summary="后台代码">
      <created>1690364506501</created>
      <option name="number" value="00013" />
      <option name="presentableId" value="LOCAL-00013" />
      <option name="project" value="LOCAL" />
      <updated>1690364506501</updated>
    </task>
    <option name="localTasksCounter" value="14" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -289,9 +315,9 @@
    <option name="oldMeFiltersMigrated" value="true" />
  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="后台代码" />
    <MESSAGE value="后台代码删除" />
    <option name="LAST_COMMIT_MESSAGE" value="后台代码删除" />
    <MESSAGE value="后台代码" />
    <option name="LAST_COMMIT_MESSAGE" value="后台代码" />
  </component>
  <component name="WindowStateProjectService">
    <state x="590" y="80" key="#&lt;template&gt;_of_Spring_Boot" timestamp="1690338437444">
@@ -326,10 +352,14 @@
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="674" y="382" width="571" height="274" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1032@0.0.1920.1032" timestamp="1690338847091" />
    <state x="519" y="82" key="CommitChangelistDialog2" timestamp="1690362656327">
    <state x="703" y="346" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1690363667225">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="519" y="82" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362656327" />
    <state x="703" y="346" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1032@0.0.1920.1032" timestamp="1690363667225" />
    <state x="519" y="82" key="CommitChangelistDialog2" timestamp="1690364505261">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="519" y="82" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1690364505261" />
    <state width="464" height="466" key="DebuggerActiveHint" timestamp="1690354723383">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
@@ -338,62 +368,62 @@
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="740" y="270" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1690249419357" />
    <state width="1293" height="440" key="GridCell.Tab.0.bottom" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.0.bottom" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.0.center" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.0.center" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.0.left" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.0.left" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.0.right" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.0.right" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.1.bottom" timestamp="1690363241405">
    <state width="1293" height="418" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.1.bottom" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.1.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241405" />
    <state width="1293" height="440" key="GridCell.Tab.1.center" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.1.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.1.center" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.1.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.1.left" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.1.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.1.left" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.1.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="440" key="GridCell.Tab.1.right" timestamp="1690363241404">
    <state width="1293" height="418" key="GridCell.Tab.1.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.1.right" timestamp="1690366694918">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="440" key="GridCell.Tab.1.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
    <state width="1293" height="473" key="GridCell.Tab.2.bottom" timestamp="1690354799499">
    <state width="1293" height="418" key="GridCell.Tab.1.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690366694918" />
    <state width="1293" height="418" key="GridCell.Tab.2.bottom" timestamp="1690366555269">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="473" key="GridCell.Tab.2.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690354799499" />
    <state width="1293" height="473" key="GridCell.Tab.2.center" timestamp="1690354799499">
    <state width="1293" height="418" key="GridCell.Tab.2.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690366555269" />
    <state width="1293" height="418" key="GridCell.Tab.2.center" timestamp="1690366555269">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="473" key="GridCell.Tab.2.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690354799499" />
    <state width="1293" height="473" key="GridCell.Tab.2.left" timestamp="1690354799499">
    <state width="1293" height="418" key="GridCell.Tab.2.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690366555269" />
    <state width="1293" height="418" key="GridCell.Tab.2.left" timestamp="1690366555269">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="473" key="GridCell.Tab.2.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690354799499" />
    <state width="1293" height="473" key="GridCell.Tab.2.right" timestamp="1690354799499">
    <state width="1293" height="418" key="GridCell.Tab.2.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690366555269" />
    <state width="1293" height="418" key="GridCell.Tab.2.right" timestamp="1690366555269">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state width="1293" height="473" key="GridCell.Tab.2.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690354799499" />
    <state width="1293" height="418" key="GridCell.Tab.2.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690366555269" />
    <state x="461" y="160" key="SettingsEditor" timestamp="1690191509088">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="461" y="160" key="SettingsEditor/0.0.1920.1032@0.0.1920.1032" timestamp="1690191509088" />
    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1690362671126">
    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1690364507500">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362671126" />
    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690364507500" />
    <state x="92" y="92" width="1736" height="848" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1690340014123">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
@@ -406,14 +436,14 @@
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="754" y="428" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362660961" />
    <state x="661" y="224" width="646" height="584" key="find.popup" timestamp="1690358747900">
    <state x="661" y="224" width="721" height="584" key="find.popup" timestamp="1690365779184">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="661" y="224" width="646" height="584" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690358747900" />
    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup" timestamp="1690338774328">
    <state x="661" y="224" width="721" height="584" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690365779184" />
    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup" timestamp="1690365810397">
      <screen x="0" y="0" width="1920" height="1032" />
    </state>
    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690338774328" />
    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690365810397" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>

 cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java

@@ -66,5 +66,14 @@
    }


    @PostMapping("/base/city/add")
    public void add(@RequestBody TCityManager manager){
        try {
            cityService.save(manager);
        }catch (Exception e){
            e.printStackTrace();
        }
    }


}

 cloud-server-account/src/main/java/com/dsh/account/entity/TCityManager.java

@@ -1,12 +1,15 @@
package com.dsh.account.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data
@TableName("t_city_manager")
public class TCityManager {
    @TableId(type = IdType.AUTO)
    private Integer id;
    private String name;
    private String phone;

 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java

@@ -22,4 +22,7 @@

    @ApiModelProperty(value = "剩余课时数")
    private int residueNums;

    @ApiModelProperty(value = "课时有效期")
    private String periodOfValidity;
}

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java

@@ -21,4 +21,7 @@
    @ApiModelProperty(value = "剩余学时数")
    private Integer remainingNums;

    @ApiModelProperty(value = "课时有效期")
    private String periodOfValidity;

}

 cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/RecordTimeRequest.java

@@ -18,6 +18,6 @@
    @ApiModelProperty(value = "结束时间 格式：yyyy-MM", dataType = "string")
    private String endTime;

    @ApiModelProperty(value = "类型：1购买课包 2消费扣除 3报名赛事 4介绍有礼 5全部", dataType = "int")
    @ApiModelProperty(value = "类型：1增加 2扣减 ", dataType = "int")
    private Integer type;
}

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -162,6 +162,7 @@
                        course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
                        course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
                        course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
                        course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
                        courseList.add(course);
                    }
                }

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java

@@ -253,6 +253,25 @@
        List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
        purchaseRecordVoList.addAll(purchaseRecordVos1);

        if (purchaseRecordVoList.size() > 0 ){
            purchaseRecordVoList = purchaseRecordVoList.stream()
                    .filter(record -> {
                        String fieldValue = record.getPurchaseAmount();
                        if (ToolUtil.isNotEmpty(timeRequest.getType())){
                            switch (timeRequest.getType()){
                                case 1:
                                    return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
                                case 2:
                                    return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
                                default:
                                    break;
                            }
                        }
                        return false;
                    })
                    .collect(Collectors.toList());
        }

        purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
        return purchaseRecordVoList;
    }

 cloud-server-account/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -1,8 +1,10 @@
package com.dsh.activity.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.CouponPackageReq;
@@ -163,6 +165,23 @@



    @ResponseBody
    @PostMapping("/base/coupon/queryCouponListSearch")
    public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch);
        if (mapList.size() > 0){
            for (Map<String, Object> stringObjectMap : mapList) {
                Integer o = (Integer) stringObjectMap.get("id");
                Object startTime = stringObjectMap.get("startTime");
                Object endTime = stringObjectMap.get("endTime");
                stringObjectMap.put("timeValue",startTime + "至"+endTime);
                int count = ucService.count(new LambdaQueryWrapper<UserCoupon>()
                        .eq(UserCoupon::getCouponId, o));
                stringObjectMap.put("hasPickQty",count);
            }
        }
        return mapList;
    }


}

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java

New file
@@ -0,0 +1,19 @@
package com.dsh.activity.feignclient;


import com.dsh.activity.feignclient.model.CouponListOfSearch;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
import java.util.Map;

@FeignClient(value = "mb-cloud-activity")
public interface CouponClient {


    @PostMapping("/base/coupon/queryCouponListSearch")
    List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch);

}

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java

New file
@@ -0,0 +1,26 @@
package com.dsh.activity.feignclient.model;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

import java.util.Map;

@Data
public class CouponListOfSearch {

    private String name;

    private Integer type;

    private Integer distributionMethod;

    private Integer userPopulation;

    private Integer status;

    private Integer state;

    private Page<Map<String, Object>> page;

}

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java

@@ -1,9 +1,12 @@
package com.dsh.activity.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
@@ -18,4 +21,13 @@

    Map<String, Object> queryConponRuleOfJson(@Param("id") Integer id);


    List<Map<String, Object>> queryCouponListOfSearch(@Param("name")String name,
                                                      @Param("type")Integer type,
                                                      @Param("distributionMethod")Integer distributionMethod,
                                                      @Param("userPopulation")Integer userPopulation,
                                                      @Param("status")Integer status,
                                                      @Param("state")Integer state,
                                                      @Param("page")Page<Map<String, Object>> page);

}

 cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.model.CouponListVo;

import java.util.List;
@@ -26,4 +27,7 @@


    Map<String, Object> queryConponRuleOfJson(Integer id);

    List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch);

}

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java

@@ -10,6 +10,7 @@
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
import com.dsh.activity.feignclient.account.model.Student;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.mapper.CouponMapper;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.service.ICouponService;
@@ -98,4 +99,9 @@
        return this.baseMapper.queryConponRuleOfJson(id);
    }

    @Override
    public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
        return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage());
    }

}

 cloud-server-activity/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-activity/src/main/resources/mapper/CouponMapper.xml

@@ -12,5 +12,41 @@
            and  `id` = #{id}
        </if>
    </select>
    <select id="queryCouponListOfSearch" resultType="java.util.Map">
        SELECT id,
        `name`,
        useScope,
        `type`,
        distributionMethod,
        date_format(startTime ,'%Y-%m-%d') as startTime,
        date_format(endTime ,'%Y-%m-%d') as endTime,
        userPopulation,
        quantityIssued,
        pickUpQuantity,
        `status`,
        state
        from t_coupon
        where 1 = 1
          <if test="name != null">
              and `name` like concat('%', #{}, '%')
          </if>
        <if test="type != null">
            and type = #{type}
        </if>
        <if test="distributionMethod != null">
            and distributionMethod = #{distributionMethod}
        </if>
        <if test="userPopulation != null">
            and userPopulation = #{userPopulation}
        </if>
        <if test="status !=null">
            and `status` = #{status}
        </if>
        <if test="state != null">
            and `state` = #{state}
        </if>
          order by insertTime desc
    </select>


</mapper>

 cloud-server-auth/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-competition/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -119,6 +119,8 @@
                resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
                resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
                resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
                String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
                resp.setPeriodOfValidity(afterDayDate);
                resps.add(resp);
            }
        }

 cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StuCourseResp.java

@@ -22,4 +22,7 @@

    @ApiModelProperty(value = "剩余课时数")
    private int residueNums;

    @ApiModelProperty(value = "课时有效期")
    private String periodOfValidity;
}

 cloud-server-course/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-gateway/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java

@@ -12,4 +12,6 @@
    @PostMapping("/base/city/list")
    Page<TCityManager> list(CityListQuery listQuery);

    @PostMapping("/base/city/add")
    void add(TCityManager manager);
}

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java

New file
@@ -0,0 +1,19 @@
package com.dsh.course.feignClient.activity;


import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
import java.util.Map;

@FeignClient(value = "mb-cloud-activity")
public interface CouponClient {


    @PostMapping("/base/coupon/queryCouponListSearch")
    List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch);

}

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java

New file
@@ -0,0 +1,26 @@
package com.dsh.course.feignClient.activity.model;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

import java.util.Map;

@Data
public class CouponListOfSearch {

    private String name;

    private Integer type;

    private Integer distributionMethod;

    private Integer userPopulation;

    private Integer status;

    private Integer state;

    private Page<Map<String, Object>> page;

}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java

@@ -1,5 +1,7 @@
package com.dsh.guns.modular.system.controller.code;

import cn.hutool.crypto.SecureUtil;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.City;
@@ -12,10 +14,12 @@
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -48,6 +52,8 @@

    @Autowired
    private IStoreService storeService;
    @Autowired
    private ICityService cityService;


    /**
@@ -55,15 +61,19 @@
     */
    @RequestMapping("")
    public String index(Model model) {
        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        model.addAttribute("list",list);
        return PREFIX + "TCity.html";
    }

    /**
     * 跳转到添加车辆管理
     */
    @RequestMapping("/tCompetition_add")
    @RequestMapping("/tCity_add")
    public String tCompetitionAdd(Model model) {
        return PREFIX + "TCompetition_add.html";
        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        model.addAttribute("list",list);
        return PREFIX + "TCity_add.html";
    }


@@ -89,10 +99,18 @@


    @RequestMapping(value = "/add")
    public Object list(Competition competition) {
    @ResponseBody
    public Object list(TCityManager manager) {
        try {
            competitionClient.add(competition);
            return SUCCESS_TIP;
            String pwd = SecureUtil.md5("a123456");
            manager.setPassword(pwd);
            manager.setState(1);
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, manager.getProvinceCode()));
            manager.setProvince(one.getName());
            TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, manager.getCityCode()));
            manager.setCity(one1.getName());
            cityClient.add(manager);
            return new SuccessTip<>();
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
@@ -109,6 +127,17 @@
            return ERROR;
        }
    }
    @RequestMapping(value = "/onChange")
    @ResponseBody
    public Object onChange(Integer oneId) {
        try {
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
            return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }


    @RequestMapping(value = "/cancel")

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java

New file
@@ -0,0 +1,72 @@
package com.dsh.guns.modular.system.controller.code;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.activity.CouponClient;
import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;


/**
 * 优惠券管理 控制器
 */

@Controller
@RequestMapping("/tCouponManage")
public class TCouponController {



    private String PREFIX = "/system/tCoupon/";


    @Resource
    private CouponClient client;

    /**
     * 跳转到优惠券管理首页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TCoupon.html";
    }

    /**
     * 跳转到添加
     */
    @RequestMapping("/coupon_add")
    public String memberCouponAdd() {
        return PREFIX + "TCouponAdd.html";
    }

    /**
     * 获取 优惠券管理
     */
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object listOfDatas(String name, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        CouponListOfSearch ofSearch = new CouponListOfSearch();
        ofSearch.setPage(page);
        ofSearch.setName(name);
        ofSearch.setType(type);
        ofSearch.setDistributionMethod(distributionMethod);
        ofSearch.setUserPopulation(userPopulation);
        ofSearch.setStatus(status);
        ofSearch.setState(state);
        return client.getCouponListOfSearch(ofSearch);
    }


}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 优惠券审核 控制器
 */

@Controller
@RequestMapping("/tCouponExamine")
public class TCouponExamineController {


    private String PREFIX = "/system/tCouponExamine/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TCouponExamine.html";
    }


}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountExamineController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 折扣审核 控制器
 */

@Controller
@RequestMapping("/tDiscountExamine")
public class TDiscountExamineController {

    private String PREFIX = "/system/tDiscountExamine/";

    /**
     * 折扣审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TDiscountExamine.html";
    }



}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountManageController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 折扣管理 控制器
 */

@Controller
@RequestMapping("/tDiscountManage")
public class TDiscountManageController {

    private String PREFIX = "/system/tDiscountManage/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TDiscountManage.html";
    }



}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntegralGoodController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 折扣管理 控制器
 */

@Controller
@RequestMapping("/tIntegralGood")
public class TIntegralGoodController {

    private String PREFIX = "/system/tIntegralGood/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TIntegralGood.html";
    }



}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java

New file
@@ -0,0 +1,26 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 介绍有礼 控制器
 */

@Controller
@RequestMapping("/tIntroductionCourtesy")
public class TIntroductionCourtesyController {

    private String PREFIX = "/system/tIntroductionCourtesy/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "tIntroductionCourtesy.html";
    }

}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPhysicalAppointManageController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 折扣管理 控制器
 */

@Controller
@RequestMapping("/tPhysicalAppoint")
public class TPhysicalAppointManageController {

    private String PREFIX = "/system/tPhysicalAppoint/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TPhysicalAppoint.html";
    }



}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java

New file
@@ -0,0 +1,28 @@
package com.dsh.guns.modular.system.controller.code;


import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * 福利视频分类 控制器
 */

@Controller
@RequestMapping("/tWelfareVideo")
public class TWelfareVideoController {

    private String PREFIX = "/system/tWelfareVideo/";

    /**
     * 优惠券审核列表页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TWelfareVideo.html";
    }



}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java

@@ -132,21 +132,6 @@
    public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
        Integer language = UserExt.getLanguage();
        List<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level);
        if(language==1 || language==null){

        }else if(language==2){
            for (Map<String, Object> menu : menus) {
                menu.put("name",menu.get("ename"));
            }
        }else if(language==3){
            for (Map<String, Object> menu : menus) {
                menu.put("name",menu.get("bname"));
            }
        }
        for (Map<String, Object> menu : menus) {
            menu.put("id",menu.get("id").toString());
        }


        return super.warpObject(new MenuWarpper(menus));
    }

 cloud-server-management/src/main/webapp/WEB-INF/view/home.html

@@ -16,7 +16,7 @@
</style>
<div class="container-fluid" style="padding: 0 !important;">
    <div class="row">
        <input hidden id="language" value="${language}">

        <div class="col-sm-12">
            <div class="row" style="border-style: none none solid; border-color: #e7eaec; border-width: 1px 0px;">
                <ul class="breadcrumb" style="height: 45px; line-height: 45px; padding-left: 20px;">

 cloud-server-management/src/main/webapp/WEB-INF/view/index.html

@@ -12,7 +12,7 @@
</head>

<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
    <input hidden id="language" value="${language}">

    <div id="wrapper">
    
        <!--左侧导航开始-->

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html

@@ -2,8 +2,6 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">
            @if(language==1){
            <div class="ibox-title">
                <h5>部门管理</h5>
            </div>
@@ -33,69 +31,6 @@
                    </div>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="ibox-title">
                <h5>Divisional management</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="condition" name="Name" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Search" icon="fa-search" clickFun="Dept.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="DeptTableToolbar" role="group">
                            @if(shiro.hasPermission("/dept/add")){
                            <#button name="Add" icon="fa-plus" clickFun="Dept.openAddDept()"/>
                            @}
                            @if(shiro.hasPermission("/dept/update")){
                            <#button name="Update" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/dept/delete")){
                            <#button name="Delete" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
                            @}
                        </div>
                        <#table id="DeptTable"/>
                    </div>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="ibox-title">
                <h5>Manajemen Divisi</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="condition" name="Nama" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Pencarian" icon="fa-search" clickFun="Dept.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="DeptTableToolbar" role="group">
                            @if(shiro.hasPermission("/dept/add")){
                            <#button name="Tambah" icon="fa-plus" clickFun="Dept.openAddDept()"/>
                            @}
                            @if(shiro.hasPermission("/dept/update")){
                            <#button name="Edit" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/dept/delete")){
                            <#button name="Hapus" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
                            @}
                        </div>
                        <#table id="DeptTable"/>
                    </div>
                </div>
            </div>
            @}
        </div>
    </div>
</div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html

@@ -2,9 +2,9 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="deptInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" value="">
            @if(language==1){

            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="部门名称" underline="true"/>
@@ -29,78 +29,14 @@
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Name of a department" underline="true"/>

                    <#input id="fullname" name="Full name of department" underline="true"/>

                    <#input id="tips" name="Remarks" underline="true"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Sort" underline="true"/>

                    <#input id="pName" name="Superior department" readonly="readonly" hidden="pid"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Nama departemen" underline="true"/>

                    <#input id="fullname" name="Full name of department" underline="true"/>

                    <#input id="tips" name="Catatan" underline="true"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Urutkan" underline="true"/>

                    <#input id="pName" name="Departemen Tinggi" readonly="readonly" hidden="pid"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}

        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/dept/dept_info.js"></script>
<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html

@@ -2,10 +2,9 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="deptInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" value="${dept.id}">
            <input type="hidden" id="pid" value="${dept.pid}">
            @if(language==1){

            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
@@ -31,80 +30,14 @@
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Name of a department" underline="true" value="${dept.simplename}"/>

                    <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>

                    <#input id="tips" name="Remarks" underline="true" value="${dept.tips}"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Sort" underline="true" value="${dept.num}"/>

                    <#input id="pName" name="Superior department" readonly="readonly" hidden="pid"
                    hiddenValue="${dept.pid}" value="${pName}"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Nama departemen" underline="true" value="${dept.simplename}"/>

                    <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>

                    <#input id="tips" name="Catatan" underline="true" value="${dept.tips}"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Urutkan" underline="true" value="${dept.num}"/>

                    <#input id="pName" name="Departemen Tinggi" readonly="readonly" hidden="pid"
                    hiddenValue="${dept.pid}" value="${pName}"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}

        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/dept/dept_info.js"></script>
<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <input hidden id="language" value="${language}">

                @if(language==1){
                <h5>司机列表管理</h5>
                @}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html

@@ -2,17 +2,9 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>管理</h5>
                @}
                @if(language==2){
                <h5>Administration</h5>
                @}
                @if(language==3){
                <h5>Administrasi</h5>
                @}
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html

@@ -7,7 +7,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="sysCouponActivityInfoForm">
            <input type="hidden" id="id" name="id" value="${id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html

@@ -80,12 +80,12 @@
        font-size: 14px;
    }
</style>
<input hidden id="language" value="${language}">

@if(language==1){
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>活动时间：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -167,7 +167,7 @@
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>Activity time：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -249,7 +249,7 @@
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>Waktu aktivitas：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <input hidden id="time" value="${time}">
            <div class="ibox-title">
                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html

@@ -2,8 +2,6 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">
            @if(language==1){
            <div class="ibox-title">
                <h5>菜单管理</h5>
            </div>
@@ -30,63 +28,6 @@
                    </div>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="ibox-title">
                <h5>Menu management</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="menuName" name="Menu name" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="level" name="Levels and ranks" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Search" icon="fa-search" clickFun="Menu.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="menuTableToolbar" role="group">
                            <#button name="Add" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
                            <#button name="Update" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
                            <#button name="Delete" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
                        </div>
                        <#table id="menuTable"/>
                    </div>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="ibox-title">
                <h5>Manajemen Menu</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="menuName" name="Nama menu" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="level" name="Level dan peringkat" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Pencarian" icon="fa-search" clickFun="Menu.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="menuTableToolbar" role="group">
                            <#button name="Tambah" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
                            <#button name="Sunting" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
                            <#button name="Hapus" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
                        </div>
                        <#table id="menuTable"/>
                    </div>
                </div>
            </div>
            @}

        </div>
    </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html

@@ -2,9 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="menuInfoForm">
            <input hidden id="language" value="${language}">
            <input type="hidden" id="id" value="">
            @if(language==1){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="name" name="名称" underline="true" />
@@ -32,66 +30,6 @@
                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
            </div>
        </div>
            @}
            @if(language==2){
        <div class="row">
            <div class="col-sm-6 b-r">
                <#input id="name" name="Name" underline="true" />
                <#input id="code" name="Menu number" underline="true" />
                <#input id="pcodeName" name="Parent number" underline="true"
                hidden="pcode" readonly="readonly"
                clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
                style="background-color: #ffffff !important;"
                selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
                <#select id="ismenu" name="Is it a menu">
                <option value="1">Yes</option>
                <option value="0">No</option>
            </#select>
        </div>
        <div class="col-sm-6">
            <#input id="url" name="Request address" underline="true" />
            <#input id="num" name="Sort" underline="true" />
            <#input id="icon" name="Icon " underline="false" value="fa-bars" />
        </div>
    </div>

    <div class="row btn-group-m-t">
        <div class="col-sm-10 col-sm-offset-5">
            <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
            <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
        </div>
    </div>
            @}
            @if(language==3){
    <div class="row">
        <div class="col-sm-6 b-r">
            <#input id="name" name="Nama" underline="true" />
            <#input id="code" name="Nomor menu" underline="true" />
            <#input id="pcodeName" name="Nomor induk" underline="true"
            hidden="pcode" readonly="readonly"
            clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
            style="background-color: #ffffff !important;"
            selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
            <#select id="ismenu" name="Apakah itu menu">
            <option value="1">Ya</option>
            <option value="0">Tidak</option>
        </#select>
    </div>
    <div class="col-sm-6">
        <#input id="url" name="Alamat Permintaan" underline="true" />
        <#input id="num" name="Urutkan" underline="true" />
        <#input id="icon" name="Ikon" underline="false" value="fa-bars" />
    </div>
</div>

<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
        <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
    </div>
</div>
            @}

        </div>

    </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html

@@ -5,8 +5,7 @@

            <input type="hidden" id="id" value="${menu.id}">
            <input type="hidden" id="ismenuValue" value="${menu.ismenu}">
            <input hidden id="language" value="${language}">
            @if(language==1){

            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="name" name="名称" value="${menu.name}" underline="true" />
@@ -30,76 +29,14 @@
        </div>

        <div class="row btn-group-m-t">
            <div class="col-sm-10 col-sm-offset-5">
            <div class="col-sm-10">
                <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
            </div>
        </div>
            @}
            @if(language==2){
        <div class="row">
            <div class="col-sm-6 b-r">
                <#input id="name" name="Name" value="${menu.name}" underline="true" />
                <#input id="code" name="Menu number" value="${menu.code}" underline="true" />
                <#input id="pcodeName" name="Parent number" value="${menu.pcodeName}" underline="true"
                hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
                clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
                style="background-color: #ffffff !important;"
                selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
                <#select id="ismenu" name="Is it a menu">
                <option value="1">Yes</option>
                <option value="0">No</option>
            </#select>

        </div>
        <div class="col-sm-6">
            <#input id="url" name="Request address" value="${menu.url}" underline="true" />
            <#input id="num" name="Sort" value="${menu.num}" underline="true" />
            <#input id="icon" name="Icon" underline="false" value="${menu.icon}"/>
        </div>
    </div>

    <div class="row btn-group-m-t">
        <div class="col-sm-10 col-sm-offset-5">
            <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
            <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
        </div>
    </div>
            @}
            @if(language==3){
    <div class="row">
        <div class="col-sm-6 b-r">
            <#input id="name" name="Nama" value="${menu.name}" underline="true" />
            <#input id="code" name="Nomor menu" value="${menu.code}" underline="true" />
            <#input id="pcodeName" name="Nomor induk" value="${menu.pcodeName}" underline="true"
            hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
            clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
            style="background-color: #ffffff !important;"
            selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
            <#select id="ismenu" name="Apakah itu menu">
            <option value="1">Ya</option>
            <option value="0">Tidak</option>
        </#select>

    </div>
    <div class="col-sm-6">
        <#input id="url" name="Alamat Permintaan" value="${menu.url}" underline="true" />
        <#input id="num" name="Urutkan" value="${menu.num}" underline="true" />
        <#input id="icon" name="Ikon" underline="false" value="${menu.icon}"/>
    </div>
</div>

<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
    </div>
</div>
            @}

        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/menu/menu_info.js"></script>
<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html

@@ -2,8 +2,6 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">
            @if(language==1){
            <div class="ibox-title">
                <h5>角色管理</h5>
            </div>
@@ -28,59 +26,6 @@
                    </div>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="ibox-title">
                <h5>Role management</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="roleName" name="Role name" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Search" icon="fa-search" clickFun="Role.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="roleTableToolbar" role="group">
                            <#button name="Add" icon="fa-plus" clickFun="Role.openAddRole()" />
                            <#button name="Update" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
                            <#button name="Delete" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
                            <#button name="Permission configuration" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
                        </div>
                        <#table id="roleTable"/>
                    </div>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="ibox-title">
                <h5>Manajemen peran</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="roleName" name="Peran" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Pencarian" icon="fa-search" clickFun="Role.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="roleTableToolbar" role="group">
                            <#button name="Tambah" icon="fa-plus" clickFun="Role.openAddRole()" />
                            <#button name="Sunting" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
                            <#button name="Hapus" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
                            <#button name="Konfigurasi izin" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
                        </div>
                        <#table id="roleTable"/>
                    </div>
                </div>
            </div>
            @}

        </div>
    </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="roleInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" value="">
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="roleInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <input type="hidden" id="id" value="${role.id}">


 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html

@@ -13,7 +13,7 @@
                <h5>Manajemen Kegiatan Hadiah</h5>
                @}
            </div>
            <input hidden id="language" value="${language}">

            <input hidden id="companyId" value="${companyId}">
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="ibox-title">
                <h5>优惠券管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>用户管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="sysCouponActivityInfoForm">
            <input type="hidden" id="id" name="id" value="${id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html

@@ -14,7 +14,7 @@
                <h5>Manajemen kupon</h5>
                @}
            </div>
            <input hidden id="language" value="${language}">


            @if(language==1){
            <div class="ibox-content">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html

@@ -4,7 +4,7 @@

    @if(language==1){
        <div class="form-horizontal"id="sysCouponRecordInfoForm">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-6">
                    <#input id="name" name="名称" underline="true" placeholder="最多20个字"/>
@@ -56,7 +56,7 @@
    @}
    @if(language==2){
    <div class="form-horizontal"id="sysCouponRecordInfoForm">
        <input hidden id="language" value="${language}">

        <div class="row">
            <div class="col-sm-6">
                <#input id="name" name="Name" underline="true" placeholder="Up to 20 characters"/>
@@ -106,7 +106,7 @@
    @}
    @if(language==3){
<div class="form-horizontal"id="sysCouponRecordInfoForm">
    <input hidden id="language" value="${language}">

    <div class="row">
        <div class="col-sm-6">
            <#input id="name" name="Nama" underline="true" placeholder="Sehingga 20 karakter"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>广告设置管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="advertisementInfoForm">
            <input hidden id="language" value="${language}">


            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="advertisementInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="advertisementInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html

@@ -9,7 +9,7 @@
        <div class="ibox float-e-margins">
            <div class="ibox-content">
                <div class="row row-lg">
                    <input hidden id="language" value="${language}">

                    <div class="col-sm-12">
                        <div class="tabs-container">
                            <ul class="nav nav-tabs">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html

@@ -11,7 +11,7 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="tabs-container">
                            <input hidden id="language" value="${language}">

                            <ul class="nav nav-tabs">
                                @if(language==1){
                                <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">法律法规设置</a></li>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html

@@ -10,7 +10,7 @@
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input hidden id="language" value="${language}">

                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html

@@ -10,7 +10,7 @@
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input hidden id="language" value="${language}">

                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html

@@ -10,7 +10,7 @@
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input hidden id="language" value="${language}">

                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html

@@ -10,7 +10,7 @@
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input hidden id="language" value="${language}">

                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html

@@ -10,7 +10,7 @@
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input hidden id="language" value="${language}">

                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html

@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">

            <div class="ibox-title">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>车辆品牌管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carBrandInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html

@@ -4,7 +4,7 @@
        <div class="form-horizontal" id="carBrandInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="s1_" name="id" value="${item.language}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>车辆类型管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carModelInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html

@@ -4,7 +4,7 @@
        <div class="form-horizontal" id="carModelInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="s1_" name="id" value="${item.language}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>聊天信息预设设置</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html

@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal">
            <br class="row">
                <br class="col-sm-6">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html

@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal">

            <div hidden> <#input id="id" name="" value="${item.id}" underline="true"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html

@@ -11,6 +11,12 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="pCode" name="所在省" >
                                <option value="">全部</option>
                                @for(obj in list){
                                <option value="${obj.code}">${obj.name}</option>
                                @}
                            </#SelectCon>
                            </div>
                            <div class="col-sm-3">

@@ -29,9 +35,9 @@
                <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
                    <#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
                    <#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
                    <#button name="取消" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                    <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                    <#button name="已报名人员" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                    <#button name="冻结" icon="fa-remove" clickFun="TCompetition.freeze()" space="true"/>
                    <#button name="解冻" icon="fa-remove" clickFun="TCompetition.unfreeze()" space="true"/>
                    <#button name="重置密码" icon="fa-remove" clickFun="TCompetition.reload()" space="true"/>

                </div>
                <#table id="TCompetitionTable"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_add.html

@@ -8,8 +8,11 @@
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="pCode" name="pCode">
                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)">
                        <option value="">选择省</option>
                        @for(obj in list){
                        <option value="${obj.code}">${obj.name}</option>
                        @}
                    </select>
                </div>
            </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>加盟商管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="companyInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <input hidden id="tOpenCity" value='${tOpenCity}'>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>分公司管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>企业审核管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="companyInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <input hidden id="tOpenCity" value='${tOpenCity}'>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="companyInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-6 b-r">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="franchiseeInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="companyInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <input hidden id="tOpenCity" value='${tOpenCity}'>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -4,7 +4,7 @@
        <div class="form-horizontal" id="companyInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <input hidden id="language" value="${language}">

            <input hidden id="tOpenCity" value='${tOpenCity}'>
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="franchiseeInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <input hidden id="tOpenCity" value='${tOpenCity}'>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>投诉列表管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCoupon.html

New file
@@ -0,0 +1,76 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>优惠券管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="name" name="优惠券名称" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="type" name="优惠券类型" >
                                <option value="">全部</option>
                                <option value="1">满减券</option>
                                <option value="2">折扣券</option>
                                <option value="3">体验券</option>
                            </#SelectCon>
                        </div>
                        <div class="col-sm-3">
                            <#SelectCon id="distributionMethod" name="发放方式" >
                            <option value="">全部</option>
                            <option value="1">积分购买</option>
                            <option value="2">注册赠送</option>
                            <option value="3">自动发券</option>
                        </#SelectCon>
                    </div>
                    <div class="col-sm-3">
                        <#SelectCon id="userPopulation" name="用户人群" >
                        <option value="">全部</option>
                        <option value="1">全部用户</option>
                        <option value="2">年度会员</option>
                        <option value="3">已有学员用户</option>
                    </#SelectCon>
                </div>
                <div class="col-sm-3">
                    <#SelectCon id="status" name="活动状态" >
                    <option value="">全部</option>
                    <option value="1">未开始</option>
                    <option value="2">已开始</option>
                    <option value="3">已结束</option>
                </#SelectCon>
            </div>
                    <div class="col-sm-3">
                <#SelectCon id="state" name="可售状态" >
                <option value="">全部</option>
                <option value="1">已上架</option>
                <option value="2">已下架</option>
                </#SelectCon>
                        </div>
        <div class="col-sm-3">
            <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
            <#button name="重置" icon="fa-trash" clickFun="TCoupon.resetSearch()"/>
        </div>
                        </div>
                        <div class="hidden-xs" id="TCouponTableToolbar" role="group">
                            <#button name="添加" icon="fa-plus" clickFun="TCoupon.openAdd()"/>
                            <#button name="编辑" icon="fa-edit" clickFun="TCoupon.openChange()" space="true"/>
                            <#button name="上架" icon="fa-remove" clickFun="TCoupon.onShelf()" space="true"/>
                            <#button name="下架" icon="fa-remove" clickFun="TCoupon.offShelf()" space="true"/>
                            <#button name="查看详情" icon="fa-remove" clickFun="TCoupon.openDetail()" space="true"/>
                            <#button name="领取记录" icon="fa-remove" clickFun="TCoupon.openCollectionRecord()" space="true"/>
                        </div>
                        <#table id="TCouponTable"/>
                    </div>
                </div>
            </div>

        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCoupon/TCoupon.js"></script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html

New file
@@ -0,0 +1,259 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>优惠券名称: </label>
                        <div class="col-sm-9">
                            <input class="form-control" id="name" name="name" autocomplete="off" placeholder="请输入优惠券名称">
                        </div>
                    </div>
                </div>
            </div>
            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <label class="col-sm-3 control-label"><font style="color:red">*</font>优惠券类型: </label>
                            <input class="col-sm-1" style="margin-left: 1.7%;width: 13px;height: 13px;"
                                   name="prescription" onclick="radio1()"
                                   value="1" type="radio">
                            <label class="col-sm-1" style="margin-left: 18px;width: 17%">满减券: 满</label>
                            <input type="text" class="col-sm-1" id="conditionalAmount"
                                   onkeyup="value=value.replace(/\D/g,'')"/>
                            <label class="col-sm-1" style="margin-left: -1.5%;width: 14%"> 元 , 减 </label>
                            <input type="text" class="col-sm-1" id="deductionAmount"
                                   onkeyup="value=value.replace(/\D/g,'')"/>
                            <label class="col-sm-1" style="margin-left: -1.5%"> 元</label>
                        </div>
                    </div>
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <input class="col-sm-1" name="prescription" type="radio" value="2"
                                   onclick="radio2()"
                                   style="margin-left: 24.7%;">
                            <label class="col-sm-1" style="margin-left: -17px;width: 20%;">代金券: 可抵</label>
                            <input class="col-sm-1" id="discountAmount" onkeyup="value=value.replace(/\D/g,'')"/>
                            <label class="col-sm-1">元</label>
                        </div>
                    </div>
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <input class="col-sm-1" name="prescription" type="radio" value="3"
                                   onclick="radio3()"
                                   style="margin-left: 24.7%;">
                            <label class="col-sm-3 control-label" style="margin-left: -1%;width: 14%;margin-top: -5px">体验券: </label>
                            <input class="form-control" style="width: 35%" id="experienceName" name="name"
                                   autocomplete="off" placeholder="请输入体验券名称">
                        </div>
                    </div>
                </div>
            </div>
            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>优惠券说明: </label>
                        <div class="col-sm-9">
                            <textarea type="checkbox" id="illustrate" style="margin-left: 1%;width: 75%;height: 120px"
                                      placeholder="请输入优惠券名称"></textarea>
                        </div>
                    </div>
                </div>
            </div>
            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <label class="col-sm-3 control-label"><font  style="color:red">*</font>发放方式: </label>
                            <input class="col-sm-1 control-label" onclick="checkCompany()" name="company" type="radio"
                                   value="0" style="margin-top: 10px"/>
                            <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分购买</label>
                            <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
                                   value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 16%;margin-top: 7px">注册赠送</label>
                            <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
                                   value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 16%;margin-top: 7px">自动发券</label>
                        </div>
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <label class="col-sm-3 control-label"><font  style="color:red">*</font>兑换方式: </label>
                            <input class="col-sm-1 control-label" onclick="checkCompany()" name="company" type="radio"
                                   value="0" style="margin-top: 10px"/>
                            <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分</label>
                            <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
                                   value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 20%;margin-top: 7px">现金+积分</label>
                        </div>
                    </div>
                </div>
            </div>

            <div class="row" id="needAmount">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>所需现金: </label>
                        <input type="text" class="col-sm-1" id="requiredCash"
                               onkeyup="value=value.replace(/\D/g,'')"/>
                    </div>
                </div>
            </div>
            <div class="row" id="needIntegral">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>所需积分: </label>
                        <input type="text" class="col-sm-1" id="requiredPoints"/>
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <label class="col-sm-3 control-label"><font  style="color:red">*</font>用户人群: </label>
                            <input class="col-sm-1 control-label" onclick="userGroup1()" name="company" type="radio"
                                   value="0" style="margin-top: 10px"/>
                            <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">全部用户</label>
                            <input class="col-sm-1 control-label" name="company" onclick="userGroup2()" type="radio"
                                   value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 16%;margin-top: 7px">年度会员</label>
                            <input class="col-sm-1 control-label" name="company" onclick="userGroup3()" type="radio"
                                   value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 25%;margin-top: -16px">已有学员用户</label>
                        </div>
                    </div>
                </div>
            </div>
            <div class="row" >
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>发放数量: </label>
                        <input type="text" class="col-sm-1" id="issued"/>
                    </div>
                </div>
            </div>

            <div class="row" >
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>限领数量: </label>
                        <input type="text" class="col-sm-1" id="restrictedQty"/>
                    </div>
                </div>
            </div>
            <div class="row" >
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>有效期: </label>
                        <input type="text" style="width: 30%" class="form-control" id="periodOfValidity" placeholder="请选择"/>
                    </div>
                </div>
            </div>
            <div class="row" >
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>商品封面: </label>
                    </div>
                </div>
            </div>
            <div class="row" >
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>商品图片(请上传不超过五张图片): </label>
                    </div>
                </div>
            </div>


            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <div class="initialLevel col-sm-12 control-label form-group">
                            <label class="col-sm-3 control-label"><font  style="color:red">*</font>适用范围: </label>
                            <input class="col-sm-1 control-label" onclick="scopeOfApplication1()" name="company" type="radio"
                                   value="0" style="margin-top: 10px"/>
                            <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">全国通用</label>
                            <input class="col-sm-1 control-label" name="company" onclick="scopeOfApplication2()" type="radio"
                                   value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 16%;margin-top: 7px">指定城市</label>
                            <input class="col-sm-1 control-label" name="company" onclick="scopeOfApplication3()" type="radio"
                                   value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 25%;margin-top: -16px">指定门店</label>
                        </div>
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>指定城市: </label>
                        <select id="province" onchange="changeCity()"></select>
                        <label class="col-sm-1" style="width: 16%;margin-top: 7px">省</label>
                        <select id="city"></select>
                        <label class="col-sm-1" style="width: 16%;margin-top: 7px">市</label>
                        <select id="County"></select>

                    </div>
                </div>
            </div>
            <div class="row">
                <div class="col-sm-5">
                    <div class="form-group">
                        <label class="col-sm-3 control-label"><font  style="color:red">*</font>指定门店: </label>
                        <button onclick="couponInfoDlg.employeeSelection()"
                                style="height: 22px;margin-left: -165px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none">
                            选择门店
                        </button>
                        <div class="col-sm-12" style="margin-left: -57px;margin-top: 20px">
                            <table class="table table-bordered" style="width: 70%;margin-left: 228px;" id="storeTable">
                                <thead>
                                <tr>
                                    <td>所在省市</td>
                                    <td>所属账号</td>
                                    <td>门店名称</td>
                                    <td>操作</td>
                                </tr>
                                </thead>
                                <tbody id></tbody>
                            </table>
                        </div>
                    </div>
                </div>
            </div>


            <div class="row">
                <div class="row btn-group-m-t">
                    <div class="col-sm-10" style="margin-left: 20%;">
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser"
                        clickFun="couponInfoDlg.close()"/>
                    </div>
                    <div class="col-sm-10" style="margin-left: 35%;margin-top: -2.5%">
                        <#button btnCss="info" name="保存" id="ensure" icon="fa-check"
                        clickFun="couponInfoDlg.addSubmit()"/>
                    </div>
                </div>
            </div>

        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCoupon/TCouponInfo.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '#periodOfValidity',
        type: 'date',
        range: true
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>司机审核列表管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">

                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html

@@ -9,7 +9,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="yesDriverInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="col-sm-4">
                <label class="col-sm-3 control-label">司机姓名:</label>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="yesDriverInfoForm">
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-content">
                <input hidden id="language" value="${language}">

                <input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
                @if(language==1){
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html

@@ -4,7 +4,7 @@
        <div class="form-horizontal" id="yesDriverInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-6 b-r">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-6 b-r">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <input hidden id="money" value="${money}">
            <div class="ibox-title">
                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html

@@ -17,7 +17,7 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <input hidden id="language" value="${language}">

                            <div class="col-sm-3">
                                @if(language==1){
                                <#TimeCon id="createTime" name="添加时间" />

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html

@@ -17,7 +17,7 @@
                @}
            </div>
            <div class="row col-sm-12" id="ensureIncomeRuleForm">
                <input hidden id="language" value="${language}">

                <input hidden id="tEnsureIncomeRuleId" value="${tEnsureIncomeRuleId}">
                <div class="col-sm-12">
                    <div class="col-sm-5">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html

@@ -38,7 +38,7 @@
                @}
            </div>
            <div class="row col-sm-12" id="ensureIncomeRuleForm">
                <input hidden id="language" value="${language}">

                <div class="col-sm-12">
                    <div class="col-sm-5">
                        @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>司机反馈管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <input hidden id="language" value="${language}">

                @if(language==1){
                <h5>用户反馈管理</h5>
                @}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>引导页设置</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html

@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal" id="GuidePageForm">
            <br class="row">
                <br class="col-sm-6">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>城市搜索地址设置</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html

@@ -11,7 +11,7 @@
    <div class="ibox-content">

        <div class="form-horizontal">
            <input hidden id="language" value="${language}">

            <br class="row">
                <br class="col-sm-6">
                    <div class="form-group">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html

@@ -9,7 +9,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="id" value="${item.id}">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal">
            <br class="row">
            <br class="col-sm-6">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>摩托车车型设置</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html

@@ -13,7 +13,7 @@
                <h5>Manajemen Pengaturan Pengumuman Sistem</h5>
                @}
            </div>
            <input hidden id="language" value="${language}">

            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="systemInfoForm">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="systemInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="s1_" name="id" value="${item.language}">
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html

@@ -14,7 +14,7 @@
                <h5>Manajemen Pengaturan Pesan Bergulir</h5>
                @}
            </div>
            <input hidden id="language" value="${language}">

            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="noticeInfoForm">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-11">


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html

@@ -4,7 +4,7 @@
        <div class="form-horizontal" id="noticeInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="s1_" name="id" value="${item.language}">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-11">


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">

                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="openCityForm">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-10">
                    @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="openCityForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="content" name="content" value='${item.content}'>
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="openCityForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="content" name="content" value='${item.content}'>
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>评价列表管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>同城快送订单管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <div class="row" style="margin-top: 30px;">
                <input hidden id="language" value="${language}">

                <div class="col-sm-4">
                    @if(language==1){
                    <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>摩托车订单管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -16,7 +16,7 @@
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <div class="row" style="margin-top: 30px;">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <input hidden id="language" value="${language}">

                @if(language==1){
                <h5>用户留言管理</h5>
                @}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html

@@ -15,7 +15,7 @@
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <input hidden id="language" value="${language}">

                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                  <h5>启动页管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html

@@ -5,7 +5,7 @@
    }
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
    <input hidden id="language" value="${language}">

    <div class="ibox-content">
        <div class="form-horizontal">
            <br class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -7,7 +7,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>敏感词管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html

@@ -24,7 +24,7 @@
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal" >
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html

@@ -11,7 +11,7 @@
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        @if(language==1){
        <div class="form-horizontal">
            <input hidden id="code" value="${code}">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html

@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html

@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html

@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">

        <div class="form-horizontal" id="specialPriceInfoForm">
            <input hidden id="code" value="${code}">
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html

@@ -20,7 +20,7 @@
    }
</style>
<div class="ibox float-e-margins">
    <input hidden id="language" value="${language}">

    <div class="ibox-content">
        @if(language==1){
        <div class="form-horizontal" id="specialPriceInfoForm">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html

@@ -20,7 +20,7 @@
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <input hidden id="language" value="${language}">


        @if(language==1){
        <div class="form-horizontal" id="specialPriceInfoForm">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>用户管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>账号注销管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html

@@ -3,7 +3,7 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="sysCouponActivityInfoForm">
            <input type="hidden" id="id" name="id" value="${id}">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-10">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>大额优惠券活动管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="userlagerForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="row">
                <div class="col-sm-11">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carModelInfoForm">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <label style="font-size: 22px">参与统计</label>
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html

@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carModelInfoForm">
            <input hidden id="language" value="${language}">

            <input hidden id="type_" value="${item.type}">
            @if(language==1){
            <div class="row">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html

@@ -1,18 +1,10 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                @if(language==1){
                <h5>管理</h5>
                @}
                @if(language==2){
                <h5>Administration</h5>
                @}
                @if(language==3){
                <h5>Administrasi</h5>
                @}
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html

@@ -14,7 +14,7 @@
                <h5>Manajemen Versi</h5>
                @}
            </div>
            <input hidden id="language" value="${language}">

            <input style="position: fixed;left: -50000%;top: 0;" id="input" name="input">
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>语音播报管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>代扣款金额明细</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <div class="ibox-title">
                @if(language==1){
                <h5>icon管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html

@@ -4,7 +4,7 @@
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input hidden id="language" value="${language}">

            <br class="row">
                <br class="col-sm-6">
                    <div class="form-group">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html

@@ -1,9 +1,8 @@
@layout("/common/_container.html"){
<link rel="stylesheet" href="${ctxPath}/static/js/layui/css/layui.css"  media="all">
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">
        <div class="ibox float-e-margins">
            @if(language==1){
            <div class="ibox-title">
                <h5>用户管理</h5>
            </div>
@@ -11,209 +10,63 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-lg-2 col-sm-3">
                                <div class="panel panel-default">
                                    <div class="panel-heading">组织机构</div>
                                    <div class="panel-body dept-tree">
                                        <ul id="deptTree" class="ztree"></ul>
                                    </div>
                                </div>
                            </div>
                            <div class="col-lg-10 col-sm-9">
                                <div class="row">
                                    <div class="col-lg-10 col-sm-9">
                                        <div class="row">
                                            <div class="col-lg-4 col-sm-6">
                                                <#TimeCon id="createTime" name="创建时间" isTime="false"/>
                                            </div>
                                            <div class="col-lg-4 col-sm-12">
                                                <#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="col-lg-2 col-sm-3">
                                        <div class="row">
                                            <div class="col-lg-12 col-sm-12">
                                                <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
                                                <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
                                            </div>
                                        </div>
                                    <div class="col-lg-4 col-sm-12">
                                        <#NameCon id="name" name="搜索" placeholder="帐号/姓名/手机号"/>
                                    </div>
                                </div>
                                <div class="hidden-xs" id="managerTableToolbar" role="group">
                                    @if(shiro.hasPermission("/mgr/add")){
                                    <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/edit")){
                                    <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/delete")){
                                    <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/reset")){
                                    <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/freeze")){
                                    <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/unfreeze")){
                                    <#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/setRole")){
                                    <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
                                    @}
                            </div>
                            <div class="col-lg-2 col-sm-3">
                                <div class="row">
                                    <div class="col-lg-12 col-sm-12">
                                        <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
                                        <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
                                    </div>
                                </div>
                                <#table id="managerTable"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="managerTableToolbar" role="group">
                            @if(shiro.hasPermission("/mgr/add")){
                            <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
                            @}
                            @if(shiro.hasPermission("/mgr/edit")){
                            <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/delete")){
                            <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/reset")){
                            <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/freeze")){
                            <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/unfreeze")){
                            <#button name="解冻" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/setRole")){
                            <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/mgr/kanbanPermissions")){
                            <#button name="看板权限设置" icon="fa-user-secret" clickFun="MgrUser.kanbanPermissions()" space="true"/>
                            @}
                        </div>
                        <#table id="managerTable"/>
                    </div>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="ibox-title">
                <h5>User management</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-lg-2 col-sm-3">
                                <div class="panel panel-default">
                                    <div class="panel-heading">Institutional framework</div>
                                    <div class="panel-body dept-tree">
                                        <ul id="deptTree" class="ztree"></ul>
                                    </div>
                                </div>
                            </div>
                            <div class="col-lg-10 col-sm-9">
                                <div class="row">
                                    <div class="col-lg-10 col-sm-9">
                                        <div class="row">
                                            <div class="col-lg-4 col-sm-6">
                                                <#TimeCon id="createTime" name="Creation time" isTime="false"/>
                                            </div>
                                            <div class="col-lg-4 col-sm-12">
                                                <#NameCon id="name" name="Name of user" placeholder="Account/name/mobile number"/>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="col-lg-2 col-sm-3">
                                        <div class="row">
                                            <div class="col-lg-12 col-sm-12">
                                                <#button name="Search" icon="fa-search" clickFun="MgrUser.search()"/>
                                                <#button name="Reset" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="hidden-xs" id="managerTableToolbar" role="group">
                                    @if(shiro.hasPermission("/mgr/add")){
                                    <#button name="Add" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/edit")){
                                    <#button name="Update" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/delete")){
                                    <#button name="Delete" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/reset")){
                                    <#button name="Reset password" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/freeze")){
                                    <#button name="Freeze" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/unfreeze")){
                                    <#button name="Unfreeze" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/setRole")){
                                    <#button name="Role assignment" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
                                    @}
                                </div>
                                <#table id="managerTable"/>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="ibox-title">
                <h5>Manajemen pengguna</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-lg-2 col-sm-3">
                                <div class="panel panel-default">
                                    <div class="panel-heading">Organisasi</div>
                                    <div class="panel-body dept-tree">
                                        <ul id="deptTree" class="ztree"></ul>
                                    </div>
                                </div>
                            </div>
                            <div class="col-lg-10 col-sm-9">
                                <div class="row">
                                    <div class="col-lg-10 col-sm-9">
                                        <div class="row">
                                            <div class="col-lg-4 col-sm-6">
                                                <#TimeCon id="createTime" name="Waktu penciptaan" isTime="false"/>
                                            </div>
                                            <div class="col-lg-4 col-sm-12">
                                                <#NameCon id="name" name="Nama pengguna" placeholder="Akaun/nama/nomor ponsel"/>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="col-lg-2 col-sm-3">
                                        <div class="row">
                                            <div class="col-lg-12 col-sm-12">
                                                <#button name="Pencarian" icon="fa-search" clickFun="MgrUser.search()"/>
                                                <#button name="Mengatur ulang" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="hidden-xs" id="managerTableToolbar" role="group">
                                    @if(shiro.hasPermission("/mgr/add")){
                                    <#button name="Tambah" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/edit")){
                                    <#button name="Edit" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/delete")){
                                    <#button name="Hapus" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/reset")){
                                    <#button name="Setel ulang kata sandi" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/freeze")){
                                    <#button name="Membekukan" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/unfreeze")){
                                    <#button name="Batalkan pembekuan Akun" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
                                    @}
                                    @if(shiro.hasPermission("/mgr/setRole")){
                                    <#button name="Penugasan peran" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
                                    @}
                                </div>
                                <#table id="managerTable"/>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            @}

        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/user/user.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '#createTime'
        ,range: true
        ,lang:"en"
    });
<script src="${ctxPath}/static/modular/system/user/user.js"></script>
<script src="${ctxPath}/static/js/layui/layui.js" charset="utf-8"></script>
<script>
    laydate.render({
        elem: '#beginTime'
    });
    laydate.render({
        elem: '#endTime'
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html

@@ -2,155 +2,65 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="userInfoForm">
            <input hidden id="language" value="${language}">
            <input type="hidden" id="id" value="">
            @if(language==1){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="account" name="账户" underline="true"/>

                    <#select id="sex" name="性别：" underline="true">
                    <#select id="sex" name="性别" underline="true">
                    <option value="1">男</option>
                    <option value="2">女</option>
                </#select>

                <#input id="password" name="密码" underline="true" type="password"/>
                <#input id="rePassword" name="确认密码" type="password"/>

                <#input id="email" name="邮箱" type="email"/>
                <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
            </div>
            <div class="col-sm-6">
                <div id="driverInfoContent">
                    <#input id="name" name="姓名" underline="true"/>

                    <#input id="birthday" name="出生日期" underline="true" type="text"/>

                    <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
                    clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>

                    <#input id="phone" name="电话"/>


                <!--                <#input id="roleid" name="角色" underline="true" disabled="disabled"/>-->
                <#input id="email" name="邮箱" type="email" underline="true"/>
                <div class="form-group" ${companyId!=1? "hidden" :" "} >
                <label class="col-sm-3 control-label">所属公司</label>
                <div class="col-sm-9">
                    <select class="form-control" id="companyId" name="companyId">
                        @if(companyIds!=null){
                        @for(item in companyIds){
                        @if(companyId!=1&&item.id==companyId){
                        <option value="${item.id}">${item.name}</option>
                        @}else if(companyId==1){
                        <option value="${item.id}">${item.name}</option>
                        @}
                        @}
                        @}
                    </select>
                </div>
            </div>
        </div>

        <!-- 这是部门选择的下拉框 -->
        <div id="menuContent" class="menuContent"
             style="display: none; position: absolute; z-index: 200;">
            <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
        </div>

        <div class="row btn-group-m-t">
            <div class="col-sm-10 col-sm-offset-4">
                <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
            </div>
        </div>
            @}
            @if(language==2){
        <div class="row">
            <div class="col-sm-6 b-r">
                <#input id="account" name="Account" underline="true"/>

                <#select id="sex" name="Gender：" underline="true">
                <option value="1">Man</option>
                <option value="2">Woman</option>
            </#select>

            <#input id="password" name="Password" underline="true" type="password"/>
            <#input id="rePassword" name="Confirm the password" type="password"/>

            <#input id="email" name="Email" type="email"/>
            <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
        </div>
        <div class="col-sm-6">
            <div id="driverInfoContent">
                <#input id="name" name="Name" underline="true"/>

                <#input id="birthday" name="Date of birth" underline="true" type="text"/>

                <#input id="citySel" name="Department " underline="true" readonly="readonly" hidden="deptid"
                clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
                style="background-color: #ffffff !important;"/>

                <#input id="phone" name="Telephone"/>


            </div>
        </div>
    </div>

    <!-- 这是部门选择的下拉框 -->
    <div id="menuContent" class="menuContent"
         style="display: none; position: absolute; z-index: 200;">
        <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
    </div>

    <div class="row btn-group-m-t">
        <div class="col-sm-10 col-sm-offset-4">
            <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
            <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
        </div>
    </div>
            @}
            @if(language==3){
    <div class="row">
        <div class="col-sm-6 b-r">
            <#input id="account" name="Akun" underline="true"/>
            <#select id="sex" name="Jenis kelamin：" underline="true">
            <option value="1">laki-laki</option>
            <option value="2">wanita</option>
        </#select>

        <#input id="password" name="Kata sandi" underline="true" type="password"/>
        <#input id="rePassword" name="Konfirmasikan kata sandi" type="password"/>

        <#input id="email" name="Email" type="email"/>
        <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
            <div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
    </div>
    <div class="col-sm-6">
        <div id="driverInfoContent">
            <#input id="name" name="Nama Lengkap" underline="true"/>

            <#input id="birthday" name="Tanggal lahir" underline="true" type="text"/>

            <#input id="citySel" name="Departemen" underline="true" readonly="readonly" hidden="deptid"
            <#input id="name" name="姓名" underline="true"/>
            <#input id="birthday" name="出生日期" underline="true" type="text"/>
            <#input id="rePassword" name="确认密码" type="password" underline="true"/>
            <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
            clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
            style="background-color: #ffffff !important;"/>

            <#input id="phone" name="Telepon"/>


            <#input id="phone" name="电话" underline="true"/>
        </div>
    </div>
</div>

<!-- 这是部门选择的下拉框 -->
<div id="menuContent" class="menuContent"
     style="display: none; position: absolute; z-index: 200;">
    <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
</div>

<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-4">
        <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
        <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
    <div class="col-sm-10">
        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
    </div>
</div>
            @}


        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
    laydate.render({
        elem: '#birthday'
    });
    laydate.render({
        elem: '#birthday'
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html

@@ -18,7 +18,7 @@
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                    <div class="col-sm-10">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
                                    </div>
                                </div>
@@ -30,5 +30,5 @@
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html

@@ -2,122 +2,49 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="userInfoForm">
            <input hidden id="language" value="${language}">
            @if(language==1){

            <input type="hidden" id="id" value="${user.id}">
            <input type="hidden" id="sexValue" value="${user.sex}">

            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="account" name="账户" underline="true" value="${user.account}"/>

                    <#select id="sex" name="性别：" underline="true">
                    <#select id="sex" name="性别" underline="true">
                    <option value="1">男</option>
                    <option value="2">女</option>
                </#select>

                <#input id="citySel" name="部门" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>

                <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
                <#input id="email" name="邮箱" type="email" value="${user.email}"/>
            </div>
            <div class="col-sm-6">
                <div id="driverInfoContent">
                    <#input id="name" name="姓名" underline="true" value="${user.name}"/>

                    <#input id="birthday" name="出生日期" underline="true" type="text"
                    value="${user.birthday}"/>

                    <#input id="phone" name="电话" value="${user.phone}"/>

                <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
                <#input id="email" name="邮箱" type="email"  underline="true" value="${user.email}"/>
                <div class="form-group" ${userCompanyId!=1? "hidden" :" "} >
                <label class="col-sm-3 control-label">所属公司</label>
                <div class="col-sm-9">
                    <select class="form-control" id="companyId" name="companyId">
                        @if(companyIds!=null && companyId!=null){
                        @for(item in companyIds){
                        @if(item.id==companyId){
                        <option value="${item.id}">${item.name}</option>
                        @}
                        @}
                        @for(item in companyIds){
                        @if(item.id!=companyId){
                        <option value="${item.id}">${item.name}</option>
                        @}
                        @}
                        @}
                    </select>
                </div>
            </div>
        </div>

        <!-- 这是部门选择的下拉框 -->
        <div id="menuContent" class="menuContent"
             style="display: none; position: absolute; z-index: 200;">
            <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
        </div>

        <div class="row btn-group-m-t">
            <div class="col-sm-10 col-sm-offset-4">
                <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
            </div>
        </div>
            @}
            @if(language==2){
        <input type="hidden" id="id" value="${user.id}">
        <input type="hidden" id="sexValue" value="${user.sex}">

        <div class="row">
            <div class="col-sm-6 b-r">
                <#input id="account" name="Account" underline="true" value="${user.account}"/>

                <#select id="sex" name="Gender：" underline="true">
                <option value="1">Man</option>
                <option value="2">Woman</option>
            </#select>

            <#input id="citySel" name="Department " underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>

            <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
            <#input id="email" name="Email" type="email" value="${user.email}"/>
        </div>
        <div class="col-sm-6">
            <div id="driverInfoContent">
                <#input id="name" name="Name" underline="true" value="${user.name}"/>

                <#input id="birthday" name="Date of birth" underline="true" type="text"
                value="${user.birthday}"/>

                <#input id="phone" name="Telephone" value="${user.phone}"/>

            </div>
        </div>
    </div>

    <!-- 这是部门选择的下拉框 -->
    <div id="menuContent" class="menuContent"
         style="display: none; position: absolute; z-index: 200;">
        <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
    </div>

    <div class="row btn-group-m-t">
        <div class="col-sm-10 col-sm-offset-4">
            <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
            <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
        </div>
    </div>
            @}
            @if(language==3){
    <input type="hidden" id="id" value="${user.id}">
    <input type="hidden" id="sexValue" value="${user.sex}">

    <div class="row">
        <div class="col-sm-6 b-r">
            <#input id="account" name="Akun" underline="true" value="${user.account}"/>

            <#select id="sex" name="Jenis kelamin：" underline="true">
            <option value="1">laki-laki</option>
            <option value="2">wanita</option>
        </#select>

        <#input id="citySel" name="Departemen" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>

        <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
        <#input id="email" name="Email" type="email" value="${user.email}"/>
            <div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
    </div>
    <div class="col-sm-6">
        <div id="driverInfoContent">
            <#input id="name" name="Nama" underline="true" value="${user.name}"/>

            <#input id="birthday" name="Tanggal lahir" underline="true" type="text"
            <#input id="name" name="姓名" underline="true" value="${user.name}"/>
            <#input id="birthday" name="出生日期" underline="true" type="text"
            value="${user.birthday}"/>

            <#input id="phone" name="Telepon" value="${user.phone}"/>

            <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
            clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
            style="background-color: #ffffff !important;"/>
            <#input id="phone" name="电话"  underline="true" value="${user.phone}"/>
        </div>
    </div>
</div>
@@ -129,23 +56,19 @@
</div>

<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-4">
        <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Kirim" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
    <div class="col-sm-10">
        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
    </div>
</div>
            @}


        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>

</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
    laydate.render({
        elem: '#birthday'
        ,lang:"en"
    });
    laydate.render({
        elem: '#birthday'
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html

@@ -21,42 +21,41 @@
                                        <#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />

                                        <#select id="sex" name="性别" underline="true" value="${user.sex}">
                                            <option value="1">男</option>
                                            <option value="2">女</option>
                                        </#select>
                                        <option value="1">男</option>
                                        <option value="2">女</option>
                                    </#select>

                                        <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
                                    <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>

                                        <#input id="email" name="邮箱" type="email" value="${user.email}"/>
                                    </div>

                                    <div class="col-sm-6">
                                        <div id="driverInfoContent">
                                            <#input id="name" name="姓名" underline="true" value="${user.name}"/>

                                            <#input id="birthday" name="出生日期" underline="true" type="text"
                                                    value="${user.birthday}"/>

                                            <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
                                                    hidden="deptid" hiddenValue="${user.deptid}"
                                                    clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
                                                    style="background-color: #ffffff !important;"
                                                    selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>

                                            <#input id="phone" name="电话" value="${user.phone}"/>
                                        </div>
                                    </div>
                                    <#input id="email" name="邮箱" type="email" value="${user.email}"/>
                                </div>

                                <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
                                    <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
                                <div class="col-sm-6">
                                    <div id="driverInfoContent">
                                        <#input id="name" name="姓名" underline="true" value="${user.name}"/>

                                        <#input id="birthday" name="出生日期" underline="true" type="text"
                                        value="${user.birthday}"/>

                                        <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
                                        hidden="deptid" hiddenValue="${user.deptid}"
                                        clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
                                        style="background-color: #ffffff !important;"
                                        selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>

                                        <#input id="phone" name="电话" value="${user.phone}"/>
                                    </div>
                                </div>
                            </div>

                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
                                    </div>
                            <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
                                <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
                                </div>
                            </div>

                            <div class="row btn-group-m-t">
                                <div class="col-sm-10">
                                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
                                </div>
                            </div>
                        </div>
@@ -66,11 +65,11 @@
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
    laydate.render({
        elem: '#birthday'
        ,lang:"en"
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html

@@ -83,7 +83,7 @@

@if(language==1){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">
@@ -157,7 +157,7 @@
@}
@if(language==2){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">
@@ -231,7 +231,7 @@
@}
@if(language==3){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            @if(language==1){
            <div class="ibox-title">
                <h5>优惠券管理</h5>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html

@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        @if(language==1){
        <div class="ibox float-e-margins">
            <div class="ibox-title">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html

@@ -2,19 +2,11 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">

            <input hidden id="id" value="${id}">
            <div class="ibox-title">

                @if(language==1){
                <h5>管理</h5>
                @}
                @if(language==2){
                <h5>Administration</h5>
                @}
                @if(language==3){
                <h5>Administrasi</h5>
                @}
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -19,7 +19,7 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input hidden id="language" value="${language}">

            <div class="row">
                <div class="col-sm-10">


 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html

@@ -21,7 +21,7 @@
        <div class="form-horizontal">
            <div class="row">
                <input type="hidden" id="id" id="${item.id}">
                <input hidden id="language" value="${language}">

                <div class="col-sm-10">

                        @if(language==1){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html

@@ -1,18 +1,10 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                @if(language==1){
                <h5>管理</h5>
                @}
                @if(language==2){
                <h5>Administration</h5>
                @}
                @if(language==3){
                <h5>Administrasi</h5>
                @}
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js

@@ -7,37 +7,37 @@

    $.fn.bootstrapTable.locales['zh-CN'] = {
        formatLoadingMessage: function () {
            return 'Loding……';
            return '正在努力地加载数据中，请稍候……';
        },
        formatRecordsPerPage: function (pageNumber) {
            return 'Display per page ' + pageNumber + ' A record';
            return '每页显示 ' + pageNumber + ' 条记录';
        },
        formatShowingRows: function (pageFrom, pageTo, totalRows) {
            return 'Control of display ' + pageFrom + ' To the first ' + pageTo + ' One record, total ' + totalRows + ' recored';
            return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录，总共 ' + totalRows + ' 条记录';
        },
        formatSearch: function () {
            return 'Search';
            return '搜索';
        },
        formatNoMatches: function () {
            return 'No match was found';
            return '没有找到匹配的记录';
        },
        formatPaginationSwitch: function () {
            return 'Hide/show pagination';
            return '隐藏/显示分页';
        },
        formatRefresh: function () {
            return 'refresh';
            return '刷新';
        },
        formatToggle: function () {
            return 'cut';
            return '切换';
        },
        formatColumns: function () {
            return 'column';
            return '列';
        },
        formatExport: function () {
            return 'export data';
            return '导出数据';
        },
        formatClearFilters: function () {
            return 'Clear the filter';
            return '清空过滤';
        }
    };


 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js

@@ -7,37 +7,37 @@

    $.fn.bootstrapTable.locales['zh-CN'] = {
        formatLoadingMessage: function () {
            return 'Loding……';
            return '正在努力地加载数据中，请稍候……';
        },
        formatRecordsPerPage: function (pageNumber) {
            return 'Display per page ' + pageNumber + ' A record';
            return '每页显示 ' + pageNumber + ' 条记录';
        },
        formatShowingRows: function (pageFrom, pageTo, totalRows) {
            return 'Control of display ' + pageFrom + ' To the first ' + pageTo + ' One record, total ' + totalRows + ' recored';
            return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录，总共 ' + totalRows + ' 条记录';
        },
        formatSearch: function () {
            return 'Search';
            return '搜索';
        },
        formatNoMatches: function () {
            return 'No match was found';
            return '没有找到匹配的记录';
        },
        formatPaginationSwitch: function () {
            return 'Hide/show pagination';
            return '隐藏/显示分页';
        },
        formatRefresh: function () {
            return 'refresh';
            return '刷新';
        },
        formatToggle: function () {
            return 'cut';
            return '切换';
        },
        formatColumns: function () {
            return 'column';
            return '列';
        },
        formatExport: function () {
            return 'export data';
            return '导出数据';
        },
        formatClearFilters: function () {
            return 'Clear the filter';
            return '清空过滤';
        }
    };


 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js

@@ -185,7 +185,7 @@
            var tbody = $('<tbody class="treetable-tbody"></tbody>');
            target.append(tbody);
            // 添加加载loading
            var _loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">Loding……</div></td></tr>'
            var _loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">正在努力地加载数据中，请稍候……</div></td></tr>'
            tbody.html(_loading);
            // 默认高度
            if (options.height) {
@@ -200,7 +200,7 @@
                    // 加载完数据先清空
                    tbody.html("");
                    if (!data || data.length <= 0) {
                        var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">No match was found</div></td></tr>'
                        var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>'
                        tbody.html(_empty);
                        return;
                    }

 cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js

@@ -69,7 +69,7 @@
        backgroundOption = options.background;
        
        // To avoid having weighty logic to place, update and remove the backgrounds,
        // push them to the first axis' plot bands and borrow the existing logic there.
        // push them 到第 axis' plot bands and borrow the existing logic there.
        if (backgroundOption) {
            each([].concat(splat(backgroundOption)).reverse(), function (config) {
                var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients)

 cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js

@@ -110,7 +110,7 @@
/**
 * Extend an object with the members of another
 * @param {Object} a The object to be extended
 * @param {Object} b The object to add to the first one
 * @param {Object} b The object to add 到第 one
 */
function extend(a, b) {
    var n;

 cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js

@@ -116,7 +116,7 @@
            }
        });
        
        // Add a record of properties for each drilldown level
        // Add 条记录 of properties for each drilldown level
        level = {
            levelNumber: levelNumber,
            seriesOptions: oldSeries.userOptions,

 cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js

@@ -65,7 +65,7 @@
        backgroundOption = options.background;
        
        // To avoid having weighty logic to place, update and remove the backgrounds,
        // push them to the first axis' plot bands and borrow the existing logic there.
        // push them 到第 axis' plot bands and borrow the existing logic there.
        if (backgroundOption) {
            each([].concat(splat(backgroundOption)).reverse(), function (config) {
                var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients)

 cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js

@@ -123,7 +123,7 @@
/**
 * Extend an object with the members of another
 * @param {Object} a The object to be extended
 * @param {Object} b The object to add to the first one
 * @param {Object} b The object to add 到第 one
 */
function extend(a, b) {
    var n;

 cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js

@@ -65,7 +65,7 @@
        backgroundOption = options.background;
        
        // To avoid having weighty logic to place, update and remove the backgrounds,
        // push them to the first axis' plot bands and borrow the existing logic there.
        // push them 到第 axis' plot bands and borrow the existing logic there.
        if (backgroundOption) {
            each([].concat(splat(backgroundOption)).reverse(), function (config) {
                var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients)

 cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js

@@ -123,7 +123,7 @@
/**
 * Extend an object with the members of another
 * @param {Object} a The object to be extended
 * @param {Object} b The object to add to the first one
 * @param {Object} b The object to add 到第 one
 */
function extend(a, b) {
    var n;

 cloud-server-management/src/main/webapp/static/modular/flowable/expense/expense_info.js

@@ -61,23 +61,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/expense/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Expense.table.refresh();
        ExpenseInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.expenseInfoData);
    ajax.start();
@@ -93,23 +81,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/expense/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Expense.table.refresh();
        ExpenseInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.expenseInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/flowable/process/process_info.js

@@ -61,23 +61,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/expense/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Expense.table.refresh();
        ExpenseInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.expenseInfoData);
    ajax.start();
@@ -93,23 +81,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/expense/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Expense.table.refresh();
        ExpenseInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.expenseInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js

@@ -7,7 +7,7 @@
    table: null,
    layerIndex: -1
};
var language =$("#language").val()

/**
 * 初始化表格的列
 */
@@ -15,10 +15,10 @@
    return [
        {field: 'selectItem', radio: true},
        {title: 'id', field: 'id', align: 'center', valign: 'middle',width:'50px'},
        {title:  language==1?'部门简称':(language==2?'Abbreviation of department':'Persingkatan departemen'), field: 'simplename', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'部门全称':(language==2?'Full Name of Department':'Nama Penuh Departemen'), field: 'fullname', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'备注':(language==2?'Remarks':'Catatan'), field: 'tips', align: 'center', valign: 'middle', sortable: true}];
        {title: '部门简称', field: 'simplename', align: 'center', valign: 'middle', sortable: true},
        {title: '部门全称', field: 'fullname', align: 'center', valign: 'middle', sortable: true},
        {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
        {title: '备注', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
};

/**
@@ -27,14 +27,7 @@
Dept.check = function () {
    var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }

        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        Dept.seItem = selected[0];
@@ -48,7 +41,7 @@
Dept.openAddDept = function () {
    var index = layer.open({
        type: 2,
        title: language==1?'添加':(language==2?'Add':'Tambahkan'),
        title: '添加部门',
        area: ['800px', '420px'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -64,7 +57,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: language==1?'详情':(language==2?'details':'details'),
            title: '部门详情',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,
@@ -82,35 +75,16 @@

        var operation = function(){
            var ajax = new $ax(Feng.ctxPath + "/dept/delete", function () {
                if(language==1){
                    Feng.success("删除成功!");
                }else if(language==2){
                    Feng.success("Delete succeeded!");
                }else {
                    Feng.success("Hapus berhasil!");
                }
                Feng.success("删除成功!");
                Dept.table.refresh();
            }, function (data) {
                if(language==1){
                    Feng.error("删除失败!" + data.responseJSON.message + "!");
                }else if(language==2){
                    Feng.error("Delete failed!" + data.responseJSON.message + "!");
                }else {
                    Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
                }
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });
            ajax.set("deptId",Dept.seItem.id);
            ajax.start();
        };

        if(language==1){
            Feng.confirm("是否刪除该部门?", operation);
        }else if(language==2){
            Feng.confirm("Whether to delete the department?", operation);
        }else {
            Feng.confirm("Apakah untuk menghapus departemen?", operation);
        }

        Feng.confirm("是否刪除该部门?", operation);
    }
};

@@ -123,6 +97,12 @@
    Dept.table.refresh({query: queryData});
};

Dept.resetSearch = function(){
    $("#condition").val('');
    Dept.search();
}


$(function () {
    var defaultColunms = Dept.initColumn();
    var table = new BSTreeTable(Dept.id, "/dept/list", defaultColunms);

 cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js

@@ -1,7 +1,6 @@
/**
 * 初始化部门详情对话框
 */
var language =$("#language").val()
var DeptInfoDlg = {
    deptInfoData : {},
    zTreeInstance : null,
@@ -9,24 +8,24 @@
        simplename: {
            validators: {
                notEmpty: {
                    message: language==1?'部门名称不能为空':(language==2?'The department name cannot be empty':'Nama departemen tidak dapat kosong')
                    message: '部门名称不能为空'
                }
            }
        },
        fullname: {
            validators: {
                notEmpty: {
                    message:language==1?'部门全称不能为空':(language==2?'The full name of the department cannot be empty':'Nama penuh departemen tidak dapat kosong')
                    message: '部门全称不能为空'
                }
            }
        },
        /*pName: {
        pName: {
            validators: {
                notEmpty: {
                    message: '上级名称不能为空'
                }
            }
        }*/
        }
    }
};

@@ -129,38 +128,14 @@
    if (!this.validate()) {
        return;
    }
    var pName = $("#pName").val();
    if ("" == pName){
        if(language==1){
            Feng.info("上级部门不能为空");
        }else if(language==2){
            Feng.info("The upper department cannot be empty");
        }else {
            Feng.info("Departemen atas tidak bisa kosong");
        }

        return;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/dept/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
        Feng.success("添加成功!");
        window.parent.Dept.table.refresh();
        DeptInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.deptInfoData);
    ajax.start();
@@ -177,40 +152,14 @@
    if (!this.validate()) {
        return;
    }
    var pName = $("#pName").val();
    var pid = $("#pid").val();
    if (0 != pid){
        if ("" == pName){
            if(language==1){
                Feng.info("上级部门不能为空");
            }else if(language==2){
                Feng.info("The upper department cannot be empty");
            }else {
                Feng.info("Departemen atas tidak bisa kosong");
            }
            return;
        }
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/dept/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Dept.table.refresh();
        DeptInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.deptInfoData);
    ajax.start();
@@ -218,7 +167,7 @@

function onBodyDown(event) {
    if (!(event.target.id == "menuBtn" || event.target.id == "parentDeptMenu" || $(
            event.target).parents("#parentDeptMenu").length > 0)) {
        event.target).parents("#parentDeptMenu").length > 0)) {
        DeptInfoDlg.hideDeptSelectTree();
    }
}

 cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js

@@ -26,13 +26,7 @@
Dict.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    } else {

 cloud-server-management/src/main/webapp/static/modular/system/dict/dict_info.js

@@ -84,23 +84,11 @@
    this.collectData();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/dict/add", function (data) {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Dict.table.refresh();
        DictInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set('dictName',this.dictName);
    ajax.set('dictCode',this.dictCode);
@@ -115,23 +103,11 @@
DictInfoDlg.editSubmit = function () {
    this.collectData();
    var ajax = new $ax(Feng.ctxPath + "/dict/update", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Dict.table.refresh();
        DictInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set('dictId',$("#dictId").val());
    ajax.set('dictName',this.dictName);

 cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js

@@ -109,13 +109,7 @@
DriverActivity.check = function (type) {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        //验证类型null删除，1=审核，2=编辑,3=启动/暂停
@@ -123,40 +117,16 @@
            DriverActivity.seItem = selected[0];
            return true;
        }else if(type==3 && selected[0].status!=3 && selected[0].status!=4){
            if(language==1){
                Feng.info("当前状态不能暂停/启动！");
            }else if(language==2){
                Feng.info("The current state cannot be suspended/ started!");
            }else {
                Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
            }
            Feng.info("当前状态不能暂停/启动！");
            return false;
        }else if(type==3 && selected[0].status==3 && (selected[0].startTime>new Date() || new Date()>selected[0].endTime)){
            if(language==1){
                Feng.info("当前状态不能暂停/启动！");
            }else if(language==2){
                Feng.info("The current state cannot be suspended/ started!");
            }else {
                Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
            }
            Feng.info("当前状态不能暂停/启动！");
            return false;
        }else if(type==1 && selected[0].status!=1){
            if(language==1){
                Feng.info("当前状态不能审核！");
            }else if(language==2){
                Feng.info("The current status cannot be audited！");
            }else {
                Feng.info("Status saat ini tidak dapat diaudisikan！");
            }
            Feng.info("当前状态不能审核！");
            return false;
        }else if(type==2 && selected[0].status!=2){
            if(language==1){
                Feng.info("当前状态不能编辑！");
            }else if(language==2){
                Feng.info("The current status cannot be edited！");
            }else {
                Feng.info("Status saat ini tidak dapat diedit！");
            }
             Feng.info("当前状态不能编辑！");
            return false;
        }
        DriverActivity.seItem = selected[0];
@@ -201,13 +171,7 @@
    if (this.check(null)) {

        if(a == 2 &&DriverActivity.seItem.status!=1){
            if(language==1){
                Feng.info("请在待审核状态下操作")
            }else if(language==2){
                Feng.info("Please operate in the pending state")
            }else {
                Feng.info("Silakan beroperasi dalam keadaan menunggu")
            }
            Feng.info("请在待审核状态下操作")
            return;
        }

@@ -229,22 +193,10 @@
DriverActivity.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/driverActivity/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            DriverActivity.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("driverActivityId",this.seItem.id);
        ajax.start();
@@ -257,23 +209,11 @@
DriverActivity.updateStatus = function () {
    if (this.check(3)) {
        var ajax = new $ax(Feng.ctxPath + "/driverActivity/updateStatus", function (data) {
            if(language==1){
                Feng.success("启动/暂停成功!");
            }else if(language==2){
                Feng.success("Start/pause successfully!");
            }else {
                Feng.success("Mulai/berhenti dengan sukses!");
            }
            Feng.success("启动/暂停成功!");

            DriverActivity.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.success("启动/暂停失败!");
            }else if(language==2){
                Feng.success("Failed to start/pause!");
            }else {
                Feng.success("Gagal memulai/berhenti!");
            }
           Feng.success("启动/暂停失败!");
        });
        ajax.set("id",this.seItem.id);
        ajax.set("status",this.seItem.status==3?4:3);

 cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js

@@ -317,23 +317,11 @@

    // 提交信息
    var ajax = new $ax(Feng.ctxPath + "/driverActivity/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.DriverActivity.table.refresh();
        DriverActivityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("createTime",createTime);
@@ -584,23 +572,11 @@

    // 提交信息
    var ajax = new $ax(Feng.ctxPath + "/driverActivity/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.DriverActivity.table.refresh();
        DriverActivityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("createTime",createTime);

 cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js

@@ -167,13 +167,7 @@
YesDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{
@@ -234,13 +228,7 @@
YesDriver.selectUserOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }
@@ -250,13 +238,7 @@
    var nickName = selected[0].driverName;
    var phone = selected[0].phone;
    if ("" == id || null == id || undefined == id){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return ;
    }

 cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js

@@ -47,13 +47,7 @@
DriverActivityHistory.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{
@@ -100,22 +94,10 @@
DriverActivityHistory.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/driverActivityHistory/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            DriverActivityHistory.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("driverActivityHistoryId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/log/log.js

@@ -31,13 +31,7 @@
OptLog.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js

@@ -28,13 +28,7 @@
LoginLog.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    } else {

 cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js

@@ -7,7 +7,7 @@
    table: null,
    layerIndex: -1
};
var language =$("#language").val()

/**
 * 初始化表格的列
 */
@@ -15,55 +15,14 @@
    var columns = [
        {field: 'selectItem', radio: true},
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: language==1?'菜单名称':(language==2?'Menu Name':'Nama Menu'), field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title:language==1?'菜单编号':(language==2?'Menu Number':'Nomor Menu') , field: 'code', align: 'center', valign: 'middle', sortable: true},
        {title:language==1?'菜单父编号':(language==2?'Menu parent Number':'Nomor induk menu') , field: 'pcode', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'请求地址':(language==2?'Address of request':'Alamat permintaan'), field: 'url', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
        {title:language==1? '层级':(language==2?'hierarchy':'hierarki'), field: 'levels', align: 'center', valign: 'middle', sortable: true},
        {title: language==1? '是否是菜单':(language==2?'Menu or not':'Menu atau tidak'), field: 'isMenuName', align: 'center', valign: 'middle', sortable: true,
            formatter:function (data) {
                if(data=="是"){
                    if(language==1){
                        return "是"
                    }else if(language==2){
                        return "Yes"
                    }   else {
                        return "Ya"
                    }
                }else if(data=="否"){
                    if(language==1){
                        return "否"
                    }else if(language==2){
                        return "No"
                    }   else {
                        return "Tidak"
                    }
                }
            }
        },
        {title: language==1?'状态':(language==2?'State':'Status'), field: 'statusName', align: 'center', valign: 'middle', sortable: true,
            formatter:function (data) {
                if(data=="启用"){
                    if(language==1){
                        return "启用"
                    }else if(language==2){
                        return "Enable"
                    }   else {
                        return "Aktifkan"
                    }
                }else if(data=="禁用"){
                    if(language==1){
                        return "禁用"
                    }else if(language==2){
                        return "Disabled"
                    }   else {
                        return "Dilumpuhkan"
                    }
                }
            }

        }]
        {title: '菜单名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title: '菜单编号', field: 'code', align: 'center', valign: 'middle', sortable: true},
        {title: '菜单父编号', field: 'pcode', align: 'center', valign: 'middle', sortable: true},
        {title: '请求地址', field: 'url', align: 'center', valign: 'middle', sortable: true},
        {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
        {title: '层级', field: 'levels', align: 'center', valign: 'middle', sortable: true},
        {title: '是否是菜单', field: 'isMenuName', align: 'center', valign: 'middle', sortable: true},
        {title: '状态', field: 'statusName', align: 'center', valign: 'middle', sortable: true}]
    return columns;
};

@@ -74,14 +33,7 @@
Menu.check = function () {
    var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }

        Feng.info("请先选中表格中的某一记录！");
        return false;
    } else {
        Menu.seItem = selected[0];
@@ -95,7 +47,7 @@
Menu.openAddMenu = function () {
    var index = layer.open({
        type: 2,
        title: language==1?'添加':(language==2?'Add':'Tambahkan'),
        title: '添加菜单',
        area: ['830px', '450px'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -129,34 +81,16 @@

        var operation = function () {
            var ajax = new $ax(Feng.ctxPath + "/menu/remove", function (data) {
                if(language==1){
                    Feng.success("删除成功!");
                }else if(language==2){
                    Feng.success("Delete succeeded!");
                }else {
                    Feng.success("Hapus berhasil!");
                }
                Feng.success("删除成功!");
                Menu.table.refresh();
            }, function (data) {
                if(language==1){
                    Feng.error("删除失败!" + data.responseJSON.message + "!");
                }else if(language==2){
                    Feng.error("Delete failed!" + data.responseJSON.message + "!");
                }else {
                    Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
                }
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });
            ajax.set("menuId", Menu.seItem.id);
            ajax.start();
        };
        if(language==1){
            Feng.confirm("是否刪除该菜单?", operation);
        }else if(language==2){
            Feng.confirm("Whether to delete the menu?", operation);
        }else {
            Feng.confirm("Apakah untuk menghapus menu?", operation);
        }

        Feng.confirm("是否刪除该菜单?", operation);
    }
};


 cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js

@@ -1,8 +1,6 @@
/**
 * 菜单详情对话框
 */
var language =$("#language").val()

var MenuInfoDlg = {
    menuInfoData: {},
    ztreeInstance: null,
@@ -10,35 +8,35 @@
        name: {
            validators: {
                notEmpty: {
                    message: language==1?'菜单名称不能为空':(language==2?'The menu name cannot be empty':'Nama menu tidak dapat kosong')
                    message: '菜单名称不能为空'
                }
            }
        },
        code: {
            validators: {
                notEmpty: {
                    message: language==1?'菜单编号不能为空':(language==2?'The menu number cannot be empty':'Nomor menu tidak dapat kosong')
                    message: '菜单编号不能为空'
                }
            }
        },
        pcodeName: {
            validators: {
                notEmpty: {
                    message: language==1?'父菜单不能为空':(language==2?'The parent menu cannot be empty':'Menu induk tidak dapat kosong')
                    message: '父菜单不能为空'
                }
            }
        },
        url: {
            validators: {
                notEmpty: {
                    message: language==1?'请求地址不能为空':(language==2?'The request address cannot be empty':'Alamat permintaan tidak dapat kosong')
                    message: '请求地址不能为空'
                }
            }
        },
        num: {
            validators: {
                notEmpty: {
                    message: language==1?'序号不能为空':(language==2?'The serial number cannot be empty':'Nomor seri tidak dapat kosong')
                    message: '序号不能为空'
                }
            }
        }
@@ -110,23 +108,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/menu/add", function (data) {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
        Feng.success("添加成功!");
        window.parent.Menu.table.refresh();
        MenuInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.menuInfoData);
    ajax.start();
@@ -146,23 +132,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/menu/edit", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Menu.table.refresh();
        MenuInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.menuInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js

@@ -28,13 +28,7 @@
Notice.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    } else {

 cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js

@@ -82,23 +82,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/notice/add", function (data) {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Notice.table.refresh();
        NoticeInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.noticeInfoData);
    ajax.start();
@@ -118,23 +106,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/notice/update", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Notice.table.refresh();
        NoticeInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.noticeInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js

@@ -42,13 +42,7 @@
CouponStatistics.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js

@@ -18,13 +18,7 @@
CouponStatisticsInfo.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js

@@ -44,13 +44,7 @@
OperationalData.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/role/role.js

@@ -7,27 +7,19 @@
    table: null,
    layerIndex: -1
};
var language =$("#language").val()

/**
 * 初始化表格的列
 */
Role.initColumn = function () {
    var columns = [
        {field: 'selectItem', radio: true,
            /*formatter: function (value, row) {
                if (row.id == 1)
                    return {
                        disabled : true,//设置是否可用
                    };
                return "";
            }*/
        },
        {field: 'selectItem', radio: true},
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: language==1?'名称':(language==2?'Name':'Nama'), field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'上级角色':(language==2?'Superior role':'Peran orang tua'), field: 'pName', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'所在部门':(language==2?'Department':'Departemen'), field: 'deptName', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'包含账户数':(language==2?'Number of included accounts':'Jumlah rekening termasuk'), field: 'userCount', align: 'center', valign: 'middle', sortable: true},
        {title: language==1?'别名':(language==2?'alias':'alias'), field: 'tips', align: 'center', valign: 'middle', sortable: true}]
        {title: '添加时间', field: 'createTime', align: 'center', valign: 'middle'},
        {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
        {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
        {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
    return columns;
};

@@ -38,14 +30,7 @@
Role.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }

        Feng.info("请先选中表格中的某一记录！");
        return false;
    } else {
        Role.seItem = selected[0];
@@ -59,7 +44,7 @@
Role.openAddRole = function () {
    var index = layer.open({
        type: 2,
        title: language==1?'添加':(language==2?'Add':'Tambahkan'),
        title: '添加角色',
        area: ['800px', '450px'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -75,7 +60,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: language==1?'修改角色':(language==2?'modify role':'mengubah peran'),
            title: '修改角色',
            area: ['800px', '450px'], //宽高
            fix: false, //不固定
            maxmin: true,
@@ -93,34 +78,16 @@

        var operation = function(){
            var ajax = new $ax(Feng.ctxPath + "/role/remove", function () {
                if(language==1){
                    Feng.success("删除成功!");
                }else if(language==2){
                    Feng.success("Delete succeeded!");
                }else {
                    Feng.success("Hapus berhasil!");
                }
                Feng.success("删除成功!");
                Role.table.refresh();
            }, function (data) {
                if(language==1){
                    Feng.error("删除失败!" + data.responseJSON.message + "!");
                }else if(language==2){
                    Feng.error("Delete failed!" + data.responseJSON.message + "!");
                }else {
                    Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
                }
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });
            ajax.set("roleId", Role.seItem.id);
            ajax.start();
        };
        if(language==1){
            Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
        }else if(language==2){
            Feng.confirm("Whether to delete a Role " + Role.seItem.name + "?",operation);
        }else {
            Feng.confirm("Apakah menghapus peran " + Role.seItem.name + "?",operation);
        }

        Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
    }
};

@@ -131,8 +98,8 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: language==1?'权限配置':(language==2?'Permission Configuration':'Konfigurasi Keizinan'),
            area: ['30%', '80%'], //宽高
            title: '权限配置',
            area: ['300px', '450px'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/role/role_assign/' + this.seItem.id
@@ -150,6 +117,11 @@
    Role.table.refresh({query: queryData});
}

Role.resetSearch = function(){
    $("#roleName").val('');
    Role.search();
}

$(function () {
    var defaultColunms = Role.initColumn();
    var table = new BSTable(Role.id, "/role/list", defaultColunms);

 cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js

@@ -1,7 +1,6 @@
/**
 * 角色详情对话框（可用于添加和修改对话框）
 */
var language =$("#language").val()
var RolInfoDlg = {
    roleInfoData: {},
    deptZtree: null,
@@ -10,24 +9,24 @@
        name: {
            validators: {
                notEmpty: {
                    message: language==1?'用户名不能为空':(language==2?"The user name cannot be empty":"Nama pengguna tidak dapat kosong")
                    message: '用户名不能为空'
                }
            }
        },
        tips: {
            validators: {
                notEmpty: {
                    message: language==1?'别名不能为空':(language==2?"The alias cannot be empty":"Alias tidak dapat kosong")
                    message: '别名不能为空'
                }
            }
        }/*,
        },
        pName: {
            validators: {
                notEmpty: {
                    message: '父级名称不能为空'
                }
            }
        }*/
        }
    }
};

@@ -142,37 +141,14 @@
    if (!this.validate()) {
        return;
    }
    var pName = $("#pName").val();
    if ("" == pName){
        if(language==1){
            Feng.info("上级名称不能为空");
        }else if(language==2){
            Feng.info("The parent name cannot be empty");
        }else {
            Feng.info("Nama orang tua tidak dapat kosong");
        }

        return;
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/role/add", function (data) {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
        Feng.success("添加成功!");
        window.parent.Role.table.refresh();
        RolInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.roleInfoData);
    ajax.start();
@@ -189,36 +165,14 @@
    if (!this.validate()) {
        return;
    }
    var pName = $("#pName").val();
    if ("" == pName){
        if(language==1){
            Feng.info("上级名称不能为空");
        }else if(language==2){
            Feng.info("The parent name cannot be empty");
        }else {
            Feng.info("Nama orang tua tidak dapat kosong");
        }
        return;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/role/edit", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Role.table.refresh();
        RolInfoDlg.close();
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.roleInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js

@@ -131,13 +131,7 @@
SysCouponActivity.check = function (type) {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{
@@ -147,13 +141,7 @@
            return true;
        }else if(type==1 && selected[0].status!=1){

            if(language==1){
                Feng.info("当前状态不能审核！");
            }else if(language==2){
                Feng.info("The current status cannot be audited！");
            }else {
                Feng.info("Status saat ini tidak dapat diaudisikan！");
            }
            Feng.info("当前状态不能审核！");
            return false;
        }else if(type==2 && selected[0].status!=2){
            var companyId = $("#companyId").val()
@@ -168,13 +156,7 @@
                }

            }
            if(language==1){
                Feng.info("当前状态不能编辑！");
            }else if(language==2){
                Feng.info("The current status cannot be edited！");
            }else {
                Feng.info("Status saat ini tidak dapat diedit！");
            }
             Feng.info("当前状态不能编辑！");

            return false;
        }

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js

@@ -153,23 +153,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysCouponActivity/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.SysCouponActivity.table.refresh();
        SysCouponActivityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysCouponActivityInfoData);
    ajax.set("activityId",activityId);
@@ -224,23 +212,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysCouponActivity/update", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.SysCouponActivity.table.refresh();
        SysCouponActivityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysCouponActivityInfoData);
    ajax.set("activityId",activityId);

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js

@@ -108,13 +108,7 @@
SysCouponRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{
@@ -136,13 +130,7 @@
SysCouponRecord.selectCouponOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
@@ -150,13 +138,7 @@
    var couponType = selected[0].couponType;
    var money = selected[0].money;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }return ;
         Feng.info("请先选中表格中的某一记录！");return ;
    }
    var obj = $("#obj").val();
    window.parent.SysCouponActivityInfoDlg.selectCouponOpt(id,couponUseType,couponType,money);

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js

@@ -198,13 +198,7 @@
TUser.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TUser.seItem = selected[0];
@@ -224,13 +218,7 @@
TUser.selectUserOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
@@ -239,13 +227,7 @@
    var nickName = selected[0].nickName;
    var phone = selected[0].phone;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
         Feng.info("请先选中表格中的某一记录！");
return ;
    }
    var obj = $("#obj").val();

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js

@@ -142,13 +142,7 @@
SysCouponRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SysCouponRecord.seItem = selected[0];
@@ -175,13 +169,7 @@
SysCouponRecord.audit = function () {
    if (this.check()) {
        if(SysCouponRecord.seItem.status!=1){
            if(language==1){
                Feng.info("请在待审核状态下操作")
            }else if(language==2){
                Feng.info("Please operate in the pending state")
            }else {
                Feng.info("Silakan beroperasi dalam keadaan menunggu")
            }
            Feng.info("请在待审核状态下操作")
            return;
        }
        var index = layer.open({
@@ -219,22 +207,10 @@
SysCouponRecord.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/sysCouponRecord/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            SysCouponRecord.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("sysCouponRecordId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord_info.js

@@ -168,23 +168,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysCouponRecord/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.SysCouponRecord.table.refresh();
        SysCouponRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysCouponRecordInfoData);
    ajax.set("language",$("#yy").val());
@@ -201,23 +189,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysCouponRecord/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.SysCouponRecord.table.refresh();
        SysCouponRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysCouponRecordInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js

@@ -65,13 +65,7 @@
SysRedPacketRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SysRedPacketRecord.seItem = selected[0];
@@ -117,22 +111,10 @@
SysRedPacketRecord.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            SysRedPacketRecord.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("sysRedPacketRecordId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js

@@ -177,23 +177,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.SysRedPacketRecord.table.refresh();
        SysRedPacketRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysRedPacketRecordInfoData);
    ajax.start();
@@ -209,23 +197,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.SysRedPacketRecord.table.refresh();
        SysRedPacketRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.sysRedPacketRecordInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js

@@ -179,13 +179,7 @@
TAdvertisement.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TAdvertisement.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js

@@ -187,23 +187,11 @@


    var ajax = new $ax(Feng.ctxPath + "/tAdvertisement/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TAdvertisement.table.refresh();
        TAdvertisementInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tAdvertisementInfoData);
    ajax.set("cityId",twoId);
@@ -235,23 +223,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tAdvertisement/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TAdvertisement.table.refresh();
        TAdvertisementInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tAdvertisementInfoData);
    ajax.set("cityId",twoId);

 cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js

@@ -32,13 +32,7 @@
TAgreement.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TAgreement.seItem = selected[0];
@@ -84,22 +78,10 @@
TAgreement.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tAgreement/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TAgreement.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tAgreementId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement_info.js

@@ -66,23 +66,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tAgreement/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TAgreement.table.refresh();
        TAgreementInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tAgreementInfoData);
    ajax.start();
@@ -98,23 +86,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tAgreement/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TAgreement.table.refresh();
        TAgreementInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tAgreementInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js

@@ -30,13 +30,7 @@
CarInsurance.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        CarInsurance.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsuranceInfo.js

@@ -47,23 +47,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCar/saveCarInsurance", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.CarInsurance.table.refresh();
        CarInsuranceInfo.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.setData({
@@ -93,13 +81,7 @@
        $('#insurEff').val(s.insurEff.split(" ")[0]);
        $('#insurExp').val(s.insurExp.split(" ")[0]);
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.setData({

 cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js

@@ -171,13 +171,7 @@
TCar.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCar.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar_info.js

@@ -232,13 +232,7 @@
        }

    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());
@@ -344,13 +338,7 @@
            Feng.error(data.msg);
        }
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());
@@ -392,19 +380,19 @@
 */
TCarInfoDlg.oneChange = function (e) {
    var oneId=$(e).val();
    var ajax = new $ax(Feng.ctxPath + "/tDriver/oneChange", function(data){
    var ajax = new $ax(Feng.ctxPath + "/tCity/oneChange", function(data){
        if(data!=null){
            if(language==1){
                var content='<option value="">选择所属加盟商</option>';
                var content='<option value="">选择市</option>';
            }else if(language==2){
                var content='<option value="">Choose your franchisee</option>';
            }else {
                var content='<option value="">Pilih franchisee Anda</option>';
            }
            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
                content += "<option value='"+v.code+"'>"+v.name+"</option>";
            });
            $("#twoId").empty().append(content);
            $("#cCode").empty().append(content);
        }
    });
    ajax.set("oneId",oneId);

 cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js

@@ -91,13 +91,7 @@
TCarBrand.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCarBrand.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand_info.js

@@ -123,23 +123,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCarBrand/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TCarBrand.table.refresh();
        TCarBrandInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarBrandInfoData);
    ajax.set("language",$("#yy").val());
@@ -169,23 +157,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCarBrand/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TCarBrand.table.refresh();
        TCarBrandInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarBrandInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js

@@ -88,13 +88,7 @@
TCarModel.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCarModel.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel_info.js

@@ -106,23 +106,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCarModel/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TCarModel.table.refresh();
        TCarModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarModelInfoData);
    ajax.set("language",$("#yy").val());
@@ -141,23 +129,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCarModel/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TCarModel.table.refresh();
        TCarModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarModelInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js

@@ -81,13 +81,7 @@
TChatSetPage.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TChatSetPage.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage_info.js

@@ -90,23 +90,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TChatSet/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TChatSetPage.table.refresh();
        TbChatSetPageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("type",type);
    ajax.set("content",content);
@@ -149,23 +137,11 @@
    let yy = $("#yy").val()
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TChatSet/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TChatSetPage.table.refresh();
        TbChatSetPageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("id",id);
    ajax.set("type",type);

 cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity.js

New file
@@ -0,0 +1,292 @@
/**
 * 车辆管理管理初始化
 */
var TCompetition = {
    id: "TCompetitionTable",    //表格id
    seItem: null,        //选中的条目
    table: null,
    layerIndex: -1
};
var language =1
/**
 * 初始化表格的列
 */
TCompetition.initColumn = function () {
    return [
        {field: 'selectItem', radio: true},
        {title: '省', field: 'province', visible: true, align: 'center', valign: 'middle'
        },
        {title: '市', field: 'city', visible: true, align: 'center', valign: 'middle'},
        {title: '管理员姓名', field: 'name', visible: true, align: 'center', valign: 'middle'
        },
        {title:  '管理员手机号', field: 'phone', visible: true, align: 'center', valign: 'middle'
        },
        {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle'
            ,formatter:function (data) {
                return{1:"正常",2:"冻结"}[data]
            }
        },
    ];
};
function currentTime(timestamp){
    var time = timestamp + '';
    if(time.length != 13){
        timestamp = timestamp * 1000;
    }
    var date = new Date(timestamp);;
    var Y = date.getFullYear() + '-';
    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
    var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';

    var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':';
    var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':';
    var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds());
    var strDate = Y + M + D + h + m + s;
    return strDate
}

function currentTime1(timestamp){
    var time = timestamp + '';
    if(time.length != 13){
        timestamp = timestamp * 1000;
    }
    var date = new Date(timestamp);;
    var Y = date.getFullYear() + '-';
    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
    var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';

    var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':';
    var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':';
    var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds());
    var strDate = Y + M + D ;
    return strDate
}
/**
 * 检查是否选中
 */
TCompetition.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
            Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCompetition.seItem = selected[0];
        return true;
    }
};

/**
 * 点击添加车辆管理
 */
TCompetition.openAddTCompetition = function () {
    var index = layer.open({
        type: 2,
        title: '添加',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tCity/tCity_add'
    });
    this.layerIndex = index;
};

/**
 * 打开查看车辆管理详情
 */
TCompetition.openTCompetitionDetail = function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title:'编辑',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/TCompetition/TCompetition_update/' + TCompetition.seItem.id
        });
        this.layerIndex = index;
    }
};

/**
 * 删除车辆管理
 */
TCompetition.delete = function () {
    if (this.check()) {
        var nickname = TCompetition.seItem.carLicensePlate;
        if (nickname == "" || nickname == null || nickname == undefined){
                nickname = "该车辆";
        }else{
            nickname = "【"+nickname+"】";
        }
        swal({
           title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
            text: language==1?"请谨慎操作！":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'),
            type: "warning",
            showCancelButton: true,
            confirmButtonColor: "#DD6B55",
            confirmButtonText: language==1?"删除":(language==2?'Delete':'Hapus'),
            closeOnConfirm: true
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/TCompetition/delete", function (data) {
                  if(language==1){
                    swal("删除成功", "您已经成功删除了" + nickname + "。", "success");
                }else if(language==2){
                    swal("Delete succeeded!", "You have successfully deleted it" + nickname + "。", "success");
                }else {
                    swal("Hapus berhasil!", "Anda berhasil menghapus" + nickname + "。", "success");
                }
                TCompetition.table.refresh();
            }, function (data) {
                if(language==1){
                    swal("删除失败", data.responseJSON.message + "！", "warning");
                }else if(language==2){
                    swal("Failed to delete", data.responseJSON.message + "！", "warning");
                }else {
                    swal("Hapus Gagal", data.responseJSON.message + "！", "warning");
                }

            });
            ajax.set("TCompetitionId",TCompetition.seItem.id);
            ajax.start();
        });
    }
};


TCompetition.carInsurance = function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: language==1?'车辆保险':(language==2?'Vehicle insurance':'Asuransi kendaraan'),
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/TCompetition/carInsurance?carId=' + TCompetition.seItem.id
        });
        this.layerIndex = index;
    }
};



/**
 * 查询车辆管理列表
 */
TCompetition.search = function () {
    var queryData = {};
    TCompetition.table.refresh({query: queryData});
};

TCompetition.resetSearch = function () {
    TCompetition.search();
};

$(function () {
    var defaultColunms = TCompetition.initColumn();
    var table = new BSTable(TCompetition.id, "/tCity/list", defaultColunms);
    table.setPaginationType("server");
    TCompetition.table = table.init();
});

/**
 * 下载模板
 */
TCompetition.uploadCarModel = function () {
    window.location.href = Feng.ctxPath + "/TCompetition/uploadCarModel";
}

var agreement = function(){
    this.init = function(){
        //模拟上传excel  
        $("#uploadEventBtn").unbind("click").bind("click",function(){
            $("#uploadEventFile").click();
        });
    };
}
/**
 * 导入合同
 */
TCompetition.exporTCompetition = function () {
    var uploadEventFile = $("#uploadEventFile").val();
    if(uploadEventFile == ''){
        if(language==1){
            Feng.info("请选择Excel,再上传");
        }else if(language==2){
            Feng.info("Please select Excel and upload");
        }else {
            Feng.info("Silakan pilih Excel dan upload");
        }
    }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel  
        if(language==1){
            Feng.info("只能上传Excel文件");
        }else if(language==2){
            Feng.info("Only Excel files can be uploaded");
        }else {
            Feng.info("Hanya berkas Excel yang dapat diunggah");
        }
    }else{
        var url = Feng.ctxPath + '/TCompetition/exporTCompetition';
        var file = document.querySelector('input[name=file]').files[0];
        var reader = new FileReader();
        if (file) {
            var formData = new FormData();
            formData.append("myfile", file);
            this.sendAjaxRequest(url, 'POST', formData);
        }
    }
}
TCompetition.sendAjaxRequest = function(url,type,data){
    $.ajax({
        url : url,
        type : type,
        data : data,
        success : function(result) {
            if(result.code==500) {
                Feng.info(result.message);
            }else {
                if(language==1){
                    Feng.success("导入成功!");
                }else if(language==2){
                    Feng.success("SUCCESSFUL IMPORT!");
                }else {
                    Feng.success("Import berhasil!");
                }
            }
            TCompetition.table.refresh();
        },
        error : function() {
            if(language==1){
                Feng.error("excel上传失败!");
            }else if(language==2){
                Feng.error("Uploading excel Fails. Procedure!");
            }else {
                Feng.error("Gagal mengunggah excel!");
            }
        },
        cache : false,
        contentType : false,
        processData : false
    });
};

var agreement;
$(function(){
    agreement = new agreement();
    agreement.init();
});

/**
 * 导出车辆操作
 */
TCompetition.ouTCompetition = function () {
    var operation = function() {
        window.location.href = Feng.ctxPath + "/TCompetition/ouTCompetition";
    };
    if(language==1){
        Feng.confirm("是否确认导出车辆信息?", operation);
    }else if(language==2){
        Feng.confirm("Are you sure to export vehicle information?", operation);
    }else {
        Feng.confirm("Apakah Anda pasti akan mengekspor informasi kendaraan?", operation);
    }
}

 cloud-server-management/src/main/webapp/static/modular/system/tCity/tCity_info.js

New file
@@ -0,0 +1,346 @@
/**
 * 初始化车辆管理详情对话框
 */
var language=1;
var TCarInfoDlg = {
    tCarInfoData : {},
    validateFields: {
    }
};

/**
 * 验证数据是否为空
 */
TCarInfoDlg.validate = function () {
    $('#carInfoForm').data("bootstrapValidator").resetForm();
    $('#carInfoForm').bootstrapValidator('validate');
    return $("#carInfoForm").data('bootstrapValidator').isValid();
};

/**
 * 清除数据
 */
TCarInfoDlg.clearData = function() {
    this.tCarInfoData = {};
}

/**
 * 设置对话框中的数据
 *
 * @param key 数据的名称
 * @param val 数据的具体值
 */
TCarInfoDlg.set = function(key, val) {
    this.tCarInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
    return this;
}

/**
 * 设置对话框中的数据
 *
 * @param key 数据的名称
 * @param val 数据的具体值
 */
TCarInfoDlg.get = function(key) {
    return $("#" + key).val();
}

/**
 * 关闭此对话框
 */
TCarInfoDlg.close = function() {
    parent.layer.close(window.parent.TCompetition.layerIndex);
}

/**
 * 收集数据
 */
TCarInfoDlg.collectData = function() {
    this
    .set('id')
    .set('isPlatCar')
    .set('companyId')
    .set('franchiseeId')
    .set('carColor')
    .set('carModelId')
    .set('carBrandId')
    .set('carLicensePlate')
    .set('carPhoto')
    .set('drivingLicenseNumber')
    .set('drivingLicensePhoto')
    .set('annualInspectionTime')
    .set('commercialInsuranceTime')
    .set('createTime')
    .set('state')
    .set('addType')
    .set('addObjectId')
    .set('plateColor')
    .set('vehicleType')
    .set('ownerName')
    .set('engineId')
    .set('VIN')
    .set('certifyDateA')
    .set('fuelType')
    .set('engineDisplace')
    .set('certificate')
    .set('transAgency')
    .set('transArea')
    .set('transDateStart')
    .set('transDateStop')
    .set('certifyDateB')
    .set('fixState')
    .set('nextFixDate')
    .set('checkState')
    .set('feePrintId')
    .set('GPSBrand')
    .set('GPSModel')
    .set('GPSIMEI')
    .set('GPSInstallDate')
    .set('registerDate')
    .set('commercialType');
}

/**
 * 提交添加
 */
TCarInfoDlg.addSubmit = function() {

    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }

    let pCode = $("#pCode").val()
    let cCode = $("#cCode").val()
    let name = $("#name").val()
    let phone = $("#phone").val()

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCity/add", function(data){
        if(data.code == 200){
            if(language==1){
                Feng.success("添加成功!");
            }else if(language==2){
                Feng.success("Successfully added!");
            }else {
                Feng.success("Sangat berhasil ditambah!");
            }
            window.parent.TCompetition.table.refresh();
            TCarInfoDlg.close();
        }else{
            Feng.error(data.msg);
        }

    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("provinceCode",pCode);
    ajax.set("cityCode",cCode);
    ajax.set("name",name);
    ajax.set("phone",phone);
    ajax.start();
}

/**
 * 提交修改
 */
TCarInfoDlg.editSubmit = function() {

    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }

    var roleType = $("#roleType").val();  //1=平台  2=分公司 3=加盟商
    var companyType = $("input[name='companyType']:checked").val();
    if (1 == roleType){
        if (2 == companyType){
            var oneId = $("#oneId").val();
            if ("" == oneId){
                if(language==1){
                    Feng.info("所属分公司不能为空!");
                }else if(language==2){
                    Feng.info("The subordinate branch cannot be empty!");
                }else {
                    Feng.info("Cabang subordinat tidak dapat kosong!");
                }
                return;
            }
        }
    }
    var serverBox =[];
    $('input[name="serverBox"]:checked').each(function(){
        serverBox.push($(this).val());
    });
    if (serverBox.length == 0){
        if(language==1){
            Feng.info("请选择经营业务");
        }else if(language==2){
            Feng.info("Please select business");
        }else {
            Feng.info("Pilih bisnis");
        }
        return;
    }
    var carPhoto = $("#carPhoto").valueOf();
    if ("" == carPhoto){
        if(language==1){
            Feng.info("请上传车辆照片");
        }else if(language==2){
            Feng.info("Please upload a photo of the vehicle");
        }else {
            Feng.info("Silakan mengunggah foto kendaraan");
        }
        return;
    }
    var drivingLicensePhoto = $("#drivingLicensePhoto").valueOf();
    if ("" == drivingLicensePhoto){
        if(language==1){
            Feng.info("请上传行驶证照片");
        }else if(language==2){
            Feng.info("Please upload a photo of your vehicle. Please upload a photo of your driving license");
        }else {
            Feng.info("Silakan mengunggah foto kendaraanmu. Silakan mengunggah foto dari lisensi mengemudi Anda");
        }
        return;
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){
        if(data.status == 200){
            if(language==1){
                Feng.success("修改成功!");
            }else if(language==2){
                Feng.success("Modify successfully!");
            }else {
                Feng.success("Mengubah dengan sukses!");
            }
            window.parent.TCar.table.refresh();
            TCarInfoDlg.close();
        }else{
            Feng.error(data.msg);
        }
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());
    ajax.set("zcModel",$("#zcModel").val());
    ajax.set("kcModel",$("#kcModel").val());
    ajax.set("roleType",roleType);
    if (1 == roleType){
        ajax.set("companyType",companyType);
        ajax.set("oneId",$("#oneId").val());
        ajax.set("twoId",$("#twoId").val());
        ajax.set("franchiseeId",0);
    } else if (2 == roleType) {
        ajax.set("franchiseeId",$("#franchiseeId").val());
        ajax.set("companyType",0);
        ajax.set("oneId",0);
        ajax.set("twoId",0);
    }else if (3 == roleType){
        ajax.set("franchiseeId",0);
        ajax.set("companyType",0);
        ajax.set("oneId",0);
        ajax.set("twoId",0);
    }
    ajax.start();
}

$(function() {
    Feng.initValidator("carInfoForm", TCarInfoDlg.validateFields);
    // 初始化图片上传
    var carPhoto = new $WebUpload("carPhoto");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
    drivingLicensePhoto.setUploadBarId("progressBar");
    drivingLicensePhoto.init();
});

/**
 * 选择分公司后执行
 */
TCarInfoDlg.oneChange = function (e) {
    var oneId=$(e).val();
    var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){
        if(data!=null){
            if(language==1){
                var content='<option value="">选择市</option>';
            }else if(language==2){
                var content='<option value="">Choose your franchisee</option>';
            }else {
                var content='<option value="">Pilih franchisee Anda</option>';
            }
            $.each(data, function(k,v) {
                content += "<option value='"+v.code+"'>"+v.name+"</option>";
            });
            $("#cCode").empty().append(content);
        }
    });
    ajax.set("oneId",oneId);
    ajax.start();
}

/**
 * 类型改变执行
 * @param e
 */
TCarInfoDlg.companyTypeClick = function (e) {
    if (1 == e){
        $(".companyDiv").hide();
    } else if (2 == e){
        $(".companyDiv").show();
    }
}

/**
 * 车辆品牌改变时执行
 */
TCarInfoDlg.brandChange = function (e) {
    var carBrandId=$(e).val();
    var ajax = new $ax(Feng.ctxPath + "/tCar/brandChange", function(data){
        if(data!=null){
            if(language==1){
                var content='<option value="">选择车辆类型</option>';
            }else if(language==2){
                var content='<option value="">Please select the vehicle type</option>';
            }else {
                var content='<option value="">Pilih Jenis Kendaraan</option>';
            }

            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
            });
            $("#carModelId").empty().append(content);
        }
    });
    ajax.set("carBrandId",carBrandId);
    ajax.start();
}

/**
 * 专车服务被点击
 */
TCarInfoDlg.zcServerClick = function () {
    var serverBox1 = $('#serverBox1').prop('checked');
    if (serverBox1){
        $("#zcModelDiv").show();
    } else {
        $("#zcModelDiv").hide();
    }
}

/**
 * 跨城服务被点击
 */
TCarInfoDlg.kcServerClick = function () {
    var serverBox3 = $('#serverBox3').prop('checked');
    if (serverBox3){
        $("#kcModelDiv").show();
    } else {
        $("#kcModelDiv").hide();
    }
}

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js

@@ -165,13 +165,7 @@
Franchisee.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        Franchisee.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -342,23 +342,11 @@
            }
            return;
        }
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Franchisee.table.refresh();
        FranchiseeInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
    if (checkbox1){
@@ -598,23 +586,11 @@
            }
            return;
        }
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Franchisee.table.refresh();
        FranchiseeInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
    if (checkbox1){

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js

@@ -185,13 +185,7 @@
TCompany.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCompany.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js

@@ -214,13 +214,7 @@
TCompanyAudit.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCompanyAudit.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit_info.js

@@ -271,13 +271,7 @@
            }
            return;
        }
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TCompanyAudit.table.refresh();
        TCompanyAuditInfoDlg.close();
    },function(data){
@@ -503,23 +497,11 @@
            }
            return;
        }
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TCompanyAudit.table.refresh();
        TCompanyAuditInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(TCompanyAuditInfoDlg.tCompanyAuditInfoData);
    if (checkbox1){

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -319,13 +319,7 @@
            }
            return;
        }
        if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
        Feng.success("添加成功!");
        window.parent.TCompany.table.refresh();
        TCompanyInfoDlg.close();
    },function(data){
@@ -551,23 +545,11 @@
            }
            return;
        }
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TCompany.table.refresh();
        TCompanyInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(TCompanyInfoDlg.tCompanyInfoData);
    if (checkbox1){

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js

@@ -232,13 +232,7 @@
        }

    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());
@@ -344,13 +338,7 @@
            Feng.error(data.msg);
        }
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());

 cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js

@@ -129,13 +129,7 @@
TComplaint.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TComplaint.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js

New file
@@ -0,0 +1,190 @@
/**
 * 管理初始化
 */
var TCoupon = {
    id: "TCouponTable",    //表格id
    seItem: null,        //选中的条目
    table: null,
    layerIndex: -1
};

/**
 * 初始化表格的列
 */
TCoupon.initColumn = function () {
    return [
        {field: 'selectItem', radio: true},
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: '优惠券名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
        {title: '适用范围', field: 'useScope', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
            }
        },
        {title: '优惠券类型', field: 'type', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "满减券", 2: "代金券", 3: "体验券"}[value]
            }},
        {title: '发放方式', field: 'distributionMethod', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "积分购买", 2: "注册赠送", 3: "自动发券"}[value]
            }},
        {title: '有效期', field: 'timeValue', visible: true, align: 'center', valign: 'middle'},
        {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "全部用户", 2: "年度会员", 3: "已有学员用户"}[value]
            }},
        {title: '发放数量', field: 'quantityIssued', visible: true, align: 'center', valign: 'middle'},
        {title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'},
        {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'},
        {title: '活动状态', field: 'status', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "未开始", 2: "已开始", 3: "已结束"}[value]
            }},
        {title: '可售状态', field: 'state', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "上架", 2: "下架"}[value]
            }},
    ];
};

/**
 * 检查是否选中
 */
TCoupon.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCoupon.seItem = selected[0];
        return true;
    }
};

/**
 * 点击添加
 */
TCoupon.openAdd = function () {
    var index = layer.open({
        type: 2,
        title: '添加',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tCouponManage/coupon_add'
    });
    this.layerIndex = index;
};


/**
 * 点击编辑
 */
TCoupon.openChange = function () {
    if (this.check()){
        var index = layer.open({
            type: 2,
            title: '编辑',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/tCouponManage/tCouponManage_add'
        });
        this.layerIndex = index;
    }
};



/**
 * 上架
 */
TCoupon.onShelf = function () {


};


/**
 * 下架
 */
TCoupon.offShelf = function () {


};


/**
 * 打开查看详情
 */
TCoupon.openDetail = function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '详情',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/tCouponManage/coupon_detail/' + TCoupon.seItem.id
        });
        this.layerIndex = index;
    }
};




/**
 * 打开领取记录
 */
TCoupon.openCollectionRecord = function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '详情',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/tCouponManage/coupon_record/' + TCoupon.seItem.id
        });
        this.layerIndex = index;
    }
};



/**
 * 查询列表
 */
TCoupon.search = function () {
    var queryData = {};
    queryData['name'] = $("#name").val();
    queryData['type'] = $("#type").val();
    queryData['distributionMethod'] = $("#distributionMethod").val();
    queryData['userPopulation'] = $("#userPopulation").val();
    queryData['status'] = $("#status").val();
    queryData['state'] = $("#state").val();
    TCoupon.table.refresh({query: queryData});
};


/**
 * 重置搜索
 */
TCoupon.resetSearch = function () {
    $("#name").val('');
    $("#type").val('');
    $("#distributionMethod").val('');
    $("#userPopulation").val('');
    $("#status").val('');
    $("#state").val('');
    TCoupon.search();
};

$(function () {
    var defaultColunms = TCoupon.initColumn();
    var table = new BSTable(TCoupon.id, "/tCouponManage/list", defaultColunms);
    table.setPaginationType("client");
    TCoupon.table = table.init();
});

 cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js

New file
@@ -0,0 +1,438 @@
/**
 * 初始化详情对话框
 */
var couponInfoDlg = {
    couponInfoData: {}
};

/**
 * 清除数据
 */
couponInfoDlg.clearData = function () {
    this.couponInfoData = {};
}

/**
 * 设置对话框中的数据
 *
 * @param key 数据的名称
 * @param val 数据的具体值
 */
couponInfoDlg.set = function (key, val) {
    this.couponInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
    return this;
}

/**
 * 设置对话框中的数据
 *
 * @param key 数据的名称
 * @param val 数据的具体值
 */
couponInfoDlg.get = function (key) {
    return $("#" + key).val();
}

/**
 * 关闭此对话框
 */
couponInfoDlg.close = function () {
    parent.layer.close(window.parent.CouponServer.layerIndex);
}

function ajax(serverCouponId, value, remark) {
    var ajax = new $ax(Feng.ctxPath + "/couponServer/examine", function (data) {
        Feng.success("审核成功!");
        window.parent.CouponServer.table.refresh();
        couponInfoDlg.close();
    }, function (data) {
        Feng.error("审核失败!" + data.responseJSON.message + "!");
    });
    ajax.setData({
        couponServerId: serverCouponId,
        state: value,
        remark: remark
    });
    ajax.start();
}

function refush() {
    $("#detailBox").show()
}

function agree() {
    $("#detailBox").hide()
}

function checkCompany() {
    $("#demo2").hide()
}

function checkCompany2() {
    $("#demo2").show()
}

function radio1() {
    $("#time").val('')
    // document.getElementById("time").readOnly = true;
    $("#time").attr('disabled', 'disabled');
    $("#createTime").removeAttr("disabled");
}

function radio2() {
    $("#createTime").val('')
    // document.getElementById("time").readOnly = false;
    $("#time").removeAttr("disabled");
    $("#createTime").attr('disabled', 'disabled');
}

function radio3() {
    $("#time").val('')
    $("#createTime").val('')
    //document.getElementById("createTime").readOnly = true;
    // document.getElementById("time").readOnly = true;
    $("#createTime").attr('disabled', 'disbled');
    $("#time").attr('disabled', 'disabled');
}

/**
 * 关闭此对话框
 */
couponInfoDlg.addSubmitCoupon = function () {
    var value = $('input:radio:checked').val();
    let couponServerId = $("#serverCouponId").val();
    let remark = $('#detail').val()
    if (value == 1) {
        //提交信息
        ajax(couponServerId, value, remark)
    } else {
        if (!remark) {
            Feng.error("请输入拒绝理由!");
            return;
        }
        ajax(couponServerId, value, remark)
    }
}

/**
 * 收集数据
 */
couponInfoDlg.collectData = function () {
    this
        .set('couponId')
        .set('name')
        .set('type')
        .set('typeName')
        .set('times')
        .set('sheetsNum')
        .set('auditStatus')
        .set('reason')
        .set('remark')
        .set('startTime')
        .set('endTime')
        .set('activityId')
        .set('createId')
        .set('createTime')
        .set('timeType')
        .set('expDay')
        .set('couponCode')
        .set('instructions')
        .set('belongs')
        .set('useTimes');
}

function couponCheck() {
    if ($("#couponType").val() == 6) {
        $("#couponName1").show()
    } else {
        $("#couponName1").hide()
    }
}

function checkCouponTimes() {
    if ($("#inlineCheckbox").prop('checked')) {
        $("#couponTimes").prop("disabled", true)
        $("#couponTimes").val('')
    } else {
        $("#couponTimes").prop("disabled", false)
    }
}

/**
 * 提交添加
 */
couponInfoDlg.addSubmit = function () {
    this.clearData();
    this.collectData();

    let times = 1;
    if ($("#inlineCheckbox").get(0).checked) {
        times = 0
    } else {
        let times1 = $("#couponTimes").val();
        times = times1 != '' ? times1 : 1;
        if (times > 100) {
            Feng.error("服务次数最多为100次!")
            return;
        }
        if (times < 1) {
            Feng.error("服务次数至少为1次!")
            return;
        }
    }
    console.log(times);
    var val2 = $("#number").val();
    if (!val2) {
        Feng.error("请输入服务券张数!")
        return;
    }
    if (val2 <= 0) {
        Feng.error("请输入正确的服务券张数!")
        return;
    }
    let timeType = $(':radio[name="prescription"]:checked').val()
    let expDay = 0
    if (timeType == 2) {
        expDay = $("#time").val()
        if (expDay == null || expDay == '') {
            Feng.info("请输入领取后有效天数")
            return
        }
        if (expDay <= 0) {
            Feng.info("请输入正确的天数")
            return
        }
    }
    var split = $('#createTime').val().split(" - ");
    if (timeType == 1) {
        if (split == null || split == '' || split == "-") {
            Feng.info("请输入有效期")
            return
        }
    }
    if ($("#couponType").val() == 6) {
        var val2 = $("#couponName1").val();
        if (!val2) {
            Feng.info("请输入服务卷名称")
            return
        }
        if (val2.length > 4) {
            Feng.info("请输入4个字以内券名称")
            return
        }
    }

    //分公司直接就默认自己
    var val1 = $("#type_").val();
    var val = xmSelect.get('#demo2', true).getValue('valueStr')
    if (val1 == 1) {
        if ($(':radio[name="company"]:checked').val() == 1) {
            if (val == "") {
                Feng.error("指定公司未选择！")
                return;
            }
        }
        if (val == "" || $(':radio[name="company"]:checked').val() == 0) {
            val = 0;
        }
    } else {
        val = $("#companyId_").val();
    }
    if (!$("#detail").val()) {
        Feng.error("请输入服务描述")
        return;
    }
    if (!$("#couponName").val()) {
        Feng.error("请输入服务券名称!")
        return;
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/couponServer/add", function (data) {
        Feng.success("添加成功!");
        window.parent.CouponServer.table.refresh();
        couponInfoDlg.close();
    }, function (data) {
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.setData({
        name: $("#couponName").val(),
        type: $("#couponType").val(),
        typeName: $("#couponName1").val(),
        times: times,
        sheetsNum: $("#number").val(),
        remark: $("#detail").val(),
        startTime: split[0],
        endTime: split[1],
        timeType: $(':radio[name="prescription"]:checked').val(),
        expDay: $("#time").val(),
        belongs: val,
    });
    ajax.start();
}

/**
 * 提交修改
 */
couponInfoDlg.editSubmit = function () {

    this.clearData();
    this.collectData();

    if (!$("#couponName").val()) {
        Feng.error("请输入服务券名称!")
        return;
    }
    let times = 1;
    if ($("#inlineCheckbox").get(0).checked) {
        times = 0
    } else {
        times = $("#couponTimes").val()
        if (times > 100) {
            Feng.error("服务次数最多为100次!")
            return;
        }
        if (times < 1) {
            Feng.error("服务次数至少为1次!")
            return;
        }
    }
    var val3 = $("#number").val();
    if (!val3) {
        Feng.error("请输入服务券张数!")
        return;
    }
    if (val3 <= 0) {
        Feng.error("请输入正确的服务券张数!")
        return;
    }
    if ($("#couponType").val() == 6) {
        var val2 = $("#couponName1").val();
        if (!val2) {
            Feng.info("请输入服务卷名称")
            return
        }
        if (val2.length > 4) {
            Feng.info("请输入4个字以内券名称")
            return
        }
    }
    let timeType = $(':radio[name="prescription"]:checked').val()
    let expDay = 0
    if (timeType == 2) {
        expDay = $("#time").val()
        if (expDay == null || expDay == '') {
            Feng.info("请输入领取后有效天数")
            return
        }
        if (expDay <= 0) {
            Feng.info("请输入正确的天数")
            return
        }
    }
    var split = $('#createTime').val().split(" - ");
    if (timeType == 1) {
        if (split == null || split == '' || split == "-") {
            Feng.info("请输入有效期")
            return
        }
    }

    //分公司直接就默认自己
    var val1 = $("#type_").val();
    var val = xmSelect.get('#demo2', true).getValue('valueStr')
    if (val1 == 1) {
        if ($(':radio[name="company"]:checked').val() == 1) {
            if (val == "") {
                Feng.error("指定公司未选择！")
                return;
            }
        }
        if (val == "" || $(':radio[name="company"]:checked').val() == 0) {
            val = 0;
        }
    } else {
        val = $("#companyId_").val();
    }
    if (!$("#detail").val()) {
        Feng.error("请输入服务描述")
        return;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/couponServer/update", function (data) {
        Feng.success("修改成功!");
        window.parent.CouponServer.table.refresh();
        couponInfoDlg.close();
    }, function (data) {
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.setData({
        couponId: $("#couponId_").val(),
        name: $("#couponName").val(),
        type: $("#couponType").val(),
        typeName: $("#couponName1").val(),
        times: times,
        sheetsNum: $("#number").val(),
        remark: $("#detail").val(),
        timeType: $(':radio[name="prescription"]:checked').val(),
        expDay: $("#time").val(),
        belongs: val,
    });
    ajax.set("startTimeStr", split[0]);
    ajax.set("endTimeStr", split[1]);
    ajax.start();
}

$(function () {

    var val3 = $("#couponType_").val();
    document.getElementById("couponType").selectedIndex = val3 - 1;
    if ($("#couponType").val() == 6) {
        $("#couponName1").show()
    }

    var val1 = $('#remark_').val();
    if (val1 != '' && val1 != null) {
        const detailTextarea = document.querySelector('#detail');
        detailTextarea.value = val1;
    }

    if ($('#times_').val() == 0) {
        $('#couponTimes').val('')
        $("#couponTimes").prop("disabled", true)
        $("#inlineCheckbox").prop('checked', true)
    } else {
        $('#couponTimes').val($('#times_').val())
    }
    // $(':radio[name="prescription"]:checked').val($("#timeType_").val())
    var val2 = $("#timeType_").val();
    $(":radio[name='prescription'][value=" + val2 + "]").prop("checked", "checked");
    if (val2 == 1) {
        $("#time").val('');
        // document.getElementById("time").readOnly = true;
        $("#time").attr('disabled', 'disabled');
        $("#createTime").removeAttr("disabled");
    } else if (val2 == 2) {
        $("#createTime").val('')
        // document.getElementById("time").readOnly = false;
        $("#time").removeAttr("disabled");
        $("#createTime").attr('disabled', 'disabled');
    } else {
        $("#time").val('')
        $("#createTime").val('')
        //document.getElementById("time").readOnly = true;
        $("#time").attr('disabled', 'disabled');
        $("#createTime").attr('disabled', 'disabled');
    }

    if ($("#belongs_").val() == '0') {
        $("#demo2").hide()
        $("input:radio[value='0']").attr('checked', 'true');
    } else {
        $("input:radio[value='4']").attr('checked', 'true');
    }

    // document.getElementById("time").readOnly = true;
    // $("#createTime").attr('disabled', 'disabled');couponTimes
    $("#couponTimes").val(1)
});

 cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js

@@ -94,13 +94,7 @@
TDispatch.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TDispatch.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch_info.js

@@ -156,24 +156,12 @@
            Feng.error(data.message);
            return ;
        } else {
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TDispatch.table.refresh();
            TDispatchInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDispatchInfoData);
    if (1 == roleType){
@@ -211,24 +199,12 @@
            Feng.error(data.message);
            return ;
        } else {
            if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
            window.parent.TDispatch.table.refresh();
            TDispatchInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDispatchInfoData);
    if (1 == roleType){

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js

@@ -247,13 +247,7 @@
TDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TDriver.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js

@@ -182,13 +182,7 @@
TDriverVerify.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TDriverVerify.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify_info.js

@@ -192,23 +192,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriverVerify/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TDriverVerify.table.refresh();
        TDriverVerifyInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDriverVerifyInfoData);
    ajax.start();
@@ -224,23 +212,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriverVerify/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TDriverVerify.table.refresh();
        TDriverVerifyInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDriverVerifyInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -149,23 +149,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriver/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TDriver.table.refresh();
        TDriverInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDriverInfoData);
    ajax.start();
@@ -181,23 +169,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriver/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TDriver.table.refresh();
        TDriverInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tDriverInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -173,13 +173,7 @@
YesDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        YesDriver.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js

@@ -335,13 +335,7 @@

            return;
        }
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.YesDriver.table.refresh();
        YesDriverInfoDlg.close();
    },function(data){
@@ -479,23 +473,11 @@
            }
            return;
        }
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.YesDriver.table.refresh();
        YesDriverInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.yesDriverInfoData);
    ajax.set("serverBox",serverBox.toString());

 cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js

@@ -88,13 +88,7 @@
SelectCar.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SelectCar.seItem = selected[0];
@@ -144,13 +138,7 @@
SelectCar.selectCarOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    //提交信息

 cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js

@@ -106,7 +106,7 @@
            Feng.info("请先选中表格中的某一记录！");
        }
        if(language == 2){
            Feng.info("Please select a record in the table first！");
            Feng.info("Please select 条记录 in the table first！");
        }
        if(language == 3){
            Feng.info("Silakan pilih catatan di tabel pertama！");

 cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js

@@ -156,13 +156,7 @@
TFeedback.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TFeedback.seItem = selected[0];
@@ -204,22 +198,10 @@
TFeedback.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tFeedback/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TFeedback.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tFeedbackId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js

@@ -165,13 +165,7 @@
TUserFeedback.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TUserFeedback.seItem = selected[0];
@@ -212,22 +206,10 @@
TUserFeedback.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tFeedback/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TUserFeedback.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tFeedbackId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js

@@ -94,13 +94,7 @@
TGuidePage.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TGuidePage.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage_info.js

@@ -120,23 +120,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TGuidePage/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TGuidePage.table.refresh();
        TbGuidePageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("type",type);
    ajax.set("sort",sort);
@@ -164,23 +152,11 @@
    let img = $("#image").val()
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TGuidePage/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TGuidePage.table.refresh();
        TbGuidePageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("type",type);
    ajax.set("name",name);

 cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js

@@ -77,13 +77,7 @@
THotAddress.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        THotAddress.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress_info.js

@@ -115,23 +115,11 @@
    let sort = $("#sort").val()
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/THotAddress/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.THotAddress.table.refresh();
        TbHotAddressDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("cityId",cityId);
    ajax.set("cityId1",cityId1);
@@ -171,23 +159,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/THotAddress/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.THotAddress.table.refresh();
        TbHotAddressDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("cityId",cityId);
    ajax.set("cityId1",cityId1);

 cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js

@@ -75,13 +75,7 @@
TIntegralGoods.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TIntegralGoods.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods_info.js

@@ -104,23 +104,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tIntegralGoods/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TIntegralGoods.table.refresh();
        TIntegralGoodsInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tIntegralGoodsInfoData);
    ajax.start();
@@ -143,23 +131,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tIntegralGoods/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TIntegralGoods.table.refresh();
        TIntegralGoodsInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tIntegralGoodsInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js

@@ -132,13 +132,7 @@
TIntegralOrder.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TIntegralOrder.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js

@@ -139,13 +139,7 @@
TInvoice.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TInvoice.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice_info.js

@@ -71,23 +71,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tInvoice/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TInvoice.table.refresh();
        TInvoiceInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tInvoiceInfoData);
    ajax.start();
@@ -103,23 +91,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tInvoice/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TInvoice.table.refresh();
        TInvoiceInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tInvoiceInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js

@@ -92,13 +92,7 @@
TLine.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TLine.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine_info.js

@@ -151,26 +151,14 @@
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tLine/add", function(data){
        if(data.status == 200){
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TLine.table.refresh();
            TLineInfoDlg.close();
        }else{
            Feng.error(data.msg);
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tLineInfoData);
    ajax.set("startSiteId",startSiteId);
@@ -223,26 +211,14 @@
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tLine/update", function(data){
        if(data.status == 200){
            if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
            window.parent.TLine.table.refresh();
            TLineInfoDlg.close();
        }else{
            Feng.error(data.msg);
        }
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tLineInfoData);
    ajax.set("startSiteId",startSiteId);

 cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js

@@ -105,13 +105,7 @@
TMotorModel.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TMotorModel.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel_info.js

@@ -105,23 +105,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tMotorModel/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TMotorModel.table.refresh();
        TMotorModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tMotorModelInfoData);
    ajax.set("img",$("#image").val());
@@ -142,23 +130,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tMotorModel/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TMotorModel.table.refresh();
        TMotorModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tMotorModelInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js

@@ -91,13 +91,7 @@
System.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        System.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tNotices/system_info.js

@@ -128,23 +128,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tNotices/addSystem", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.System.table.refresh();
        SystemInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(SystemInfoDlg.tSystemInfoData);
    var serverBox1 = $('#serverBox1').prop('checked');
@@ -186,23 +174,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tNotices/updateSystem", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.System.table.refresh();
        SystemInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(SystemInfoDlg.tSystemInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js

@@ -90,13 +90,7 @@
TNotices.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TNotices.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices_info.js

@@ -114,23 +114,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tNotices/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TNotices.table.refresh();
        TNoticesInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tNoticesInfoData);
    ajax.set("language",$("#yy").val());
@@ -149,23 +137,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tNotices/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TNotices.table.refresh();
        TNoticesInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tNoticesInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js

@@ -102,13 +102,7 @@
TOpenCity.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOpenCity.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js

@@ -135,23 +135,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOpenCity/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOpenCity.table.refresh();
        TOpenCityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOpenCityInfoData);
    ajax.set("content",JSON.stringify(content_latLng));
@@ -202,23 +190,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOpenCity/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOpenCity.table.refresh();
        TOpenCityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOpenCityInfoData);
    ajax.set("content",JSON.stringify(content_latLng));

 cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js

@@ -124,13 +124,7 @@
TOrderCharter.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderCharter.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js

@@ -118,13 +118,7 @@
TOrderCharteredCar.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderCharteredCar.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js

@@ -227,13 +227,7 @@
TOrderCrossCity.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderCrossCity.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js

@@ -112,23 +112,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderCrossCity/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOrderCrossCity.table.refresh();
        TOrderCrossCityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderCrossCityInfoData);
    ajax.start();
@@ -144,23 +132,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderCrossCity/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOrderCrossCity.table.refresh();
        TOrderCrossCityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderCrossCityInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js

@@ -111,13 +111,7 @@
TOrderEvaluate.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderEvaluate.seItem = selected[0];
@@ -163,22 +157,10 @@
TOrderEvaluate.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tOrderEvaluate/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TOrderEvaluate.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tOrderEvaluateId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js

@@ -65,23 +65,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderEvaluate/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOrderEvaluate.table.refresh();
        TOrderEvaluateInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderEvaluateInfoData);
    ajax.start();
@@ -97,23 +85,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderEvaluate/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOrderEvaluate.table.refresh();
        TOrderEvaluateInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderEvaluateInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js

@@ -267,13 +267,7 @@
TOrderLogistics.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderLogistics.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics_info.js

@@ -115,23 +115,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderLogistics/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOrderLogistics.table.refresh();
        TOrderLogisticsInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderLogisticsInfoData);
    ajax.start();
@@ -147,23 +135,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderLogistics/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOrderLogistics.table.refresh();
        TOrderLogisticsInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderLogisticsInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js

@@ -270,13 +270,7 @@
TOrderPrivateCar.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderPrivateCar.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js

@@ -122,23 +122,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOrderPrivateCar.table.refresh();
        TOrderPrivateCarInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderPrivateCarInfoData);
    ajax.start();
@@ -154,23 +142,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOrderPrivateCar.table.refresh();
        TOrderPrivateCarInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderPrivateCarInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js

@@ -87,13 +87,7 @@
SelectDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SelectDriver.seItem = selected[0];
@@ -147,13 +141,7 @@
            window.parent.TOrderTaxi.table.refresh();
            SelectDriver.close();
        },function(data){
            if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        });
        ajax.set("orderId",$("#id").val());
        ajax.set("driverId",SelectDriver.seItem.id);

 cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js

@@ -211,13 +211,7 @@
TOrderTaxi.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TOrderTaxi.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js

@@ -108,23 +108,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderTaxi/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TOrderTaxi.table.refresh();
        TOrderTaxiInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderTaxiInfoData);
    ajax.start();
@@ -140,23 +128,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tOrderTaxi/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TOrderTaxi.table.refresh();
        TOrderTaxiInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tOrderTaxiInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js

@@ -165,13 +165,7 @@
TProblem.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TProblem.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js

@@ -191,7 +191,7 @@
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first!");
            Feng.info("Please select 条记录 in the table first!");
        }else {
            Feng.info("Harap pilih catatan di tabel terlebih dahulu!");
        }

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js

@@ -87,13 +87,7 @@
SelectCrossDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SelectCrossDriver.seItem = selected[0];
@@ -152,13 +146,7 @@
            SelectCrossDriver.close();
            layer.closeAll()
        },function(data){
            if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
            layer.closeAll()
        });
        ajax.set("orderId",$("#id").val());

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js

@@ -87,13 +87,7 @@
SelectPrivateCarDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SelectPrivateCarDriver.seItem = selected[0];
@@ -152,13 +146,7 @@
            SelectPrivateCarDriver.close();
            layer.closeAll()
        },function(data){
            if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
            layer.closeAll()
        });
        ajax.set("orderId",$("#id").val());

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js

@@ -87,13 +87,7 @@
SelectPrivateCarDriver.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SelectPrivateCarDriver.seItem = selected[0];
@@ -152,13 +146,7 @@
            SelectPrivateCarDriver.close();
            layer.closeAll()
        },function(data){
            if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
            layer.closeAll()
        });
        ajax.set("orderId",$("#id").val());

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js

@@ -223,13 +223,7 @@
TReassign.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TReassign.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js

@@ -223,13 +223,7 @@
TCross.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCross.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js

@@ -223,13 +223,7 @@
TReassign.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TReassign.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign_info.js

@@ -73,23 +73,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tReassign/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TReassign.table.refresh();
        TReassignInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tReassignInfoData);
    ajax.start();
@@ -105,23 +93,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tReassign/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TReassign.table.refresh();
        TReassignInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tReassignInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js

@@ -66,13 +66,7 @@
TAcrossCity.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TAcrossCity.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity_info.js

@@ -91,24 +91,12 @@
            Feng.error(data.message);
            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TAcrossCity.table.refresh();
            TAcrossCityInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.start();
@@ -131,24 +119,12 @@
            Feng.error(data.message);
            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TAcrossCity.table.refresh();
            TAcrossCityInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js

@@ -75,13 +75,7 @@
TCharter.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCharter.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter_info.js

@@ -119,24 +119,12 @@
            Feng.error(data.message);
            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TCharter.table.refresh();
            TCharterInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.set("price",one+"-"+two);
@@ -161,24 +149,12 @@
            Feng.error(data.message);
            return;
        }else{
            if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
            window.parent.TCharter.table.refresh();
            TCharterInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.set("price",one+"-"+two);

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js

@@ -66,13 +66,7 @@
TServerCarmodel.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TServerCarmodel.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js

@@ -91,24 +91,12 @@
            Feng.error(data.message);
            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TServerCarmodel.table.refresh();
            TServerCarmodelInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.start();
@@ -124,23 +112,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TServerCarmodel.table.refresh();
        TServerCarmodelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tServerCarmodelInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js

@@ -95,13 +95,7 @@
TSite.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TSite.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js

@@ -125,26 +125,14 @@
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSite/add", function(data){
        if(data.status == 200){
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TSite.table.refresh();
            TSiteInfoDlg.close();
        }else{
            Feng.error(data.msg);
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("provinceCode",provinceCode);
@@ -201,23 +189,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSite/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TSite.table.refresh();
        TSiteInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("id",$("#id").val());
    ajax.set("name",name);

 cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js

@@ -78,13 +78,7 @@
TSmsrecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TSmsrecord.seItem = selected[0];
@@ -130,22 +124,10 @@
TSmsrecord.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tSmsrecord/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TSmsrecord.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tSmsrecordId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord_info.js

@@ -63,23 +63,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSmsrecord/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TSmsrecord.table.refresh();
        TSmsrecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tSmsrecordInfoData);
    ajax.start();
@@ -95,23 +83,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSmsrecord/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TSmsrecord.table.refresh();
        TSmsrecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tSmsrecordInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js

@@ -85,13 +85,7 @@
TStartPage.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage_info.js

@@ -79,23 +79,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TStartPage/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TbBanner.table.refresh();
        TbStartPageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("usePort",usePort);
    ajax.set("name",name);
@@ -117,23 +105,11 @@
    console.log(img)
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TStartPage/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TStartPage.table.refresh();
        TbStartPageDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("type",type);
    ajax.set("name",name);

 cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js

@@ -58,13 +58,7 @@
TSysSensitiveWords.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TSysSensitiveWords.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js

@@ -98,23 +98,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSysSensitiveWords/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TSysSensitiveWords.table.refresh();
        TSysSensitiveWordsInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tSysSensitiveWordsInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js

@@ -85,13 +85,7 @@
TSystemPrice.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TSystemPrice.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js

@@ -133,13 +133,7 @@
TSystemPrice.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TSystemPrice.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js

@@ -597,24 +597,12 @@
            Feng.error(data.message);
            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TSystemPrice.table.refresh();
            TSystemPriceInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("openCityId",openCityId);
    ajax.set("serverCarModelId",serverCarModelId);
@@ -819,24 +807,12 @@
            Feng.error(data.message);
            return;
        }else {
            if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
            window.parent.TSystemPrice.table.refresh();
            TSystemPriceInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("openCityId",openCityId);
    ajax.set("serverCarModelId",serverCarModelId);

 cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js

@@ -196,7 +196,7 @@
        if(language==1){
        Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table！");
            Feng.info("Please select 条记录 in the table！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }

 cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser_info.js

@@ -155,23 +155,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUser/updateBalance", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TUser.table.refresh();
        TUserInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("tUserId",$("#tUserId").val());
    ajax.set("updateType",$("#updateType").val());
@@ -191,23 +179,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUser/updatePassword", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TUser.table.refresh();
        TUserInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("tUserId",$("#tUserId").val());
    ajax.set("password",$("#password").val());
@@ -226,23 +202,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUser/optUser", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TUser.table.refresh();
        TUserInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("tUserId",$("#tUserId").val());
    ajax.set("optType",$("#optType").val());

 cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js

@@ -77,13 +77,7 @@
TUserExit.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");

        return false;
    }else{

 cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit_info.js

@@ -70,23 +70,11 @@
    console.log(url)
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/TUserExit/add", function(data){
        if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
        Feng.success("添加成功!");
        window.parent.TUserExit.table.refresh();
        TbUserExitDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");

    });
    ajax.set("userType",userType);
@@ -105,24 +93,12 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tbBanner/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");

        window.parent.TbBanner.table.refresh();
        TbUserExitDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");

    });
    ajax.set(this.tbUserExitData);

 cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js

@@ -132,13 +132,7 @@
TCarModel.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TCarModel.seItem = selected[0];
@@ -148,13 +142,7 @@
TCarModel.audit = function () {
    if (this.check()) {
        if(TCarModel.seItem.state!=1){
            if(language==1){
                Feng.info("请在待审核状态下操作")
            }else if(language==2){
                Feng.info("Please operate in the pending state")
            }else {
                Feng.info("Silakan beroperasi dalam keadaan menunggu")
            }
            Feng.info("请在待审核状态下操作")
            return;
        }
        var index = layer.open({

 cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon_info.js

@@ -141,23 +141,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUserLarge/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TCarModel.table.refresh();
        TCarModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarModelInfoData);
    ajax.set("type",obj);
@@ -178,23 +166,11 @@
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCarModel/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TCarModel.table.refresh();
        TCarModelInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tCarModelInfoData);
    ajax.set("language",$("#yy").val());

 cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js

@@ -65,13 +65,7 @@
TUserRedPacketRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TUserRedPacketRecord.seItem = selected[0];
@@ -117,22 +111,10 @@
TUserRedPacketRecord.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tUserRedPacketRecord/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            TUserRedPacketRecord.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("tUserRedPacketRecordId",this.seItem.id);
        ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js

@@ -67,23 +67,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUserRedPacketRecord/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TUserRedPacketRecord.table.refresh();
        TUserRedPacketRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tUserRedPacketRecordInfoData);
    ajax.start();
@@ -99,23 +87,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tUserRedPacketRecord/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TUserRedPacketRecord.table.refresh();
        TUserRedPacketRecordInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tUserRedPacketRecordInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js

@@ -106,13 +106,7 @@
TVerified.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TVerified.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified_info.js

@@ -65,23 +65,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tVerified/add", function(data){
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.TVerified.table.refresh();
        TVerifiedInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tVerifiedInfoData);
    ajax.start();
@@ -97,23 +85,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tVerified/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TVerified.table.refresh();
        TVerifiedInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tVerifiedInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js

@@ -194,13 +194,7 @@
TVersionManagement.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TVersionManagement.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement_info.js

@@ -117,24 +117,12 @@

            return;
        }else{
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TVersionManagement.table.refresh();
            TVersionManagementInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tVersionManagementInfoData);
    ajax.set("mandatory",mandatory);
@@ -152,13 +140,7 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tVersionManagement/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TVersionManagement.table.refresh();
        TVersionManagementInfoDlg.close();
    },function(data){

 cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js

@@ -146,13 +146,7 @@
TVoice.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TVoice.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice_info.js

@@ -116,24 +116,12 @@

            return false;
        } else {
              if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
              Feng.success("添加成功!");
            window.parent.TVoice.table.refresh();
            TbVoiceDlg.close();
        }
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("userType", userType);
    ajax.set("url", sfFile);
@@ -218,24 +206,12 @@
            }
            return false;
        } else {
            if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
            window.parent.TVoice.table.refresh();
            TbVoiceDlg.close();
        }
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("id", id);
    ajax.set("userType", userType);

 cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js

@@ -39,13 +39,7 @@
TLine.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TLine.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js

@@ -106,13 +106,7 @@
TbBanner.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        TbBanner.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner_info.js

@@ -111,24 +111,12 @@
            }

        }else {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        }
        window.parent.TbBanner.table.refresh();
        TbBannerInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("usePort",usePort);
    ajax.set("name",name);
@@ -147,23 +135,11 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tbBanner/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.TbBanner.table.refresh();
        TbBannerInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.tbBannerInfoData);
    ajax.start();

 cloud-server-management/src/main/webapp/static/modular/system/user/user.js

@@ -119,13 +119,7 @@
MgrUser.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    } else {
        MgrUser.seItem = selected[0];

 cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js

@@ -254,26 +254,14 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) {
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.MgrUser.table.refresh();
        UserInfoDlg.close();
        $(".img-circle").each(function () {
            $(this).attr("src",Feng.ctxPath+$("#avatar").val());
        })
    }, function (data) {
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.userInfoData);
    ajax.start();
@@ -317,13 +305,7 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/mgr/edit", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        if (window.parent.MgrUser != undefined) {
            window.parent.MgrUser.table.refresh();
            UserInfoDlg.close();
@@ -334,13 +316,7 @@

        window.parent.$("#userNameTab").text($("#name").val());
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(this.userInfoData);
    ajax.start();
@@ -376,21 +352,9 @@
        return
    }
    var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
    }, function (data) {
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("oldPwd");
    ajax.set("newPwd");

 cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js

@@ -81,13 +81,7 @@
SysCouponRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SysCouponRecord.seItem = selected[0];
@@ -126,13 +120,7 @@
SysCouponRecord.selectCouponOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
@@ -141,13 +129,7 @@
    var money = selected[0].money;
    var name = selected[0].name;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
         Feng.info("请先选中表格中的某一记录！");
return ;
    }
    var obj = $("#obj").val();
@@ -162,13 +144,7 @@
SysCouponRecord.selectCouponOpt1 = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
@@ -177,13 +153,7 @@
    var money = selected[0].money;
    var name = selected[0].name;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
         Feng.info("请先选中表格中的某一记录！");
return ;
    }
    var obj = $("#obj").val();
@@ -196,26 +166,14 @@
SysCouponRecord.selectCouponOpt2 = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
    var money = selected[0].money;
    var couponUseType = selected[0].couponUseType;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
         Feng.info("请先选中表格中的某一记录！");
return ;
    }
    var obj = $("#obj").val();

 cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js

@@ -47,13 +47,7 @@
SysRedPacketRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        SysRedPacketRecord.seItem = selected[0];
@@ -72,13 +66,7 @@
SysRedPacketRecord.selectRedOpt = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }
    var id = selected[0].id;
@@ -89,13 +77,7 @@
    var endMoney = selected[0].endMoney;
    var effective = selected[0].effective;
    if ("" == id || null == id || undefined == id){
         if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
         Feng.info("请先选中表格中的某一记录！");
    }
    var obj = $("#obj").val();
    window.parent.UserActivityInfoDlg.selectRedOpt(id,type,totalMoney,money,startMoney,endMoney,effective);

 cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js

@@ -106,13 +106,7 @@
UserActivity.check = function (type) {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{

@@ -121,42 +115,18 @@
            UserActivity.seItem = selected[0];
            return true;
        }else if(type==3 && selected[0].status!=3 && selected[0].status!=4){
            if(language==1){
                Feng.info("当前状态不能暂停/启动！");
            }else if(language==2){
                Feng.info("The current state cannot be suspended/ started!");
            }else {
                Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
            }
            Feng.info("当前状态不能暂停/启动！");

            return false;
        }else if(type==3 && selected[0].status==3 && (selected[0].startTime>new Date() || new Date()>selected[0].endTime)){
            if(language==1){
                Feng.info("当前状态不能暂停/启动！");
            }else if(language==2){
                Feng.info("The current state cannot be suspended/ started!");
            }else {
                Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
            }
            Feng.info("当前状态不能暂停/启动！");
            return false;
        }else if(type==1 && selected[0].status!=1){
            if(language==1){
                Feng.info("当前状态不能审核！");
            }else if(language==2){
                Feng.info("The current status cannot be audited！");
            }else {
                Feng.info("Status saat ini tidak dapat diaudisikan！");
            }
            Feng.info("当前状态不能审核！");

            return false;
        }else if(type==2 && selected[0].status!=2){
            if(language==1){
                Feng.info("当前状态不能编辑！");
            }else if(language==2){
                Feng.info("The current status cannot be edited！");
            }else {
                Feng.info("Status saat ini tidak dapat diedit！");
            }
             Feng.info("当前状态不能编辑！");

            return false;
        }
@@ -230,22 +200,10 @@
UserActivity.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/userActivity/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            UserActivity.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("userActivityId",this.seItem.id);
        ajax.start();
@@ -257,23 +215,11 @@
UserActivity.updateStatus = function () {
    if (this.check(3)) {
        var ajax = new $ax(Feng.ctxPath + "/userActivity/updateStatus", function (data) {
            if(language==1){
                Feng.success("启动/暂停成功!");
            }else if(language==2){
                Feng.success("Start/pause successfully!");
            }else {
                Feng.success("Mulai/berhenti dengan sukses!");
            }
            Feng.success("启动/暂停成功!");

            UserActivity.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.success("启动/暂停失败!");
            }else if(language==2){
                Feng.success("Failed to start/pause!");
            }else {
                Feng.success("Gagal memulai/berhenti!");
            }
           Feng.success("启动/暂停失败!");

        });
        ajax.set("id",this.seItem.id);

 cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity_info.js

@@ -234,13 +234,7 @@
        UserActivityInfoDlg.close();
        }
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",$("#name").val());
    ajax.set("startTime",$("#startTime").val());
@@ -404,23 +398,11 @@
    var elem3 = document.querySelector('.js-switch4');
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/userActivity/update", function(data){
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.UserActivity.table.refresh();
        UserActivityInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("id",$("#id").val());
    ajax.set("name",$("#name").val());

 cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js

@@ -108,13 +108,7 @@
UserCouponRecord.check = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length == 0){
        if(language==1){
            Feng.info("请先选中表格中的某一记录！");
        }else if(language==2){
            Feng.info("Please select a record in the table first！");
        }else {
            Feng.info("Pilih catatan di tabel terlebih dahulu！");
        }
        Feng.info("请先选中表格中的某一记录！");
        return false;
    }else{
        UserCouponRecord.seItem = selected[0];
@@ -160,22 +154,10 @@
UserCouponRecord.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/userCouponRecord/delete", function (data) {
            if(language==1){
                Feng.success("删除成功!");
            }else if(language==2){
                Feng.success("Delete succeeded!");
            }else {
                Feng.success("Hapus berhasil!");
            }
             Feng.success("删除成功!");
            UserCouponRecord.table.refresh();
        }, function (data) {
            if(language==1){
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            }else if(language==2){
                Feng.error("Delete failed!" + data.responseJSON.message + "!");
            }else {
                Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
            }
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        });
        ajax.set("userCouponRecordId",this.seItem.id);
        ajax.start();

 cloud-server-other/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/logs"/>
    <property name="log.path" value="/Users/java/logs"/>

    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->