From de18befa72f7cf5e985b9aca2db9d95128688734 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 10 Jul 2023 16:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89pc=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E6=94=B6=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialServiceImpl.java | 2 +- .../pages/BusinessType/businesstype_out.html | 70 ++--- .../application/form-step-look_back.html | 17 +- .../form-step-look_minRecordOut.html | 221 ++++++++-------- .../constructionunit_out.html | 71 ++--- .../templates/pages/depository/table-in.html | 161 ++++++------ .../templates/pages/depository/table-out.html | 170 ++++++------ .../pages/depository/table-stock.html | 137 +++++----- .../templates/pages/group/group-out.html | 212 +++++++-------- .../pages/material/material-out.html | 120 +++++---- .../pages/material/material-view_back.html | 100 ++++--- .../pages/materialtype/materialType_view.html | 138 +++++----- .../templates/pages/split/split-out.html | 244 +++++++++--------- .../pages/warehouse/depository-out.html | 153 +++++------ .../templates/pages/depository/table-out.html | 170 ++++++------ .../pages/material/material-out.html | 147 +++++------ .../templates/pages/split/split-out.html | 244 +++++++++--------- 17 files changed, 1203 insertions(+), 1174 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index b195fa45..117bc45d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -262,7 +262,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findMaterialPByConditionForTable(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/resources/templates/pages/BusinessType/businesstype_out.html b/src/main/resources/templates/pages/BusinessType/businesstype_out.html index d470311d..01f0624a 100644 --- a/src/main/resources/templates/pages/BusinessType/businesstype_out.html +++ b/src/main/resources/templates/pages/BusinessType/businesstype_out.html @@ -15,37 +15,41 @@
-
- 搜索信息 -
-
-
-
- -
- +
+
+

搜索

+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
- -
-
-
- -
+
- +
-
+
@@ -99,7 +103,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -124,8 +128,8 @@ {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50, 100], - limit: 10, + limits: [15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line' }); @@ -244,8 +248,7 @@ layer.full(index); }); return false; - } - else if (obj.event === 'delete') { + } else if (obj.event === 'delete') { layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { $.ajax({ @@ -347,7 +350,6 @@ }); - diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index 0cf16fe8..80007953 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -151,8 +151,6 @@ width: '100%', //设置容器宽度 stepWidth: '750px', height: '100%', - // number:number, - // position: position, stepItems: [] }); @@ -372,17 +370,16 @@ selectThisMinRecord = function (obj) { - // console.log(obj) var minId = obj.value; layer.open({ type: 2, - title: '详情', - skin: 'layui-layer-rim', - maxmin: true, - shadeClose: true, //点击遮罩关闭层 - area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, + title:"详细信息", + offset: 'b', + anim: 'slideUp', // 从上往下 + area: ['100%', '65%'], + shade: 0.1, + shadeClose: true, + id: 'ID-demo-layer-direction-t', content: '/form_step_lookByminRecordOut?id=' + minId, }); }; diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html index fc252b37..7a3c83bb 100644 --- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html +++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html @@ -15,129 +15,116 @@
- -
-
-
-
-
- - - - - - - +
+
+ + +
+ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + - + + - + -
申请编号 - -
物料名称 - -
物料型号 - -
物料型号 - -
存货编码 - -
数量 - -
单位 - -
金额 - +
物料名称 + +
物料型号 + +
物料型号 + +
存货编码 + +
数量 + +
单位 + +
金额 + -
仓库名称 - -
库位编码 - -
转入位置 - -
仓库名称 + +
库位编码 + +
转入位置 + +
出库人员 - +
出库人员 + -
- - -
+ + +
@@ -243,9 +230,9 @@ time: 1000 }, function () { - var index = parent.layer.getFrameIndex(window.name); - parent.location.reload(); //刷新父页面 - parent.layer.close(index); + var index = parent.layer.getFrameIndex(window.name); + parent.location.reload(); //刷新父页面 + parent.layer.close(index); }) } else { diff --git a/src/main/resources/templates/pages/constructionunit/constructionunit_out.html b/src/main/resources/templates/pages/constructionunit/constructionunit_out.html index bd47a8b9..c6345298 100644 --- a/src/main/resources/templates/pages/constructionunit/constructionunit_out.html +++ b/src/main/resources/templates/pages/constructionunit/constructionunit_out.html @@ -15,38 +15,41 @@
-
- 搜索信息 -
-
-
-
- -
- +
+
+

搜索

+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
- -
-
-
- -
+
- +
-
- +
diff --git a/src/main/resources/templates/pages/depository/table-in.html b/src/main/resources/templates/pages/depository/table-in.html index a9302b30..28ab5c2b 100644 --- a/src/main/resources/templates/pages/depository/table-in.html +++ b/src/main/resources/templates/pages/depository/table-in.html @@ -15,81 +15,94 @@
-
- 搜索信息 -
-
- -
-
- -
- - - - +
+
+

搜索

+
+
+ + +
+
+ +
+ + - + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
+
- +
-
+
@@ -102,7 +115,8 @@ function selectMaterialByName(obj) { } - function showDetail(){ + + function showDetail() { } @@ -126,7 +140,7 @@ area: ['70%', '70%'], move: '.layui-layer-title', fixed: false, - content: '/selectDepository?type='+selectDepositoryType+'&clickObj=' + parentId, + content: '/selectDepository?type=' + selectDepositoryType + '&clickObj=' + parentId, }); }; @@ -151,7 +165,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -170,7 +184,7 @@ cols: [ [ {type: "checkbox", width: 50}, - {field: 'aircode',title: '存货编码', width: 150, templet: '#applicationInCode'}, + {field: 'aircode', title: '存货编码', width: 150, templet: '#applicationInCode'}, {field: 'mname', width: 150, title: '物料名称'}, {field: 'mversion', width: 150, title: '规格型号'}, {field: 'airUnit', width: 100, title: '计量单位'}, @@ -185,8 +199,8 @@ {title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50,100], - limit: 10, + limits: [ 15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function () { @@ -316,8 +330,7 @@ layer.full(index); }); return false; - } - else if (obj.event === 'delete') { + } else if (obj.event === 'delete') { var req = {}; req.id = data.id; layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { @@ -369,19 +382,17 @@ showDetail = function (obj) { - var index = layer.open({ - title: '入库信息详情', + layer.open({ type: 2, - shade: 0.2, - maxmin: true, + offset: 'r', + anim: 'slideLeft', // 从右往左 + area: ['30%', '100%'], + shade: 0.1, + title: "入库信息详情", shadeClose: true, - area: ['100%', '100%'], + id: 'applicationOutInfoForLeft', content: '/form_step_look?id=' + obj.id, }); - $(window).on("resize", function () { - layer.full(index); - }); - return false; }; $('body').on('click', '[data-refresh]', function () { diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index a70f6a95..5c32f96a 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -15,69 +15,77 @@
-
- 搜索信息 -
-
- -
-
- -
- - - - +
+
+

搜索

+
+
+ + +
+
+ +
+ + - + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
+
- +
-
+
@@ -226,7 +233,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -274,8 +281,8 @@ {title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50, 100], - limit: 10, + limits: [15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function (res, curr, count) { @@ -283,7 +290,7 @@ if (display !== "none") { if (flagForReload) { flagForReload = false; - let col = {field: 'price', title: '金额', minWidth: 150, sort: true}; + let col = {field: 'price', title: '金额', width: 100, sort: true}; cols.splice(6, 0, col); // table.reloadData('currentTableId', {cols: [cols]}); table.reload('currentTableId', {cols: [cols]}); @@ -437,37 +444,22 @@ }); showDetail = function (obj) { - var index = layer.open({ - title: '出库信息详情', + layer.open({ type: 2, - shade: 0.2, - maxmin: true, + offset: 'r', + anim: 'slideLeft', // 从右往左 + area: ['30%', '100%'], + shade: 0.1, + title: "出库记录详情", shadeClose: true, - area: ['100%', '100%'], + id: 'applicationOutInfoForLeft', content: '/ApplicationOutView?id=' + obj.id, }); - $(window).on("resize", function () { - layer.full(index); - }); - } + }; table.on('tool(currentTableFilter)', function (obj) { let data = obj.data; - if (obj.event === 'detail') { - var index = layer.open({ - title: '出库信息详情', - type: 2, - shade: 0.2, - maxmin: true, - shadeClose: true, - area: ['100%', '100%'], - content: '/ApplicationOutView?id=' + data.id, - }); - $(window).on("resize", function () { - layer.full(index); - }); - return false; - } else if (obj.event === 'delete') { + if (obj.event === 'delete') { var req = {}; req.id = data.id; layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index 89cf381e..a3b84f97 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -13,65 +13,72 @@
-
- - 搜索信息 -
- - - -
-
-
- -
- - - +
+
+

搜索

+
+
+ + + + +
+
+ +
+ + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
+
- +
-
+
-
- 搜索信息 -
-
-
- - -
- -
- +
+
+

搜索

+
+
+ +
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
-
- -
- -
- -
-
- - -
- -
- -
-
- -
- -
- -
-
- -
- -
+
- +
-
+
@@ -88,7 +98,8 @@ @@ -101,9 +112,10 @@ - + + + + @@ -82,12 +93,14 @@ @@ -112,7 +125,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -132,7 +145,7 @@ cols: [ [ {type: "checkbox", width: 50}, - {field: 'mcode',title: '存货编码', width: 150, templet: '#splitCode'}, + {field: 'mcode', title: '存货编码', width: 150, templet: '#splitCode'}, {field: 'mname', width: 120, title: '物料名称', sort: false}, {field: 'typeName', width: 150, title: '物料种类'}, {field: 'version', width: 200, title: '规格型号', sort: false}, @@ -148,8 +161,8 @@ {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50,100], - limit: 10, + limits: [ 15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function () { @@ -158,7 +171,6 @@ }); - // 监听搜索操作 form.on('submit(data-search-btn)', function (data) { var req = {}; @@ -227,11 +239,11 @@ layer.close(this.layerIndex); if (res.status >= 300) { let data = res.data; - if(data === ""){ - layer.msg(data.statusInfo.detail,{ - icon:5, - time:1000 - },function () { + if (data === "") { + layer.msg(data.statusInfo.detail, { + icon: 5, + time: 1000 + }, function () { table.reloadData('currentTableId', { url: '/split/split_out', page: { @@ -240,17 +252,17 @@ }, 'data'); return false; }) - }else{ - let outMessage =''; + } else { + let outMessage = ''; for (let i = 0; i < data.length; i++) { let d = data[i]; - outMessage += d.mname+"," + outMessage += d.mname + "," } - outMessage +='的拆单正在使用中，不允许进行删除操作'; - layer.msg(outMessage,{ - icon:0, - time:1000 - },function () { + outMessage += '的拆单正在使用中，不允许进行删除操作'; + layer.msg(outMessage, { + icon: 0, + time: 1000 + }, function () { table.reloadData('currentTableId', { url: '/split/split_out', page: { @@ -259,8 +271,7 @@ }, 'data'); }) } - } - else { + } else { layer.msg("删除成功", { icon: 6,//成功的表情 time: 500 //1秒关闭（如果不配置，默认是3秒） @@ -333,9 +344,9 @@ success: function (data) { layer.close(this.layerIndex); if (data.status >= 300) { - layer.msg(data.statusInfo.detail,{ - icon:0, - time:1000 + layer.msg(data.statusInfo.detail, { + icon: 0, + time: 1000 });//失败的表情 } else { @@ -352,53 +363,53 @@ var req = {}; req.id = data.id; layer.confirm('该操作会造成不可逆后果，是否继续？', { - btn: ['继续', '取消'] //按钮 - }, + btn: ['继续', '取消'] //按钮 + }, function () { - $.ajax({ - url: '/split/realDeleteSplit', - dataType: 'json', - type: 'POST', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(req), - beforeSend: function () { - this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); - }, - success: function (data) { - layer.close(this.layerIndex); - if (data.status >= 300) { - layer.msg(data.statusInfo.message,{ - icon:0, - time:1000 - },function () { - return false - });//失败的表情 - - } else { - obj.del(); - layer.msg("删除成功", { - icon: 6,//成功的表情 - time: 500 //1秒关闭（如果不配置，默认是3秒） - }); + $.ajax({ + url: '/split/realDeleteSplit', + dataType: 'json', + type: 'POST', + contentType: "application/json;charset=utf-8", + data: JSON.stringify(req), + beforeSend: function () { + this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); + }, + success: function (data) { + layer.close(this.layerIndex); + if (data.status >= 300) { + layer.msg(data.statusInfo.message, { + icon: 0, + time: 1000 + }, function () { + return false + });//失败的表情 + + } else { + obj.del(); + layer.msg("删除成功", { + icon: 6,//成功的表情 + time: 500 //1秒关闭（如果不配置，默认是3秒） + }); + } } - } - }) - }, function () { - // 执行重加载 - table.reloadData('currentTableId', { - url: '/split/split_out', - page: { - curr: 1 - } - },'data'); - }); + }) + }, function () { + // 执行重加载 + table.reloadData('currentTableId', { + url: '/split/split_out', + page: { + curr: 1 + } + }, 'data'); + }); } }); //监听状态操作 form.on('switch(changeState)', function (obj) { let display = $("#display").css("display"); - if(display !== "none"){ + if (display !== "none") { var req = new Map; req["id"] = this.value; if (obj.elem.checked) { @@ -427,8 +438,7 @@ } } }) - } - else{ + } else { $.ajax({ url: "/split/findAllSplitInfoForbidden", type: 'post', @@ -437,7 +447,7 @@ data: JSON.stringify(req), success: function (data) { data = data.data; - if(data){ + if (data) { $.ajax({ url: "/split/split_edit", type: 'post', @@ -462,7 +472,7 @@ } } }) - }else{ + } else { layer.confirm('该拆单正在使用中，是否禁用？', { btn: ['继续', '取消'] //按钮 }, function () { @@ -497,7 +507,7 @@ page: { curr: 1 } - },'data'); + }, 'data'); }); } } @@ -508,8 +518,6 @@ } - - }); diff --git a/src/main/resources/templates/pages/warehouse/depository-out.html b/src/main/resources/templates/pages/warehouse/depository-out.html index 3a0e5c69..9b46101e 100644 --- a/src/main/resources/templates/pages/warehouse/depository-out.html +++ b/src/main/resources/templates/pages/warehouse/depository-out.html @@ -16,48 +16,53 @@
-
- 搜索信息 -
-
-
- -
- -
- +
+
+

搜索

+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
- -
-
-
- -
- -
-
-
- -
+
- +
-
+
@@ -86,7 +95,8 @@ @@ -95,9 +105,10 @@
@@ -226,7 +233,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -274,8 +281,8 @@ {title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50, 100], - limit: 10, + limits: [15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function (res, curr, count) { @@ -283,7 +290,7 @@ if (display !== "none") { if (flagForReload) { flagForReload = false; - let col = {field: 'price', title: '金额', minWidth: 150, sort: true}; + let col = {field: 'price', title: '金额', width: 100, sort: true}; cols.splice(6, 0, col); // table.reloadData('currentTableId', {cols: [cols]}); table.reload('currentTableId', {cols: [cols]}); @@ -437,37 +444,22 @@ }); showDetail = function (obj) { - var index = layer.open({ - title: '出库信息详情', + layer.open({ type: 2, - shade: 0.2, - maxmin: true, + offset: 'r', + anim: 'slideLeft', // 从右往左 + area: ['30%', '100%'], + shade: 0.1, + title: "出库记录详情", shadeClose: true, - area: ['100%', '100%'], + id: 'applicationOutInfoForLeft', content: '/ApplicationOutView?id=' + obj.id, }); - $(window).on("resize", function () { - layer.full(index); - }); - } + }; table.on('tool(currentTableFilter)', function (obj) { let data = obj.data; - if (obj.event === 'detail') { - var index = layer.open({ - title: '出库信息详情', - type: 2, - shade: 0.2, - maxmin: true, - shadeClose: true, - area: ['100%', '100%'], - content: '/ApplicationOutView?id=' + data.id, - }); - $(window).on("resize", function () { - layer.full(index); - }); - return false; - } else if (obj.event === 'delete') { + if (obj.event === 'delete') { var req = {}; req.id = data.id; layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html index f4a1e17c..c79876bb 100644 --- a/target/classes/templates/pages/material/material-out.html +++ b/target/classes/templates/pages/material/material-out.html @@ -19,62 +19,70 @@ -
- 搜索信息 -
-
-
- - -
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- + +
+
+

搜索

+
+
+ +
+ + +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
+
- +
-
+
@@ -218,7 +226,7 @@ }, toolbar: '#toolbarDemo', defaultToolbar: ['filter', 'exports', 'print'], - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 cols: [ [ {type: "checkbox", width: 50}, @@ -237,8 +245,8 @@ ] ], - limits: [10, 15, 20, 25, 50, 100], - limit: 10, + limits: [15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function (res, curr, count) { @@ -767,34 +775,9 @@ }); - /*showDetail = function (obj) { - var index = layer.open({ - title: '物料信息详情', - type: 2, - shade: 0.2, - maxmin: true, - shadeClose: true, - area: ['100%', '100%'], - content: '/material_view?id=' + obj.id, - end: function () { - //执行搜索重载 - table.reloadData('currentTableId', { - url: '/material/material', - page: { - curr: 1 - } - }, 'data'); - } - }); - $(window).on("resize", function () { - layer.full(index); - }); - return false; - }*/ - showDetail = function (obj) { var index = layer.open({ - title: '库存信息详情', + title: '物料信息详情', type: 2, shade: 0.2, maxmin: true, diff --git a/target/classes/templates/pages/split/split-out.html b/target/classes/templates/pages/split/split-out.html index ccf5c241..c6261fbd 100644 --- a/target/classes/templates/pages/split/split-out.html +++ b/target/classes/templates/pages/split/split-out.html @@ -16,53 +16,60 @@
-
- 搜索信息 -
-
-
- -
- -
- +
+
+

搜索

+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
-
- -
- -
- -
-
- -
- -
- -
-
- - -
- -
- -
-
-
- -
+
- +
-
+
@@ -73,8 +80,12 @@ @@ -82,12 +93,14 @@ @@ -112,7 +125,7 @@ "data": res.data //解析数据列表 }; }, - height: 'full-255',//固定高度-即固定表头固定第一行首行 + height: 'full-60',//固定高度-即固定表头固定第一行首行 request: { pageName: 'page', //页码的参数名称，默认：page limitName: 'size' //每页数据量的参数名，默认：limit @@ -132,7 +145,7 @@ cols: [ [ {type: "checkbox", width: 50}, - {field: 'mcode',title: '存货编码', width: 150, templet: '#splitCode'}, + {field: 'mcode', title: '存货编码', width: 150, templet: '#splitCode'}, {field: 'mname', width: 120, title: '物料名称', sort: false}, {field: 'typeName', width: 150, title: '物料种类'}, {field: 'version', width: 200, title: '规格型号', sort: false}, @@ -148,8 +161,8 @@ {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"} ] ], - limits: [10, 15, 20, 25, 50,100], - limit: 10, + limits: [ 15, 30, 45, 60, 100], + limit: 15, page: true, skin: 'line', done: function () { @@ -158,7 +171,6 @@ }); - // 监听搜索操作 form.on('submit(data-search-btn)', function (data) { var req = {}; @@ -227,11 +239,11 @@ layer.close(this.layerIndex); if (res.status >= 300) { let data = res.data; - if(data === ""){ - layer.msg(data.statusInfo.detail,{ - icon:5, - time:1000 - },function () { + if (data === "") { + layer.msg(data.statusInfo.detail, { + icon: 5, + time: 1000 + }, function () { table.reloadData('currentTableId', { url: '/split/split_out', page: { @@ -240,17 +252,17 @@ }, 'data'); return false; }) - }else{ - let outMessage =''; + } else { + let outMessage = ''; for (let i = 0; i < data.length; i++) { let d = data[i]; - outMessage += d.mname+"," + outMessage += d.mname + "," } - outMessage +='的拆单正在使用中，不允许进行删除操作'; - layer.msg(outMessage,{ - icon:0, - time:1000 - },function () { + outMessage += '的拆单正在使用中，不允许进行删除操作'; + layer.msg(outMessage, { + icon: 0, + time: 1000 + }, function () { table.reloadData('currentTableId', { url: '/split/split_out', page: { @@ -259,8 +271,7 @@ }, 'data'); }) } - } - else { + } else { layer.msg("删除成功", { icon: 6,//成功的表情 time: 500 //1秒关闭（如果不配置，默认是3秒） @@ -333,9 +344,9 @@ success: function (data) { layer.close(this.layerIndex); if (data.status >= 300) { - layer.msg(data.statusInfo.detail,{ - icon:0, - time:1000 + layer.msg(data.statusInfo.detail, { + icon: 0, + time: 1000 });//失败的表情 } else { @@ -352,53 +363,53 @@ var req = {}; req.id = data.id; layer.confirm('该操作会造成不可逆后果，是否继续？', { - btn: ['继续', '取消'] //按钮 - }, + btn: ['继续', '取消'] //按钮 + }, function () { - $.ajax({ - url: '/split/realDeleteSplit', - dataType: 'json', - type: 'POST', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(req), - beforeSend: function () { - this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); - }, - success: function (data) { - layer.close(this.layerIndex); - if (data.status >= 300) { - layer.msg(data.statusInfo.message,{ - icon:0, - time:1000 - },function () { - return false - });//失败的表情 - - } else { - obj.del(); - layer.msg("删除成功", { - icon: 6,//成功的表情 - time: 500 //1秒关闭（如果不配置，默认是3秒） - }); + $.ajax({ + url: '/split/realDeleteSplit', + dataType: 'json', + type: 'POST', + contentType: "application/json;charset=utf-8", + data: JSON.stringify(req), + beforeSend: function () { + this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); + }, + success: function (data) { + layer.close(this.layerIndex); + if (data.status >= 300) { + layer.msg(data.statusInfo.message, { + icon: 0, + time: 1000 + }, function () { + return false + });//失败的表情 + + } else { + obj.del(); + layer.msg("删除成功", { + icon: 6,//成功的表情 + time: 500 //1秒关闭（如果不配置，默认是3秒） + }); + } } - } - }) - }, function () { - // 执行重加载 - table.reloadData('currentTableId', { - url: '/split/split_out', - page: { - curr: 1 - } - },'data'); - }); + }) + }, function () { + // 执行重加载 + table.reloadData('currentTableId', { + url: '/split/split_out', + page: { + curr: 1 + } + }, 'data'); + }); } }); //监听状态操作 form.on('switch(changeState)', function (obj) { let display = $("#display").css("display"); - if(display !== "none"){ + if (display !== "none") { var req = new Map; req["id"] = this.value; if (obj.elem.checked) { @@ -427,8 +438,7 @@ } } }) - } - else{ + } else { $.ajax({ url: "/split/findAllSplitInfoForbidden", type: 'post', @@ -437,7 +447,7 @@ data: JSON.stringify(req), success: function (data) { data = data.data; - if(data){ + if (data) { $.ajax({ url: "/split/split_edit", type: 'post', @@ -462,7 +472,7 @@ } } }) - }else{ + } else { layer.confirm('该拆单正在使用中，是否禁用？', { btn: ['继续', '取消'] //按钮 }, function () { @@ -497,7 +507,7 @@ page: { curr: 1 } - },'data'); + }, 'data'); }); } } @@ -508,8 +518,6 @@ } - - });