diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java index 09791d9a..084451af 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java @@ -31,7 +31,7 @@ public class StoreHouseServiceImpl implements StoreHouseService { @Override public void queryStoreHouseByList(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); - params.put("delete_Flag", "0"); + params.put("deleteFlag", "0"); List> beans = storeHouseDao.queryStoreHouseByList(params); if(!beans.isEmpty()){ outputObject.setBeans(beans); @@ -52,11 +52,8 @@ public class StoreHouseServiceImpl implements StoreHouseService { if(bean == null){ Map user = inputObject.getLogParams(); params.put("id", ToolUtil.getSurFaceId()); - params.put("tenant_id", user.get("id")); - params.put("create_time", ToolUtil.getTimeAndToString()); - params.put("editer_id", user.get("id")); - params.put("edit_time", ToolUtil.getTimeAndToString()); - System.out.printf("---params="+params); + params.put("tenantId", user.get("id")); + params.put("createTime", ToolUtil.getTimeAndToString()); storeHouseDao.insertStoreHouse(params); }else{ outputObject.setreturnMessage("该仓库信息已存在，请确认！"); @@ -73,6 +70,7 @@ public class StoreHouseServiceImpl implements StoreHouseService { @Override public void queryStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); + params.put("userId", inputObject.getLogParams().get("id")); Map bean = storeHouseDao.queryStoreHouseById(params); if(bean == null){ outputObject.setreturnMessage("未查询到信息，请重试！"); @@ -93,9 +91,7 @@ public class StoreHouseServiceImpl implements StoreHouseService { Map params = inputObject.getParams(); // storeHouseDao.deleteStoreHouseById(params); Map user = inputObject.getLogParams(); - params.put("editer_id", user.get("id")); - params.put("edit_time", ToolUtil.getTimeAndToString()); - params.put("delete_Flag", 1); + params.put("deleteFlag", 1); storeHouseDao.editStoreHouseById(params); } @@ -108,9 +104,6 @@ public class StoreHouseServiceImpl implements StoreHouseService { @Override public void editStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); - Map user = inputObject.getLogParams(); - params.put("editer_id", user.get("id")); - params.put("edit_time", ToolUtil.getTimeAndToString()); storeHouseDao.editStoreHouseById(params); } } diff --git a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml index 5dfe4c5b..2c3e6aad 100644 --- a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml +++ b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml @@ -13,12 +13,11 @@ d.principal, d.tenant_id, d.is_default, - CONVERT (d.create_time, CHAR) createTime, - CONVERT (d.edit_time, CHAR) editTime + CONVERT (d.create_time, CHAR) createTime FROM erp_depot d WHERE - d.delete_Flag = #{delete_Flag} + d.delete_Flag = #{deleteFlag} AND d.name LIKE '%${name}%' @@ -60,9 +59,7 @@ tenant_id, is_default, - create_time, - edit_time, - editer_id + create_time )VALUES( #{id}, #{name}, @@ -81,11 +78,9 @@ #{principal}, - #{tenant_id}, + #{tenantId}, #{is_default}, - #{create_time}, - #{edit_time}, - #{editer_id}) + #{createTime} @@ -119,9 +115,6 @@ UPDATE erp_depot - - name = #{name}, - address = #{address}, @@ -137,14 +130,13 @@ principal = #{principal}, - - delete_Flag = #{delete_Flag}, + + delete_Flag = #{deleteFlag}, is_default = #{is_default}, - edit_time = #{edit_time}, - editer_id = #{editer_id} + name = #{name}, WHERE id = #{id} diff --git a/erp-web/src/main/resources/mapping/erp.xml b/erp-web/src/main/resources/mapping/erp.xml index 172f0145..5975126c 100644 --- a/erp-web/src/main/resources/mapping/erp.xml +++ b/erp-web/src/main/resources/mapping/erp.xml @@ -7,9 +7,6 @@ - @@ -25,6 +22,7 @@ + diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js b/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js index 872e8b42..66d1ff90 100644 --- a/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js +++ b/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js @@ -4,54 +4,54 @@ layui.config({ version: skyeyeVersion }).extend({ //指定js别名 window: 'js/winui.window', -}).define(['window', 'table', 'jquery', 'winui', 'fileUpload', 'dtree'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui'], function (exports) { winui.renderColor(); layui.use(['form'], function (form) { var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 - var $ = layui.$, - dtree = layui.dtree; + var $ = layui.$; form.render(); form.on('submit(formAddBean)', function (data) { //表单验证 if (winui.verifyForm(data.elem)) { - - if(isNull($.trim($("#houseName").val()))){ winui.window.msg('请输入仓库名称', {icon: 2,time: 2000}); return false; } - var params = { - houseName: $.trim($("#houseName").val()), - address: $.trim($("#address").val()), - warehousing: $.trim($("#warehousing").val()), - truckage: $.trim($("#truckage").val()), + houseName: $("#houseName").val(), + address: $("#address").val(), + warehousing: $("#warehousing").val(), + truckage: $("#truckage").val(), is_default: $("input[name='is_default']:checked").val(), - principal: $.trim($("#principal").val()), - remark: $.trim($("#remark").val()), + principal: $("#principal").val(), + remark: $("#remark").val(), }; AjaxPostUtil.request({url:reqBasePath + "storehouse002", params:params, type:'json', callback:function(json){ - if(json.returnCode == 0){ - parent.layer.close(index); - parent.refreshCode = '0'; - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + } + }}); } return false; }); //自定义表单验证（金额） form.verify({ - warehousing: [ - /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/ //正则表达式 - ,'请输入正确的金额, 可保留小数点后两位' //提示信息 - ], - truckage: [ - /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/ //正则表达式 - ,'请输入正确的金额, 可保留小数点后两位' //提示信息 - ], + warehousing : function(value, item){ + var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;//正则表达式 + if(!isNull(value) && !reg.test(value)){ + return "请输入正确的金额, 可保留小数点后两位"; + } + }, + truckage : function(value, item){ + var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/; + if(!isNull(value) && !reg.test(value)){ + return "请输入正确的金额, 可保留小数点后两位"; + } + }, }); $("body").on("click", "#cancle", function(){ diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js b/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js index e0717b6c..8fed9f37 100644 --- a/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js +++ b/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js @@ -4,12 +4,11 @@ layui.config({ version: skyeyeVersion }).extend({ //指定js别名 window: 'js/winui.window', -}).define(['window', 'table', 'jquery', 'winui', 'fileUpload', 'dtree'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui'], function (exports) { winui.renderColor(); layui.use(['form'], function (form) { var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 - var $ = layui.$, - dtree = layui.dtree; + var $ = layui.$; showGrid({ id: "showForm", url: reqBasePath + "storehouse003", @@ -17,25 +16,11 @@ layui.config({ pagination: false, template: getFileContent('tpl/storehouse/storehouseeditTemplate.tpl'), ajaxSendLoadBefore: function(hdb){ - hdb.registerHelper("compare1", function(v1, options){ - if(isNull(v1)){ - return path + "assets/img/uploadPic.png"; - }else{ - return basePath + v1; - } - }); + }, ajaxSendAfter:function(json){ //设置是否默认 - $("#houseName").val(json.bean.houseName); - $("#address").val(json.bean.address); - $("#warehousing").val(json.bean.warehousing); - $("#truckage").val(json.bean.truckage); - $("#principal").val(json.bean.principal); - $("#remark").val(json.bean.remark); $("input:radio[name=is_default][value=" + json.bean.is_default + "]").attr("checked", true); - - form.render(); form.on('submit(formEditBean)', function (data) { //表单验证 @@ -46,37 +31,36 @@ layui.config({ } var params = { rowId: parent.rowId, - houseName: $.trim($("#houseName").val()), - address: $.trim($("#address").val()), - warehousing: $.trim($("#warehousing").val()), - truckage: $.trim($("#truckage").val()), + houseName: $("#houseName").val(), + address: $("#address").val(), + warehousing: $("#warehousing").val(), + truckage: $("#truckage").val(), is_default: $("input[name='is_default']:checked").val(), - principal: $.trim($("#principal").val()), - remark: $.trim($("#remark").val()), + principal: $("#principal").val(), + remark: $("#remark").val(), }; - AjaxPostUtil.request({url:reqBasePath + "storehouse005", params:params, type:'json', callback:function(json){ - if(json.returnCode == 0){ - parent.layer.close(index); - parent.refreshCode = '0'; - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + } + }}); } return false; }); //自定义表单验证（金额） form.verify({ warehousing : function(value, item){ - var reg = /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/;//正则表达式 - if(!reg.test(value)){ + var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;//正则表达式 + if(!isNull(value) && !reg.test(value)){ return "请输入正确的金额, 可保留小数点后两位"; } }, truckage : function(value, item){ - var reg = /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/; - if(!reg.test(value)){ + var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/; + if(!isNull(value) && !reg.test(value)){ return "请输入正确的金额, 可保留小数点后两位"; } }, diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouselist.js b/erp-web/src/main/resources/template/js/storehouse/storehouselist.js index 8372f24c..165b63e0 100644 --- a/erp-web/src/main/resources/template/js/storehouse/storehouselist.js +++ b/erp-web/src/main/resources/template/js/storehouse/storehouselist.js @@ -6,15 +6,11 @@ layui.config({ }).extend({ //指定js别名 window: 'js/winui.window', }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - authBtn('1552963122253'); - var $ = layui.$, form = layui.form, table = layui.table; - //表格渲染 table.render({ id: 'messageTable', @@ -67,7 +63,6 @@ layui.config({ return false; }); - //编辑 function edit(data){ rowId = data.id; @@ -88,7 +83,11 @@ layui.config({ //删除仓库 function deleteHouse(data){ - AjaxPostUtil.request({url:reqBasePath + "storehouse004", params:{rowId: data.id}, type:'json', callback:function(json){ + var params = { + rowId: data.id, + houseName: data.houseName + }; + AjaxPostUtil.request({url:reqBasePath + "storehouse004", params:params, type:'json', callback:function(json){ if(json.returnCode == 0){ winui.window.msg("该仓库已删除成功。", {icon: 1,time: 2000}); loadTable(); @@ -104,7 +103,7 @@ layui.config({ url: "../../tpl/storehouse/storehouseadd.html", title: "新增仓库", pageId: "storehouseadd", - area: ['950px', '90vh'], + area: ['90vw', '90vh'], callBack: function(refreshCode){ if (refreshCode == '0') { winui.window.msg("操作成功", {icon: 1,time: 2000}); @@ -115,13 +114,22 @@ layui.config({ }}); }); - $("body").on("click", "#reloadTable", function(){ + $("body").on("click", "#reloadTable", function() { loadTable(); }); + $("body").on("click", "#formSearch", function () { + refreshTable(); + }) + //刷新 function loadTable(){ table.reload("messageTable", {where:{houseName:$.trim($("#houseName").val())}}); } + //搜索 + function refreshTable(){ + table.reload("messageTable", {page: {curr: 1}, where:{houseName:$.trim($("#houseName").val())}}) + } + exports('storehouselist', {}); }); diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html b/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html index 2b99964c..e0df1533 100644 --- a/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html +++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html @@ -10,51 +10,51 @@
-
+
-
+
-
+
- +
-
+
- +
-
+
-
+
-
+
-
+
diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouseedit.html b/erp-web/src/main/resources/template/tpl/storehouse/storehouseedit.html index 5ddd9e77..f998c516 100644 --- a/erp-web/src/main/resources/template/tpl/storehouse/storehouseedit.html +++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouseedit.html @@ -10,56 +10,7 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
-
- - -
-
diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl b/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl index bad38169..6dcb7de1 100644 --- a/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl +++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl @@ -1,52 +1,52 @@ {{#bean}} -
- -
- -
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- - -
+
+
+ +
+ +
-
- -
- -
+
+
+ +
+
+
-
-
- - -
+
+
+ +
+
{{/bean}} \ No newline at end of file