Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-28 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb

Merge remote-tracking branch 'origin/master'

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

@@ -76,4 +76,45 @@
    }


    @PostMapping("/base/city/getById")
    public TCityManager getById(@RequestBody Integer id){
        try {
            return cityService.getById(id);
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }


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


    @PostMapping("/base/city/freeze")
    public void freeze(@RequestBody Integer id){
        try {
            TCityManager byId = cityService.getById(id);
            byId.setState(2);
            cityService.updateById(byId);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    @PostMapping("/base/city/unfreeze")
    public void unfreeze(@RequestBody Integer id){
        try {
            TCityManager byId = cityService.getById(id);
            byId.setState(1);
            cityService.updateById(byId);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
}

 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-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/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-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -287,8 +287,8 @@
    @ApiOperation(value = "获取已报名赛事列表", tags = {"APP-赛事活动列表"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "类型（0=全部，1=未开始，2=进行中，3=已结束，4=已取消）", name = "type", dataType = "int", required = true),
            @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
            @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
            @ApiImplicitParam(value = "页条数", name = "pageSize", dataType = "int", required = true),
            @ApiImplicitParam(value = "页码，首页1", name = "pageNo", dataType = "int", required = true),
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<CompetitionListVo>> queryMyCompetitionList(Integer type, Integer pageSize, Integer pageNo){
@@ -363,6 +363,7 @@
                    paymentCompetition.setPayStatus(3);
                    paymentCompetition.setRefundTime(new Date());
                    paymentCompetition.setRefundOrderNo(refund_id);
                    paymentCompetition.setAppUserId(null);
                    paymentCompetitionService.updateById(paymentCompetition);

                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());

 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java

@@ -63,4 +63,8 @@
    private List<ParticipantVo> participant;
    @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
    private Integer status;
    @ApiModelProperty("支付金额")
    private Double payMoney;
    @ApiModelProperty("支付方式（1=微信，2=支付宝，3=玩湃币，4=课时）")
    private Integer payType;
}

 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java

@@ -12,7 +12,7 @@
@ApiModel
public class CompetitionListVo {
    @ApiModelProperty("赛事id")
    private Integer id;
    private Long id;
    @ApiModelProperty("赛事名称")
    private String name;
    @ApiModelProperty("赛事封面")

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java

@@ -203,6 +203,7 @@
        paymentCompetition.setPayType(paymentCompetitionVo.getPayType());
        paymentCompetition.setAmount(money.doubleValue());
        paymentCompetition.setPayStatus(1);
        paymentCompetition.setState(1);
        paymentCompetition.setInsertTime(new Date());
        paymentCompetitionService.save(paymentCompetition);


 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java

@@ -81,7 +81,7 @@
     */
    @Override
    public List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception {
        pageSize = (pageSize - 1) * pageNo;
        pageNo = (pageNo - 1) * pageSize;
        if(0 == type){
            type = null;
        }
@@ -143,6 +143,8 @@
        if(paymentCompetition.getPayStatus() == 3){
            competitionInfo.setStatus(4);
        }
        competitionInfo.setPayMoney(paymentCompetition.getAmount());
        competitionInfo.setPayType(paymentCompetition.getPayType());
        return competitionInfo;
    }

@@ -187,6 +189,7 @@
            paymentCompetition.setRefundOrderNo(refund_id);
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -200,6 +203,7 @@
            paymentCompetition.setRefundOrderNo("");
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -220,6 +224,7 @@
            paymentCompetition.setRefundOrderNo("");
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);

 cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml

@@ -20,17 +20,17 @@
        where a.state = 1 and a.appUserId = #{uid} and a.payStatus != 1
        <!--1=未开始，2=进行中，3=已结束，4=已取消-->
        <if test="null != type and 1 == type">
            and b.status = 1
            and b.status = 1 and a.payStatus = 2
        </if>
        <if test="null != type and 2 == type">
            and b.status = 2
            and b.status = 2 and a.payStatus = 2
        </if>
        <if test="null != type and 3 == type">
            and b.status = 3
            and b.status = 3 and a.payStatus = 2
        </if>
        <if test="null != type and 4 == type">
            and a.payStatus = 3
        </if>
        order by a.insertTime desc limit #{pageSize}, #{pageNo}
        order by a.insertTime desc limit #{pageNo}, #{pageSize}
    </select>
</mapper>

 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-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java

@@ -14,4 +14,17 @@

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

    @PostMapping("/base/city/getById")
    TCityManager getById(Integer id);

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

    @PostMapping("/base/city/freeze")
    void freeze(Integer id);
    @PostMapping("/base/city/unfreeze")
    void unfreeze(Integer id);


}

 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

@@ -80,11 +80,16 @@
    /**
     * 跳转到修改车辆管理
     */
    @RequestMapping("/tCompetition_update/{id}")
    public String tCarUpdate(@PathVariable Integer id, Model model) {
        Competition competition = competitionClient.queryById(id);
        model.addAttribute("item",competition);
        return PREFIX + "tCompetition_edit.html";
    @RequestMapping("/tCity_update/{id}")
    public String tCityUpdate(@PathVariable Integer id, Model model) {
        TCityManager byId = cityClient.getById(id);
        model.addAttribute("item",byId);
        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        model.addAttribute("list",list);
        TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
        List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId() ));
        model.addAttribute("list1",list1);
        return PREFIX + "tCity_edit.html";
    }


@@ -118,10 +123,15 @@
    }

    @RequestMapping(value = "/update")
    public Object update(Competition competition) {
    @ResponseBody
    public Object update(TCityManager manager) {
        try {
            competitionClient.update(competition);
            return SUCCESS_TIP;
            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.update(manager);
            return new SuccessTip<>();
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
@@ -151,6 +161,43 @@
        }
    }

    @RequestMapping(value = "/freeze")
    @ResponseBody
    public Object freeze(Integer id) {
        try {
            cityClient.freeze(id);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/unfreeze")
    @ResponseBody
    public Object unfreeze(Integer id) {
        try {
            cityClient.unfreeze(id);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }

    @RequestMapping(value = "/pwd")
    @ResponseBody
    public Object pwd(Integer id) {
        try {
            TCityManager byId = cityClient.getById(id);
            byId.setPassword(SecureUtil.md5("a123456"));
            cityClient.update(byId);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }

    @RequestMapping(value = "/getPeopleFromId")
    public Object getPeopleFromId(Integer id,Integer state) {
        try {

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

@@ -12,7 +12,9 @@
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.support.HttpKit;
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;
@@ -40,6 +42,9 @@

    @Autowired
    private IStoreService storeService;

    @Autowired
    private ICityService cityService;


    /**
@@ -146,6 +151,17 @@
        }
    }

    @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;
        }
    }


}

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

@@ -1,9 +1,21 @@
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;


/**
@@ -18,13 +30,43 @@

    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/webapp/WEB-INF/view/system/driverActivity/driverActivity.html

@@ -4,15 +4,7 @@
        <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/tCity/TCity.html

@@ -11,16 +11,32 @@
                    <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 class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            所在省
                                        </button>
                                    </div>
                                    <select class="form-control" id="pCode" onchange="TCompetition.oneChange(this)">
                                        <option value="">全部</option>
                                        @for(obj in list){
                                        <option value="${obj.code}">${obj.name}</option>
                                        @}
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">

                            <div class="col-sm-3">
                                <div class="input-group">
                                <div class="input-group-btn open">
                                    <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                        所在市
                                    </button>
                                </div>
                                <select class="form-control" id="cCode">
                                </select>
                            </div>
                                </div>
                            <div class="col-sm-3">
                                <#NameCon id="name" name="管理员姓名" />
                            </div>

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

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


        <div class="form-horizontal" id="carInfoForm">

            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">

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

@@ -1,350 +1,47 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">

        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">

            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            @if(language==1){
            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">
                        <label class="col-sm-3 control-label">所属机构：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            @if(roleType == 1){
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                                <label for="companyType1"> 平台车辆 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                                <label for="companyTyp2"> 加盟车辆 </label>
                            </div>
                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                                <option value="">选择所属分公司</option>
                                @for(obj in companyList!){
                                <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            @}else if(roleType == 2){
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            @}else if(roleType == 3){
                            <span class="control-label">${objectName!}</span>
                            @}
                        </div>
                    </div>
                    <div class="form-group">
                        <fieldset>
                            <label class="col-sm-3 control-label">服务模式：</label>
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                                    <label for="serverBox1"> 摩托车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                                    <label for="serverBox4"> 同城快送 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>
                    <div class="form-group" id="zcModelDiv">
                        <label class="col-sm-3 control-label">摩托车车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="zcModel" name="zcModel">
                                <option value="">选择车型</option>
                                @for(obj in zcModelList){
                                <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
                    <option value="">选择车辆品牌</option>
                    @for(obj in brandList){
                    <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </#select>
                <#select id="carModelId" name="车辆类型：">
                <option value="">选择车辆类型</option>
                @for(obj in modelList){
                <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
                @}
            </#select>
            <#select id="carColor" name="车辆颜色：">
            <option value="">选择车辆颜色</option>
            <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>黑色</option>
            <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>银色</option>
            <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>白色</option>
            <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>红色</option>
            <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>黄色</option>
            <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>橙色</option>
            <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>蓝色</option>
        </#select>
        <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/>
        <#avatar id="carPhoto" name="车辆照片：" avatarImg="${item.carPhoto}"/>
        <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/>
        <#avatar id="drivingLicensePhoto" name="行驶证照片：" avatarImg="${item.drivingLicensePhoto}"/>
        <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/>
        <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/>
    </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="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
            @if(language==2){
<div class="row">
    <div class="col-sm-11">
        <div class="form-group">
            <label class="col-sm-3 control-label">Affiliated organization：</label>
            <div class="col-sm-9"  style="display: flex;align-items: center;">
                @if(roleType == 1){
                <div class="radio radio-info radio-inline">
                    <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                    <label for="companyType1"> Platform vehicle </label>
                </div>
                <div class="radio radio-success radio-inline">
                    <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                    <label for="companyTyp2"> Franchised vehicles </label>
                </div>
                <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                    <option value="">Select Branch</option>
                    @for(obj in companyList!){
                    <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Select the franchisee</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 2){
                <span class="control-label">${objectName!}</span>
                <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Select the franchisee</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 3){
                <span class="control-label">${objectName!}</span>
                @}
            </div>
        </div>
        <div class="form-group">
            <fieldset>
                <label class="col-sm-3 control-label">Service mode：</label>
            <input hidden id="id" value="${item.id}">
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                        <label for="serverBox1"> motorcycle </label>
                    </div>
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                        <label for="serverBox4"> Intra-city express delivery </label>
                    </div>
                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)">
                        <option value="">选择省</option>
                        @for(obj in list){
                        <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
                        <option value="${obj.code}">${obj.name}</option>
                        @}
                    </select>
                </div>
            </fieldset>
        </div>
        <div class="form-group" id="zcModelDiv">
            <label class="col-sm-3 control-label">Motorcycle model setting：</label>
            <div class="col-sm-9">
                <select class="form-control" id="zcModel" name="zcModel">
                    <option value="">Select vehicle type</option>
                    @for(obj in zcModelList){
                    <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <div class="form-group" id="kcModelDiv">
            <label class="col-sm-3 control-label">Cross city travel model：</label>
            <div class="col-sm-9">
                <select class="form-control" id="kcModel" name="kcModel">
                    <option value="">Select vehicle type</option>
                    @for(obj in kcModelList){
                    <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <#select id="carBrandId" name="Vehicle brand：" onchange="TCarInfoDlg.brandChange(this)">
        <option value="">Select vehicle brand</option>
        @for(obj in brandList){
        <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
        @}
    </#select>
    <#select id="carModelId" name="Vehicle type：">
    <option value="">Select vehicle type</option>
    @for(obj in modelList){
    <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
    @}
</#select>
<#select id="carColor" name="Vehicle color：">
<option value="">Select vehicle color</option>
<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>black</option>
<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>silvery</option>
<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>white</option>
<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>red</option>
<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>yellow</option>
<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>orange</option>
<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>blue</option>
</#select>
<#input id="carLicensePlate" name="License plate number" value="${item.carLicensePlate}"/>
<#avatar id="carPhoto" name="Vehicle photos：" avatarImg="${item.carPhoto}"/>
<#input id="drivingLicenseNumber" name="Driving license number" value="${item.drivingLicenseNumber}"/>
<#avatar id="drivingLicensePhoto" name="Photo of driving license：" avatarImg="${item.drivingLicensePhoto}"/>
<#input id="annualInspectionTime" name="Annual inspection expiration time" type="text" value="${item.annualInspectionTime}"/>
<#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text" value="${item.commercialInsuranceTime}"/>
</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="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
            @if(language==3){
<div class="row">
    <div class="col-sm-11">
        <div class="form-group">
            <label class="col-sm-3 control-label">Organisasi Afiliasi：</label>
            <div class="col-sm-9"  style="display: flex;align-items: center;">
                @if(roleType == 1){
                <div class="radio radio-info radio-inline">
                    <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                    <label for="companyType1"> Kendaraan platform </label>
                </div>
                <div class="radio radio-success radio-inline">
                    <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                    <label for="companyTyp2"> Kendaraan waralaba </label>
                </div>
                <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                    <option value="">Pilih Branch</option>
                    @for(obj in companyList!){
                    <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Pilih pemilik franchise</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 2){
                <span class="control-label">${objectName!}</span>
                <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Pilih pemilik franchise</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 3){
                <span class="control-label">${objectName!}</span>
                @}
            </div>
        </div>
        <div class="form-group">
            <fieldset>
                <label class="col-sm-3 control-label">Mode Layanan：</label>
            <div class="form-group" id="cityCode">
                <label class="col-sm-3 control-label">所在市：</label>
                <div class="col-sm-9">
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                        <label for="serverBox1"> sepeda motor </label>
                    </div>
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                        <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label>
                    </div>
                    <select class="form-control" id="cCode" name="cCode">
                        <option value="">选择市</option>
                        @for(obj in list1){
                        <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
                        @}
                    </select>
                </div>
            </fieldset>
        </div>
        <div class="form-group" id="zcModelDiv">
            <label class="col-sm-3 control-label">Pengaturan model sepeda motor：</label>
            <div class="col-sm-9">
                <select class="form-control" id="zcModel" name="zcModel">
                    <option value="">Pilih Jenis Kendaraan</option>
                    @for(obj in zcModelList){
                    <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
            <#input id="name" name="管理员姓名" type="text" value="${item.name}"/>
            <#input id="phone" name="管理员手机号" type="text" value="${item.phone}"/>


        </div>
        <div class="form-group" id="kcModelDiv">
            <label class="col-sm-3 control-label">Model perjalanan melintasi kota：</label>
            <div class="col-sm-9">
                <select class="form-control" id="kcModel" name="kcModel">
                    <option value="">Pilih Jenis Kendaraan</option>
                    @for(obj in kcModelList){
                    <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
        <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="TCarInfoDlg.editSubmit()"/>
                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
            </div>
        </div>
        <#select id="carBrandId" name="Merek kendaraan：" onchange="TCarInfoDlg.brandChange(this)">
        <option value="">Pilih Merek Kendaraan</option>
        @for(obj in brandList){
        <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
        @}
    </#select>
    <#select id="carModelId" name="Jenis Kendaraan：">
    <option value="">Pilih Jenis Kendaraan</option>
    @for(obj in modelList){
    <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
    @}
</#select>
<#select id="carColor" name="车辆颜色：">
<option value="">选择车辆颜色</option>
<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>hitam</option>
<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>perak</option>
<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>putih</option>
<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>merah</option>
<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>kuning</option>
<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>oranye</option>
<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>biru</option>
</#select>
<#input id="carLicensePlate" name="Nomor plat nomor" value="${item.carLicensePlate}"/>
<#avatar id="carPhoto" name="Foto kendaraan：" avatarImg="${item.carPhoto}"/>
<#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" value="${item.drivingLicenseNumber}"/>
<#avatar id="drivingLicensePhoto" name="Foto SIM：" avatarImg="${item.drivingLicensePhoto}"/>
<#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text" value="${item.annualInspectionTime}"/>
<#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text" value="${item.commercialInsuranceTime}"/>
</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="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}

        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script>
<script src="${ctxPath}/modular/system/tCity/tCity_info.js"></script>
<script>
    laydate.render({
        elem: '#annualInspectionTime'

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

@@ -10,21 +10,61 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="menuName" name="菜单名称" />
                                <#NameCon id="name" name="优惠券名称" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="level" name="层级" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
                            </div>
                                <#SelectCon id="type" name="优惠券类型" >
                                <option value="">全部</option>
                                <option value="1">满减券</option>
                                <option value="2">折扣券</option>
                                <option value="3">体验券</option>
                            </#SelectCon>
                        </div>
                        <div class="hidden-xs" id="menuTableToolbar" role="group">
                            <#button name="添加" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
                            <#button name="修改" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
                            <#button name="删除" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
                        <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>
                        <#table id="menuTable"/>
        <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>

 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/tUserRedPacketRecord/tUserRedPacketRecord.html

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

        <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/userActivity/userActivity.html

@@ -6,15 +6,7 @@
            <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/userCouponRecord/userCouponRecord.html

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

        <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/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/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/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());

 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

@@ -101,7 +101,7 @@
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/TCompetition/TCompetition_update/' + TCompetition.seItem.id
            content: Feng.ctxPath + '/tCity/tCity_update/' + TCompetition.seItem.id
        });
        this.layerIndex = index;
    }
@@ -151,7 +151,69 @@
        });
    }
};
TCompetition.oneChange = function (e) {
    console.log(111)
    var oneId=$(e).val();
    var ajax = new $ax(Feng.ctxPath + "/tCompetition/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();
}

TCompetition.freeze = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tCity/freeze", function (data) {
            Feng.success("冻结成功!");
            TCompetition.table.refresh();
        }, function (data) {
            Feng.error("冻结失败!" + data.responseJSON.message + "!");
        });
        ajax.set("id",this.seItem.id);
        ajax.start();
    }
};
TCompetition.unfreeze = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tCity/unfreeze", function (data) {
            Feng.success("解冻成功!");
            TCompetition.table.refresh();
        }, function (data) {
            Feng.error("解冻失败!" + data.responseJSON.message + "!");
        });
        ajax.set("id",this.seItem.id);
        ajax.start();
    }
};
TCompetition.reload = function () {
    if (this.check()) {
        let id = this.seItem.id
        var operation = function(){
            var ajax = new $ax(Feng.ctxPath + "/tCity/pwd", function (data) {
                Feng.success("重置成功!");
                TCompetition.table.refresh();
            }, function (data) {
                Feng.error("重置失败!" + data.responseJSON.message + "!");
            });
            ajax.set("id",id);
            ajax.start();
        }
        Feng.confirm("确认重置密码？重置后密码为：a123456", operation);
    }

};

TCompetition.carInsurance = function () {
    if (this.check()) {
@@ -174,10 +236,18 @@
 */
TCompetition.search = function () {
    var queryData = {};
    queryData['provinceCode'] = $("#pCode").val();
    queryData['cityCode'] = $("#cCode").val();
    queryData['name'] = $("#name").val();
    queryData['phone'] = $("#phone").val();
    TCompetition.table.refresh({query: queryData});
};

TCompetition.resetSearch = function () {
    $("#pCode").val("");
    $("#cCode").val("");
    $("#name").val("");
    $("#phone").val("");
    TCompetition.search();
};


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

@@ -116,6 +116,23 @@
    let name = $("#name").val()
    let phone = $("#phone").val()

    if(pCode==''){
        Feng.info("请选择省")
        return;
    }
    if(cCode==''){
        Feng.info("请选择市")
        return;
    }
    if(name==''){
        Feng.info("管理员姓名不能为空")
        return;
    }
    if(phone==''){
        Feng.info("管理员手机号不能为空")
        return;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCity/add", function(data){
        if(data.code == 200){
@@ -133,13 +150,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("provinceCode",pCode);
@@ -159,63 +170,30 @@
    if(!this.validate()){
        return ;
    }
    let pCode = $("#pCode").val()
    let cCode = $("#cCode").val()
    let name = $("#name").val()
    let phone = $("#phone").val()

    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");
        }
    if(pCode==''){
        Feng.info("请选择省")
        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");
        }
    if(cCode==''){
        Feng.info("请选择市")
        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");
        }
    if(name==''){
        Feng.info("管理员姓名不能为空")
        return;
    }
    if(phone==''){
        Feng.info("管理员手机号不能为空")
        return;
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){
        if(data.status == 200){
    var ajax = new $ax(Feng.ctxPath + "/tCity/update", function(data){
        if(data.code == 200){
            if(language==1){
                Feng.success("修改成功!");
            }else if(language==2){
@@ -223,41 +201,19 @@
            }else {
                Feng.success("Mengubah dengan sukses!");
            }
            window.parent.TCar.table.refresh();
            window.parent.TCompetition.table.refresh();
            TCarInfoDlg.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.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.set("provinceCode",pCode);
    ajax.set("cityCode",cCode);
    ajax.set("name",name);
    ajax.set("phone",phone);
    ajax.set("id",$("#id").val());
    ajax.start();
}


 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

@@ -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/java/com/dsh/other/mapper/FrequentlyAskedQuestionsMapper.java

@@ -12,5 +12,4 @@
 * @since 2023-07-03
 */
public interface FrequentlyAskedQuestionsMapper extends BaseMapper<FrequentlyAskedQuestions> {

}

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -134,15 +134,14 @@
        int hour = e.get(Calendar.HOUR_OF_DAY);
        int minute = e.get(Calendar.MINUTE);
        List<QuerySiteTimes> list = new ArrayList<>();
        SimpleDateFormat sdfs = new SimpleDateFormat("HH:mm");
        while (true){
            int s_hour = s.get(Calendar.HOUR_OF_DAY);
            int s_minute = s.get(Calendar.MINUTE);
            String start = s_hour + ":" + s_minute;
            String start = sdfs.format(s.getTime());

            s.set(Calendar.MINUTE, s.get(Calendar.MINUTE) + 30);
            int e_hour = s.get(Calendar.HOUR_OF_DAY);
            int e_minute = s.get(Calendar.MINUTE);
            String end = e_hour + ":" + e_minute;
            String end = sdfs.format(s.getTime());

            QuerySiteTimes querySiteTimes = new QuerySiteTimes();
            querySiteTimes.setTime(start + "-" + end);
@@ -193,7 +192,7 @@

        String s_time = split[0];
        String e_time = split[split.length - 1];
        s_time = s_time.substring(s_time.lastIndexOf("-"));
        s_time = s_time.substring(0,s_time.lastIndexOf("-"));
        String[] s1 = e_time.split(" ");
        e_time = s1[0] + " " + s1[1].split("-")[1];
        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -277,7 +276,11 @@
        return ResultUtil.success();
    }


    public static void main(String[] args) {
        String a ="2023-07-28 10:30-15:30";
        String substring = a.substring(0,a.lastIndexOf("-"));
        System.out.println(substring);
    }
    /**
     * 课程微信支付
     * @param paymentPrice

 cloud-server-other/src/main/resources/mapper/SiteMapper.xml

@@ -19,7 +19,7 @@
        left join t_site_type c on (a.siteTypeId = c.id)
        where a.state = 1
        <if test="null != item.startTime and '' != item.startTime and null != item.endTime and '' != item.endTime">
            and CONCAT(DATE_FORMAT(now, '%Y-%m-%d', ' ', a.appointmentStartTime)) &lt;=  CONCAT(DATE_FORMAT(now, '%Y-%m-%d', ' ', #{item.startTime})) and CONCAT(DATE_FORMAT(now, '%Y-%m-%d', ' ', a.appointmentEndTime)) &gt;=  CONCAT(DATE_FORMAT(now, '%Y-%m-%d', ' ', #{item.endTime}))
            and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentStartTime) &lt;=  CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', #{item.startTime}) and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentEndTime) &gt;=  CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', #{item.endTime})
        </if>
        <if test="null != item.siteTypeId">
            and a.siteTypeId = #{item.siteTypeId}