From 52c82ea3c66d3c9aa1d819ecfce5309fbbc7dfaf Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 23 Nov 2023 10:44:28 +0800 Subject: [PATCH] =?UTF-8?q?[update:]=E5=AE=A2=E6=88=B7=E8=A1=A8=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95,=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 117 ++++--------- .../com/ruoyi/system/domain/SysCustomer.java | 16 +- .../ruoyi/system/domain/SysCustomerOper.java | 74 +++++---- .../src/main/resources/application-druid.yml | 9 +- .../mapper/system/SysCustomerMapper.xml | 6 +- .../mapper/system/SysCustomerOperMapper.xml | 53 ++++-- .../templates/system/customer/add.html | 41 +++-- .../templates/system/customer/customer.html | 157 +++++++++++++----- .../framework/web/service/DictService.class | Bin 1277 -> 2720 bytes .../generator/controller/GenController.class | Bin 9478 -> 9365 bytes 10 files changed, 267 insertions(+), 206 deletions(-) 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 6696d1f76e32e2627ad9c4e1cddb08904eb371e6..0d9e6cee4f13659f0d4a4ee66d0d31e87a7c9bc4 100644 GIT binary patch literal 2720 zcmbVOYjfK~6g}%WmSZbTnxp~qYzu|F)f5ULPE(wuPu#TBZ9<#!Slg>@ z7w{Drh7vl%@R^^)hr(G|wv@UvO&KSv)#~oqd(XZ1NPj>3<4*t|!_8n4>q9t(jVvzU zqMBXG;xevixSBx<>lu83Viwo1nZc%pC{~T=3K9CQkQI~ejDEW$l{B&oj z5Xn8(2q`MhVe)Me+7%EvcTly`Rj&2_UawX<4Gud!#qvE)xQFR*9vJI2D^4mt3 zNyS%wRe3?Ti?VFinX?xh((hOpNjy0Es$$ua^%i{{4v8q4b+h7=81?MB9V8$KGa%ub zZ1VKMhn+o1-~555S=OCmRe2|{_{sq>^RDT&>Vz8YCwwG^u5utSc`*O%hOh?C#&*-w zm3|ufR}`CwQR3cOE{w!zEu<_837Bmxdh;_XKuckm%7ezSi*#PU(0P zZ)x~e$9I?&7>}x|;JUJ{h}R%>lu=>GI;t=kw~qU$>DYxOz|QDO-J!@7I2s*tS$eyq zRL2AC>8N8*LqmrRM@JLi3(Q8~FBJ|l6aWY9biMo_=$IqXS)Do^ix#esCrSAfn2U~K zVZTJK1tz?pAG__f)>h(w7?hZ_QbQw@P&F2m(95Q*?3#*I%8titUG=_t6&UNi`E80H zg*9V&n~r~>(e&GVhlHgVbVy{HpXMtnZS`WEoQl_Hmjkwmwky5OKszY)+>^9}n~AP{ zj8|IglqN+$s8k27LZyzZ!T^UO@|ktMQ<^PG#{seIBrYG*gm5J;mf;csWVI@AEZ&4& z^Sd~~SN$YE0uubO=2Ic(!$_X@H#m21mfpl%W;kh0E9ll zQSTVwB;Mm4-&Z)r!_?;U!LdMg=2s+U_c4&bPh3vmIL8jesQ_Ymr1cPSTThX? z^90(p$mz}b-;sWdd-MAk5?D^=lKaRAJjPWu%L@DjeR=RHhPm&^aw<3Y8%CBjbs1ew z=Tc)wbJ{+}2C&WfcrM+U&*f74m`Gsz$A5pBQ?w)lTF%fpAdfUwFphIf(<+w8WC5S^ zgRQ_1vo-8s9W`uF9xlMcr6Aaw+)-e<7Wki{9y311we%yc@PALGz*8nlXPXQ+j>#FiV7un{bXox>7$ATl@L5=d-VSX#Ip zYvP@0qltX^zvKJ8@Bcm4zWw&+&)Yk&$wn2ArcarrfMr(ltQD|I+oR)=Jf9tuvJYps z>s}w8U!7Pu$EQb^hG9kw6?~7>utsDs40)^@y2KVqc5fxwms_*ahr2Y}FYj&95Va@K zl1!UeR8^G~gQ6>fe?42Zgyh3)yAriV`*;W$Q*JZ?mvJT(EowyK4zrs|d^^C_3v50? zN3$7=elH1)YT3FODl R7pn`!xq&3=dW{Pfe*ylUAoc(N 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 1818050814c92b73533c688d3203ccc77241c0c5..0ef98e69c1652f4e848e247bd21e581585cbf542 100644 GIT binary patch delta 3549 zcmb_e33yc175>kgN#11UIT$t5+IonmM9vOh*8!gfKfsOfdq$;5E7e=2y~fl zQrjw3UWwh+Dz%#y8=Ej-QM^?dpXm0dKKu+nSLzoY?DpbWJg3sX^x#)sJdaC{dgWr1b zJG`K*-|O zScabWWE)a8^rE-a$X|n20*m(b_0)7mdMz|#rJ%sRGf*(wlF2ef;C2{t4mMaa6|ELl zVYMmKEGd@?OQy>VOJ+)iV1~WXn{U6I6^vQ90#}++X-SoYEvc4S^leFv(BvGMYsx%J zYUNx@&Xf6qoSweUuHNSM?GaPXx8wq;69l^3ceK~^wD)$_v_$*6dOIyyAQzf)ktGYI z-ja)DktLT%gCNh5ye`_+Q?sbQzkOF@*Fav>l1t?>25ZS;Sz^gjS!S2{D_nwdVl17~ zu(Ku76WL6$svSz$>dDXftuOPZy@-s_*Wex>qO>9Sfbx1>d*D6!-UVQ6bCX_d8> zw8>SLtkY$^Ty4n)*{A?FS<)^Y79PSkE!j*49#L+)Tw_Yak}YVp3v(At>69jczoD-; z8tIKzH%59pqgw?~KwB;8k|sNv8xC}<>Ne>yWxFN4(l>N4cVpJjz{DM{hDMGK;DVu5 zBV}l5Ah?`#Hh){3GuGmivjF$3JJ+>#I8;*AMmaCFfthUXDqKa%A{X#s9oF+#a5Xki zVy*pjak0HObXL9Us1IO%hI~O%UJ(Q-zmXD~)V{a7ns?-Djv^5p^=N+mXud zZc=Z>+cY+NX~_a7v-!xP{T*C)B7j{e!fsShN@J~cc$KMGEAe)AtnjoP??8-p0+fHJ z6KfIacaiH(MV;VvC!?N4P9~~%!fOYaY5$1zp#Fs9X+M^N4tGKW#285%*BLk}Z6IDHs1bTgBiVR%MRS?4)|GRjP@ z%TY#^{a|TPEL`UcArJqIAj#H?vYk;;1pude7)c$P>yL#_Uj5$TN1fA{?AU zwYja~;Ji@QA=E0JG+FroTx#*$gr$Q_uN!SlA{Mfv!94hI1M-=QGA3goK8S6&iJf&b z2HAyA;1)cETX7uw_)dM8uj76`gM)Ylw>g#C!kb_a^Y8&`_^8=W{hQd6QC8z-)+dJ+ zZ+E8C)HIG&RQROsrFpg(4{xCZ13qr{ag1FA^D1mAy9wzfI^D{`>p<(^B@FMU;e=Fo zN@_o)1}W76_b6t-G;y1WkC^zViI181xbyc3KFPevd?sS2VLF1J920yED@Hj}+2ifd ziO!Rs@Y6m1DaOe&9h*D&f71X1WOTR_pH4IrUpa&SfI^nU8>@=rJOfISns49`O0+fx zYcqE3+{NVHjR`p5q&h#LJeEQfCNDjOa&nX31vYs`kKdiq;|H7`zg_EZ3gLZ*+Jbu$ z!%2EEH5H^kiR}DSkR>ku`-tpI8L0dzRDOKc8P)NqK6etT*dBa71J)OkqxVJJ%Yy0+ zsQ13!@_{6f3k)=c51~$z z!(%ubk2}Z{cY82}JctqYgWkVE#Frbus z9f&zC8Yle_Ywz54<7$7=X={I+wLfu&+AG+^2gS)9IUZP5dU75Y8pz_G~~Qy2F*=yUNaZ_fZzPAuKSeg{;wpaWB7&>gQ4G$Fj|}ex|Qa1 zfa-a_Tr8*xE(%@}M}v#hrOCG;co`ps@X=u`=0g?766Gz8W0`?4m6i*ea7D6p?ZIhf qtJB|J^{Ke(Q*qThF=UREfk&Ojf6N&!{la^k`zKi0P0m-|lWzcSB1t#^ delta 3649 zcmcInd3;pW75>hfN#11UF$t59WCAfr2#}4iDVm@Gg6yjiLjni`gb)%ENdjeQJ6aT% z)>`^1wsx~B+D%-rAxlfCw$@s@s?~08ZSCgPRg10kJMT?iCJ6j~{iDAmcg{WM+;hLP z-7~pu!TyEuC*SQm24I@(3}Pux1n`42EWr;={3r-NPU!OE0DhvMKMhjyl!~7Y;Til) zx6dl|oQabD@%Wcg zCr!K)L^=Mg%YW3!yDB>sfE^Tw1kfK8Lwo_;8^V@n#Lr75MVC}vOrnv1QfYKhf=Y#S zv2+<0lCY!)BqJchm5c-=Gay-nAtQ939grOT%+)0tlsp+}$|zIvkHng}lqEuKiNhb43OQy(FOQy*Mrd(*r zbh*fqi=|SK*4p0G+_p5ftL=f{d-Pow176SX)y?ZC6KgTazW1O0_97Etw^= zEvb*`S#8Q1OV-L& zmaLQYmc(?~AR8^&B#jDhvn5Tk#lmqsZb>r*cvPiLvelFpOIoqY4y9L}zfEcd;hOfg zuEw^m^2Lp9OAZ0Znt6UJ&nP;V(?X8kcplFU-q?z5-tBE@r(AHgdpqfEFzj&N=p+ow zh+#P`uJ}J;*q*@9fliG8G29BDeSh90X|SKq8yVM#mkB)%?P-pz#PhWTA7uQ6+#w!ZXr~Ne1ffJ9RV~h^BR8ax^6x z7~st)i%cQBsdZ(MY0;D(T%dHqWXU7&sl^LjOAj&!el#$uY_tq+u47YQk8JGc@Vo(+ z;wDbx4>L6%!9LuALoCea@G%bO19%x9$E)}Rr|NBZ3kSuA+nwZX=3{XPQ+a9!ZS6q^ z&)&i^-N$r&lz(Zode~`OQzPppnfH^tm8MyBqz=%yfsmxbW`FyTEq-3rOsoZXhZi=p z7PQm#J#Y;lq+wU9#nU=St=p-!3@N8D0j7yhn)sB7J4}4q#Alq}&+;1pHpdY%|NMOG`@2 zkK&St$aUlAjCtdU=b^$UcUXJphwlew`N#MO;G8AmDGD z7UE+`4t#TJgfFRt9HCdZZ3n>t{w1%(`Nd`?|a-o$;i5$ H_Wl0?Fhpbb