diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 94697aab..8ff2a527 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -5,51 +5,33 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.flow.domain.BizRequestItem; -import com.ruoyi.flow.service.FlowService; -import com.ruoyi.framework.shiro.realm.UserRealm; -import com.ruoyi.remind.domain.Remind; -import com.ruoyi.remind.mapper.RemindMapper; +import com.ruoyi.remind.service.RemindService; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.domain.SysCustomerOper; import com.ruoyi.system.domain.exportDto.SysCustomerDto; -import com.ruoyi.system.mapper.SysCustomerMapper; -import com.ruoyi.system.mapper.SysCustomerOperMapper; -import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.service.ISysCustomerOperService; import com.ruoyi.system.service.ISysCustomerService; import com.ruoyi.system.service.ISysDictTypeService; -import org.activiti.engine.IdentityService; -import org.activiti.engine.TaskService; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; -import org.omg.PortableInterceptor.INACTIVE; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mapping.IdentifierAccessor; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.net.URLEncoder; -import java.util.*; +import java.util.List; +import java.util.Map; /** * 客户基本信息Controller @@ -68,9 +50,9 @@ public class SysCustomerController extends BaseController @Autowired private ISysDictTypeService sysDictTypeService; @Autowired - private RemindMapper remindMapper; + private RemindService remindService; @Autowired - private SysCustomerOperMapper sysCustomerOperMapper; + private ISysCustomerOperService sysCustomerOperService; @RequiresPermissions("system:customer:view") @GetMapping() @@ -142,17 +124,17 @@ public class SysCustomerController extends BaseController int ok = sysCustomerService.updateSysCustomer(sysCustomer); //添加操作记录 SysCustomerOper sysCustomerOper = new SysCustomerOper(); - sysCustomerOper.setSysCustomerPuser(sysCustomer.getCustomerPurser()); - sysCustomerOper.setSysCustomerEnterPriseName(sysCustomer.getEnterpriseName()); + sysCustomerOper.setPurser(sysCustomer.getCustomerPurser()); + sysCustomerOper.setEnterpriseCode(sysCustomerOper.getEnterpriseCode()); + sysCustomerOper.setEnterpriseName(sysCustomer.getEnterpriseName()); sysCustomerOper.setOper("新增"); - sysCustomerOper.setUpdateBy(ShiroUtils.getLoginName()); - sysCustomerOper.setUpdateTime(DateUtils.getNowDate()); + sysCustomerOper.setOperPeople(ShiroUtils.getLoginName()); if(ok==1){ - sysCustomerOper.setUpdateStatus("0"); + sysCustomerOper.setOperStatus("0"); }else{ - sysCustomerOper.setUpdateStatus("1"); + sysCustomerOper.setOperStatus("1"); } - sysCustomerOperMapper.insertSysCustomerOper(sysCustomerOper); + sysCustomerOperService.insertSysCustomerOper(sysCustomerOper); return AjaxResult.success("添加成功,等待审核"); } return AjaxResult.success(""); @@ -169,7 +151,6 @@ public class SysCustomerController extends BaseController mmap.put("sysCustomer", sysCustomer); return prefix + "/edit"; } - /** * 修改保存客户基本信息 */ @@ -179,6 +160,16 @@ public class SysCustomerController extends BaseController @ResponseBody public AjaxResult editSave(SysCustomer sysCustomer) { + //添加操作记录 + SysCustomerOper sysCustomerOper = new SysCustomerOper(); + sysCustomerOper.setPurser(sysCustomer.getCustomerPurser()); + sysCustomerOper.setEnterpriseCode(sysCustomerOper.getEnterpriseCode()); + sysCustomerOper.setEnterpriseName(sysCustomer.getEnterpriseName()); + sysCustomerOper.setOper("审核"); + sysCustomerOper.setOperPeople(ShiroUtils.getLoginName()); + sysCustomerOper.setOperStatus(sysCustomer.getDeginflag()); + sysCustomerOperService.insertSysCustomerOper(sysCustomerOper); + //审核客户表 return toAjax(sysCustomerService.updateSysCustomer(sysCustomer)); } @@ -202,7 +193,15 @@ public class SysCustomerController extends BaseController return list; } - + @RequiresPermissions("system:customer:audit") + @PostMapping("/operList") + @ResponseBody + public TableDataInfo list(SysCustomerOper sysCustomerOper) + { + startPage(); + List list = sysCustomerOperService.selectSysCustomerOperList(sysCustomerOper); + return getDataTable(list); + } @RequiresPermissions("system:customer:export") @Log(title = "客户基本信息", businessType = BusinessType.EXPORT) @RequestMapping("/exportCustomerInfo") @@ -262,57 +261,5 @@ public class SysCustomerController extends BaseController } } - // 添加修改客户表 - @RequiresPermissions("system:customer:add") - @Log(title = "客户基本信息", businessType = BusinessType.INSERT) - @PostMapping("/addCustomer") - @ResponseBody - public AjaxResult add(HttpServletRequest request) { - String keyNo = request.getParameter("enterpriseCode"); - SysUser user = ShiroUtils.getSysUser(); - SysCustomer sysCustomer = new SysCustomer(); - sysCustomer.setEnterpriseName(request.getParameter("enterpriseName")); - sysCustomer.setCustomerPurser(request.getParameter("customerPurser")); - sysCustomer.setEnterpriseCode(request.getParameter("enterpriseCode")); - //业务员 - sysCustomer.setBusinessMembers(request.getParameter("businessMembers")); - List sysCustomerList = sysCustomerService.selectSysCustomerList(sysCustomer); - if (sysCustomerList.size() == 0){ - sysCustomerService.insertSysCustomer(sysCustomer); - Long customer_id = sysCustomerService.selectSysCustomerList(sysCustomer).get(0).getCustomerId(); - keyNo = "KH" + 00 + customer_id; - sysCustomer.setCustomsCode(keyNo); - sysCustomer.setCreateBy(ShiroUtils.getLoginName()); - sysCustomerService.updateSysCustomer(sysCustomer); - //添加时间 - sysCustomer.setCreateTime(new Date()); - //发送添加客户提醒给上级 - Remind remind = new Remind(); - //接收人 - remind.setReceiverName(""); - //提示信息 - remind.setRemindContent(sysCustomer.getBusinessMembers()+"申请:客户"+sysCustomer.getEnterpriseName()+"事务部"+sysCustomer.getCustomerPurser()+""); - remindMapper.add(remind); - } - else{ - return AjaxResult.error("该客户已被其他业务员添加"+"客户名称 :" + sysCustomerList.get(0).getEnterpriseName() + "事业部: "+ - "" + sysCustomerList.get(0).getCustomerPurser() + " 业务员" + sysCustomerList.get(0).getBusinessMembers()); - } - //添加的时候插入记录到我的请求 -// if (add) { -// BizRequestItem bizRequestItem = new BizRequestItem(); -// bizRequestItem.setCreateBy(sysCustomer.getCreateBy()); -// bizRequestItem.setCreateTime(sysCustomer.getCreateTime()+""); -// bizRequestItem.setTitle(sysCustomer.getBusinessMembers() + "_" + sysCustomer.getEnterpriseName()); -// bizRequestItem.setModuleUrl("Syscustom"); -// bizRequestItem.setModuleName("客户表"); -// bizRequestItem.setKeyNo(sysCustomer.getCustomerId()+""); -// bizRequestItem.setDelSign("0"); -// flowService.add(bizRequestItem); -// -// -// } - return AjaxResult.success("添加成功，" +1 +"一条数据"); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java index d4038bfa..28feb957 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java @@ -1,9 +1,9 @@ package com.ruoyi.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.springframework.stereotype.Repository; /** @@ -211,21 +211,21 @@ public class SysCustomer extends BaseEntity private String updateInfoTime; @Excel(name = "客户审核状态表示") //0表示审核中，1标识审核通过，2表示审核拒绝 - private int deginflag; + private String deginflag; @Excel(name = "客户的状态") - private int delflag; - public int getDeginflag() { + private String delflag; + public String getDeginflag() { return deginflag; } - public void setDeginflag(int deginflag) { + public void setDeginflag(String deginflag) { this.deginflag = deginflag; } - public int getDelflag() { + public String getDelflag() { return delflag; } - public void setDelflag(int delflag) { + public void setDelflag(String delflag) { this.delflag = delflag; } public String getCustomerPurser() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerOper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerOper.java index 6500f1e3..b30bd042 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerOper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerOper.java @@ -1,22 +1,20 @@ package com.ruoyi.system.domain; -import lombok.Data; - import java.util.Date; -import java.util.Formatter; public class SysCustomerOper { //客户表的操作记录id private int id; //客户表中的业务员信息 - private String sysCustomerPuser; + private String purser; + private String enterpriseCode; //客户表中的客户名称 - private String sysCustomerEnterPriseName; + private String enterpriseName; //操作 private String oper; - private Date updateTime; - private String updateBy; - private String updateStatus; + private Date createTime; + private String operPeople; + private String operStatus; public int getId() { return id; @@ -26,20 +24,28 @@ public class SysCustomerOper { this.id = id; } - public String getSysCustomerPuser() { - return sysCustomerPuser; + public String getPurser() { + return purser; + } + + public void setPurser(String purser) { + this.purser = purser; } - public void setSysCustomerPuser(String sysCustomerPuser) { - this.sysCustomerPuser = sysCustomerPuser; + public String getEnterpriseCode() { + return enterpriseCode; } - public String getSysCustomerEnterPriseName() { - return sysCustomerEnterPriseName; + public void setEnterpriseCode(String enterpriseCode) { + this.enterpriseCode = enterpriseCode; } - public void setSysCustomerEnterPriseName(String sysCustomerEnterPriseName) { - this.sysCustomerEnterPriseName = sysCustomerEnterPriseName; + public String getEnterpriseName() { + return enterpriseName; + } + + public void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; } public String getOper() { @@ -50,40 +56,42 @@ public class SysCustomerOper { this.oper = oper; } - public Date getUpdateTime() { - return updateTime; + public Date getCreateTime() { + return createTime; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public String getUpdateBy() { - return updateBy; + + public String getOperStatus() { + return operStatus; } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; + public void setOperStatus(String operStatus) { + this.operStatus = operStatus; } - public String getUpdateStatus() { - return updateStatus; + public String getOperPeople() { + return operPeople; } - public void setUpdateStatus(String updateStatus) { - this.updateStatus = updateStatus; + public void setOperPeople(String operPeople) { + this.operPeople = operPeople; } @Override public String toString() { return "SysCustomerOper{" + "id=" + id + - ", sysCustomerPuser='" + sysCustomerPuser + '\'' + - ", sysCustomerEnterPriseName='" + sysCustomerEnterPriseName + '\'' + + ", purser='" + purser + '\'' + + ", enterpriseCode='" + enterpriseCode + '\'' + + ", enterpriseName='" + enterpriseName + '\'' + ", oper='" + oper + '\'' + - ", updateTime=" + updateTime + - ", updateBy='" + updateBy + '\'' + - ", updateStatus='" + updateStatus + '\'' + + ", createTime=" + createTime + + ", operPeople='" + operPeople + '\'' + + ", operStatus='" + operStatus + '\'' + '}'; } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d367fe6c..00f6dd06 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -23,12 +23,11 @@ spring: # username: root # password: RuiYi123 # url: jdbc:mysql://39.104.169.14:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 -# url: jdbc:mysql://120.24.213.253:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - url: jdbc:mysql://localhost:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://120.24.213.253:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 +# url: jdbc:mysql://localhost:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root -# password: RuiYi2022 -# password: Read-in2023 - password: RuiYi@2023 + password: Read-in2023 +# password: RuiYi@2023 # username: root # password: RuiYi2022 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 6dee82af..280ab7f4 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -136,8 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" confirm_tax, tax_rate, country_number, - degin_flag, - del_flag, + del_flag, first_add_time, @@ -188,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taxRate}, #{countryNumber}, #{deginflag}, - #{delflag}, + 0, now(), @@ -248,7 +247,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where customer_id = #{customerId} - delete from sys_customer where customer_id = #{customerId} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml index b578f449..debbfb6e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml @@ -6,24 +6,26 @@ - - + + + - - - + + + - select id,sys_customer_purser,sys_customer_enterpriseName,oper,updateTime,updateBy,operStatus from sys_customer_oper + select id,purser,enterpriseName,enterpriseCode,oper,createTime,operPeople,operStatus from sys_customer_oper @@ -31,16 +33,35 @@ where id = #{id} - + + update sys_customer_oper set + purser = #{purser}, + enterpriseName = #{enterpriseName}, + enterprseCode = #{enterpriseCode}, + oper = #{oper}, + operPeople = #{operPeople}, + operStatus = #{operStatus}, + createTime = #{ createTime}, + where id = #{id} + insert into sys_customer_oper + + purser, + enterpriseCode, + enterpriseName, + oper, + operPeople, + operStatus, + createTime, + - #{sysCustomerPuser}, - #{sysCustomerEnterPriseName}, + #{purser}, + #{enterpriseCode}, + #{enterpriseName}, #{oper}, - #{updateTime}, - #{updateBy}, - #{updateStatus}, + #{operPeople}, + #{operStatus}, now(), diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html index f3fc96c9..3a8733ed 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html @@ -313,6 +313,13 @@ + @@ -349,23 +356,23 @@ }); function submitHandler() { if ($.validate.form()) { - // $.operate.save(prefix + "/add",$('#form-customer-add').serialize()); - $.ajax({ - url: prefix + "/add", - mothod:'post', - data: { - data: $('#form-customer-add').serialize(), - }, - beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); - $.modal.disable(); - }, - success: function (res) { - $("#bootstrap-table").bootstrapTable("refresh"); - $.modal.closeLoading(); - $.modal.msgSuccess(res.msg); - } - }) + $.operate.save(prefix + "/add",$('#form-customer-add').serialize()); + // $.ajax({ + // url: prefix + "/add", + // mothod:'post', + // data: { + // data: $('#form-customer-add').serialize(), + // }, + // beforeSend: function () { + // $.modal.loading("正在处理中，请稍后..."); + // $.modal.disable(); + // }, + // success: function (res) { + // $("#bootstrap-table").bootstrapTable("refresh"); + // $.modal.closeLoading(); + // $.modal.msgSuccess(res.msg); + // } + // }) } } diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 8d45ecf2..a8808ad8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -92,10 +92,10 @@ 添加 - - 修改 - + + + + 删除 @@ -116,6 +116,9 @@ 添加送货地址 + + 审核 + 详情列表 @@ -654,6 +657,12 @@ +
+
+
操作记录
+
+
+
@@ -674,9 +683,9 @@
- - + + +
@@ -754,7 +754,7 @@ if (value == 0){ return "待审核"; } - if(value==1){ + if (value == 1){ return "审核通过"; } if (value == 2){ @@ -769,7 +769,7 @@ if (value == 0){ return "否"; } - if(value==1){ + if (value==1){ return "是"; } if (value == 2){ @@ -1071,11 +1071,9 @@ function submitHandler() { if ($.validate.form('form-contacts-add')) { - $.operate.save(prefix1 + "/add", $('#form-contacts-add').serialize()); + $.operate.save(prefix + "/add", $('#form-contacts-add').serialize()); $('#infoModal').modal("hide") } - - } // 列表联系人明细 @@ -1460,7 +1458,7 @@ } -// 联系人 + // 联系人 $('#contacts-table').bootstrapTable('destroy'); $('#contacts-table').bootstrapTable({ url: '/system/contacts/list', @@ -1640,40 +1638,123 @@ }, ] }); + + //客户表操作记录 + $('#oper-table').bootstrapTable('destroy'); + $('#oper-table').bootstrapTable({ + url: '/system/customer/operList', + pagination: true, + pageNumber: 1, + pageSize: 10, + pageList: [10, 25, 50, 100], + showRefresh: false, + method: "post", + contentType: "application/x-www-form-urlencoded", + striped: true, // 是否显示行间隔色 + cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） + sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*） + clickToSelect: true, // 是否启用点击选中行 + showToggle: false, // 是否显示详细视图和列表视图的切换按钮 + cardView: false, // 是否显示详细视图 + detailView: false, // 是否显示父子表 + smartDisplay: false, // 加了这个才显示每页显示的行数 + showExport: false, // 是否显示导出按钮 + singleSelect: true, + paginationDetailHAlign: ' hiddenDetailInfo', + height: 150, + queryParams: function (params) { + //console.log("123"); + var curParams = { + // 传递参数查询参数 + pageSize: params.limit, + pageNum: params.offset / params.limit + 1, + enterpriseCode: row.enterpriseCode, + enterpriseName: row.enterpriseName, + purser: row.customerPurser + }; + // console.log(data[0].enterpriseCode) + return curParams + }, + columns: [ + { + field: 'id', + title: '操作id', + visible: false + }, + { + field: 'enterpriseCode', + title: '客户/代码', + }, + { + field: 'enterpriseName', + title: '客户/企业名称', + }, + { + field: 'purser', + title: '事业部' + }, + { + field: 'oper', + title: '操作' + }, + { + field: 'operPeople', + title: '操作人' + }, + { + field: 'createTime', + title: '操作时间' + }, + { + field: 'operStatus', + title: '操作的状态', + formatter : function(value, row, index) { + if (value == 0){ + return "成功"; + }else{ + return "失败" + } + } + }, + ] + }); $("#detailsModal").modal("show"); }) - function quotationAudit() { + function showCustomerAudit() { let data = $("#bootstrap-table").bootstrapTable("getSelections"); let userName = [[${@permission.getPrincipalProperty('userName')}]]; if (data.length === 1) { - $("#supplierQuotationId").val(data[0].supplierQuotationId) - $("#auditNo").val(1).trigger("change") - $("#auditName").val(userName) - $("#auditTime").datetimepicker("setDate", new Date()); + $("#customerId").val(data[0].customerId) + $("#deginflag").val(1).trigger("change") + $("#identifyingPeople").val(userName); $("#AuditModel").modal("show"); } else { $.modal.alert("请选择一条数据"); } } - function AuditConfirmSubmit() { - var auditNo = $("#auditNo").val() + function AuditConfirmSubmit(number) { + $("#deginflag").val(number).trigger("change"); + var auditNo = $("#deginflag").val() + ""; + var formData = $('#form-audit-edit').serialize(); + formData = formData + "&" +"deginflag=" + auditNo; + console.log(auditNo); $.ajax({ url: prefix + "/edit", type: "post", resultType: "json", - data: $('#form-audit-edit').serialize(), + data: formData, success: function (resp) { - console.log(resp) + console.log(resp); $("#bootstrap-table").bootstrapTable('refresh'); // $(".alert-success").addClass("show"); // window.setTimeout(function () { // $(".alert-success").removeClass("show"); // }, 1000);//显示的时间 - if (auditNo == 1) { + if(resp.msg == 0){ $.modal.msgSuccess("审核成功！") - } else if (auditNo == 0) { - $.modal.msgSuccess("取消审核成功！") + }else{ + $.modal.msgError("审核失败！") } }, error: function () { diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class b/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class index 6696d1f7..0d9e6cee 100644 Binary files a/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class and b/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class differ diff --git a/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class b/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class index 18180508..0ef98e69 100644 Binary files a/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class and b/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class differ