From b8d60ad7150bff45881cf66847363d7acfa600e4 Mon Sep 17 00:00:00 2001 From: Administrator <2695469943@qq.com> Date: Wed, 15 Aug 2018 17:25:52 +0800 Subject: [PATCH] =?UTF-8?q?2018/8/15=20zls=20=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/bus/controller/PlanController.java | 8 +- src/main/java/com/pro/bus/entity/Plan.java | 6 +- src/main/resources/mapper/bus/PlanMapper.xml | 18 +-- src/main/web/WEB-INF/views/bus/plan.jsp | 9 +- src/main/web/WEB-INF/views/info/customer.jsp | 116 +++++++++++------- 5 files changed, 96 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/pro/bus/controller/PlanController.java b/src/main/java/com/pro/bus/controller/PlanController.java index 1151111..5961d66 100644 --- a/src/main/java/com/pro/bus/controller/PlanController.java +++ b/src/main/java/com/pro/bus/controller/PlanController.java @@ -7,7 +7,10 @@ import com.pro.info.entity.Color; import com.pro.info.entity.Customer; import com.pro.info.entity.Standard; import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -123,12 +126,13 @@ return Result.successResult("删除成功"); * @return */ @RequiresPermissions("/bus/planmanager") - @RequestMapping(value = "/plan/status/{plan_id}/{plan_status}") + @RequestMapping(value = "/plan/status/{plan_id}/{plan_status}/{plan_person}") @ResponseBody - public Result updatePlanStatus(@PathVariable Integer plan_id, @PathVariable Integer plan_status) { + public Result updatePlanStatus(@PathVariable Integer plan_id, @PathVariable Integer plan_status,@PathVariable String plan_person) { Plan plan = new Plan(); plan.setPlan_id(plan_id); plan.setPlan_status(plan_status); + plan.setPlan_person(plan_person); planService.updatePlan(plan); return Result.successResult("修改成功"); } diff --git a/src/main/java/com/pro/bus/entity/Plan.java b/src/main/java/com/pro/bus/entity/Plan.java index 9d998ca..0854e2f 100644 --- a/src/main/java/com/pro/bus/entity/Plan.java +++ b/src/main/java/com/pro/bus/entity/Plan.java @@ -2,7 +2,7 @@ package com.pro.bus.entity; public class Plan { private Integer plan_id; //计划编号 - private Integer standard_id; //产品规格编号 + private String standard_id; //产品规格编号 private String standard_name; //产品名称 private Integer cus_id; //客户编号 private String cus_name; //客户名称 @@ -24,11 +24,11 @@ public class Plan { this.plan_id = plan_id; } - public Integer getStandard_id() { + public String getStandard_id() { return standard_id; } - public void setStandard_id(Integer standard_id) { + public void setStandard_id(String standard_id) { this.standard_id = standard_id; } diff --git a/src/main/resources/mapper/bus/PlanMapper.xml b/src/main/resources/mapper/bus/PlanMapper.xml index 456003f..b00f214 100644 --- a/src/main/resources/mapper/bus/PlanMapper.xml +++ b/src/main/resources/mapper/bus/PlanMapper.xml @@ -47,15 +47,15 @@ INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id @@ -96,9 +96,9 @@ insert into bus_plan values(#{plan_id},#{standard_id},#{cus_id},#{co_id},#{plan_ plan_type = #{plan_type}, - - plan_date = #{plan_date}, - + + plan_date =date(now()), + plan_person = #{plan_person}, @@ -113,12 +113,16 @@ insert into bus_plan values(#{plan_id},#{standard_id},#{cus_id},#{co_id},#{plan_ update bus_plan set - plan_status=#{param2} + plan_status=#{param2}, + plan_date=date(now()) + 1 <> 1 or plan_id=#{plan_id} + + diff --git a/src/main/web/WEB-INF/views/bus/plan.jsp b/src/main/web/WEB-INF/views/bus/plan.jsp index 1be56b1..d79b492 100644 --- a/src/main/web/WEB-INF/views/bus/plan.jsp +++ b/src/main/web/WEB-INF/views/bus/plan.jsp @@ -7,6 +7,7 @@ To change this template use File | Settings | File Templates. --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> + Title @@ -141,7 +142,7 @@ -
+ <%--
- +--%>
@@ -462,7 +463,7 @@ .then((ok) => { if (ok) { $.ajax({ - url : 'plan/status/' + data.plan_id + '/1', + url : 'plan/status/' + data.plan_id + '/1'+'/${sessionScope.user.u_name}', method : 'put', dataType : 'json' }).done(function(result) { @@ -580,7 +581,7 @@ //form.val("form-cus-add", {}) ; layerIdx = layer.open({ type: 1, - title: '新增客户信息', + title: '新增计划信息', area: ['800px', '540px'], content: $('#dom-win-cus-add'), zIndex: 100 //将层次降低,以使sweetalert能够在layer之上 diff --git a/src/main/web/WEB-INF/views/info/customer.jsp b/src/main/web/WEB-INF/views/info/customer.jsp index e670145..f6cc0f7 100644 --- a/src/main/web/WEB-INF/views/info/customer.jsp +++ b/src/main/web/WEB-INF/views/info/customer.jsp @@ -58,6 +58,7 @@
+ @@ -65,6 +66,8 @@ + +
@@ -175,6 +178,27 @@ var layer = layui.layer; var form = layui.form; + var showBns = function(){ + var _cus_status = $('#form-cus-query select[name=cus_status]').val(); + console.log("_cus_status="+_cus_status); + if(_cus_status==''){ + $('#bn-cus-del-multi,#bn-cus-cfm,#bn-cus-use,#bn-cus-unuse').prop('disabled',true).addClass("layui-btn-disabled"); + }else if(_cus_status=='00'){ + $('#bn-cus-add,#bn-cus-del-multi,#bn-cus-cfm').prop('disabled',false).removeClass("layui-btn-disabled"); + $('#bn-cus-use,#bn-cus-unuse').prop('disabled',true).addClass("layui-btn-disabled"); + }else if(_cus_status=='22'){ + $('#bn-cus-add,#bn-cus-del-multi,#bn-cus-cfm,#bn-cus-unuse').prop('disabled',true).addClass("layui-btn-disabled"); + $('#bn-cus-use').prop('disabled',false).removeClass("layui-btn-disabled"); + }else if(_cus_status=='55'){ + $('#bn-cus-add,#bn-cus-del-multi,#bn-cus-cfm,#bn-cus-use').prop('disabled',true).addClass("layui-btn-disabled"); + $('#bn-cus-unuse').prop('disabled',false).removeClass("layui-btn-disabled"); + }else if(_cus_status=='77'){ + $('#bn-cus-add,#bn-cus-del-multi,#bn-cus-cfm,#bn-cus-unuse').prop('disabled',true).addClass("layui-btn-disabled"); + $('#bn-cus-use').prop('disabled',false).removeClass("layui-btn-disabled"); + } + } + + showBns();//显示按钮 var cusTable = table.render({ elem: '#demo' , url: 'customerList' @@ -223,7 +247,7 @@ //重新从第 1 页开始 } }); - + showBns(); return false; }); //监听select选择 @@ -630,24 +654,24 @@ });//禁用多条数据 }); //函数:改变多个客户信息状态 - function changeMultiCusStatus(title,text,cus_status,table,cusTable){ + function changeMultiCusStatus(title,text,cus_status,table,cusTable) { var checkStatus = table.checkStatus('demo'); //基础参数id对应的值 console.log(checkStatus.data) //获取选中行的数据(数组) console.log(checkStatus.data.length) //获取选中行数量,可作为是否有选中行的条件 //console.log(checkStatus.isAll ) //表格是否全选 - if(checkStatus.data.length==0){ + if (checkStatus.data.length == 0) { swal({ text: '您没有选择任何数据!', icon: "error", - buttons:false, - timer:1500 + buttons: false, + timer: 1500 }); return; } var arr = []; - $.each(checkStatus.data, function() { + $.each(checkStatus.data, function () { arr.push(this.cus_id); }); @@ -658,59 +682,61 @@ icon: "warning", buttons: [ "取消", - {text:'确认',closeModal:false} + {text: '确认', closeModal: false} ], dangerMode: true, }) .then((ok) => { - if (ok) { + if (ok) { + + $.ajax({ + url: 'customer/status/' + cus_status, + data: JSON.stringify(arr), + contentType: 'application/json;charset=UTF-8', + method: 'put', + dataType: 'json' + }).done(function (result) { + if (result.success) { + swal({ + text: result.message, + icon: "success", + buttons: false, + timer: 1500 + }); + cusTable.reload();//重载数据 + } else { + swal({ + title: result.message, + icon: "error", + button: "确定" + }); + } - $.ajax({ - url : 'customer/status/'+cus_status, - data : JSON.stringify(arr), - contentType : 'application/json;charset=UTF-8', - method : 'put', - dataType : 'json' - }).done(function(result) { - if (result.success) { - swal({ - text: result.message, - icon: "success", - buttons:false, - timer:1500 - }); - cusTable.reload();//重载数据 - } else { + }).fail(function (xhr) { swal({ - title: result.message, + title: xhr.status, + text: '请于管理员联系。', icon: "error", button: "确定" }); - } - - }).fail(function(xhr) { - swal({ - title: xhr.status, - text:'请于管理员联系。', - icon: "error", - button: "确定" }); - }); - } + } + + + }) + .catch(err => { + if (err) { + console.log(err); + swal("操作失败!", "请于管理员联系。", "error"); + } else { + swal.stopLoading();//停止加载显示 + swal.close();//关闭提示框 + } + }); - }) - .catch(err => { - if (err) { - console.log(err); - swal("操作失败!", "请于管理员联系。", "error"); - } else { - swal.stopLoading();//停止加载显示 - swal.close();//关闭提示框 - } - }); }//函数:改变多个客户信息状态结束 -- Gitee