From 67227db833af538e759ed4ef71d86b91d7998af9 Mon Sep 17 00:00:00 2001 From: zgf Date: Sat, 20 Jan 2024 15:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E9=87=8F=E5=90=88?= =?UTF-8?q?=E8=AE=A1=EF=BC=9B=20=E5=87=BA=E5=BA=93=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ShipmentHeader2Controller.cs | 67 +++++++-- .../XWMS/Controllers/XWMSSHIPController.cs | 2 +- .../XWMS/Views/ReceiptDetail2/Print.cshtml | 134 +---------------- .../XWMS/Views/ReceiptHeader2/Index.cshtml | 138 +----------------- .../Views/ShipmentHeader2/CreateMove.cshtml | 37 +++-- .../Views/ShipmentHeader2/CreateOut.cshtml | 33 +++-- .../Areas/XWMS/Views/XWMSMFM/Index.cshtml | 4 +- .../Areas/XWMS/Views/XWMSPOH/Index.cshtml | 4 +- .../Areas/XWMS/Views/XWMSPTH/Index.cshtml | 4 +- .../Areas/XWMS/Views/XWMSSHIP/Index.cshtml | 9 +- .../Areas/XWMS/Views/XWMSSOH/Index.cshtml | 4 +- HHWMS.Web/appsettings.json | 2 +- 12 files changed, 112 insertions(+), 326 deletions(-) diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs index c6fc8dd..606f1a8 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs @@ -253,6 +253,14 @@ namespace HHWMS.Web.Controllers { try { + var codeList = data.AsEnumerable().Select(x => x.MaterialCode).ToHashSet(); + var matList = _unitwork.Find(x => codeList.Contains(x.Code)); + //var typeList = matList.Select(x => x.Type).ToHashSet(); + var dc1 = Wtm.CreateDC(cskey: "default"); + var statusList = dc1.Set() + .Where(x => x.DictType == "MaterialType") + .ToList(); + var shipment = new ShipmentHeader2(); shipment.WarehouseId = int.Parse(warehouseId); shipment.Code = _unitwork.GetSerialNumber("QTC"); @@ -267,16 +275,19 @@ namespace HHWMS.Web.Controllers var detailList = new List(); foreach (var item in data) { + var ma = matList.FirstOrDefault(y => y.Code == item.MaterialCode); + var st = statusList.FirstOrDefault(x => x.DictValue == ma.Type); + var detail = new ShipmentDetail2(); detail.WarehouseId = shipment.WarehouseId; detail.ShipmentId = shipment.ID; detail.ShipmentCode = shipment.Code; detail.MaterialCode = item.MaterialCode; - detail.MaterialName = item.MaterialName; - detail.Lot = item.Lot; + detail.MaterialName = HttpUtility.HtmlDecode(item.MaterialName); + detail.Lot = HttpUtility.HtmlDecode(item.Lot); detail.Qty = item.ThisQty; detail.Unit = item.Unit; - detail.InventoryStatus = item.Status; + detail.InventoryStatus = "A,Q,R".Contains(item.Status) && !string.IsNullOrEmpty(item.Status) ? item.Status : st.Remark; detail.Batch = item.Batch; detail.Status = 0; detail.CreateTime = DateTime.Now; @@ -306,10 +317,6 @@ namespace HHWMS.Web.Controllers var _unitwork = new UnitWork(Wtm); var list = _unitwork.Find(x => x.WarehouseId == int.Parse(warehouseId) - && x.MaterialCode.Contains(materialCode) - && x.MaterialName.Contains(materialName) - && x.Batch.Contains(batch) - && x.Lot.Contains(lot) ).Select(x => new { x.LocationCode, @@ -320,10 +327,33 @@ namespace HHWMS.Web.Controllers x.ContainerCode, x.SupplierName, x.Qty, - UserDef2 = x.Status ?? "", + UserDef2 = "", ThisQty = x.Qty, - UserDef3 = "" + UserDef3 = "", + Status = "A,Q,R".Contains(x.Status) ? x.Status : "", + x.Unit }).ToList(); + if (!string.IsNullOrEmpty(materialCode)) + { + list = list.Where(x => x.MaterialCode.Contains(materialCode)) + .ToList(); + } + if (!string.IsNullOrEmpty(materialName)) + { + list = list.Where(x => x.MaterialName.Contains(HttpUtility.HtmlDecode(materialName))) + .ToList(); + } + if (!string.IsNullOrEmpty(batch)) + { + list = list.Where(x => x.Batch.Contains(batch)) + .ToList(); + } + if (!string.IsNullOrEmpty(lot)) + { + list = list.Where(x => x.Lot.Contains(HttpUtility.HtmlDecode(lot))) + .ToList(); + } + return JsonMore(list); } @@ -352,10 +382,19 @@ namespace HHWMS.Web.Controllers var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var trans = dc.BeginTransaction()) { try { + var codeList = data.AsEnumerable().Select(x => x.MaterialCode).ToHashSet(); + var matList = _unitwork.Find(x => codeList.Contains(x.Code)); + //var typeList = matList.Select(x => x.Type).ToHashSet(); + var dc1 = Wtm.CreateDC(cskey: "default"); + var statusList = dc1.Set() + .Where(x => x.DictType == "MaterialType") + .ToList(); + var shipment = new ShipmentHeader2(); shipment.WarehouseId = int.Parse(warehouseId); shipment.Code = _unitwork.GetSerialNumber("ZYC"); @@ -370,19 +409,21 @@ namespace HHWMS.Web.Controllers var detailList = new List(); foreach (var item in data) { + var ma = matList.FirstOrDefault(y => y.Code == item.MaterialCode); + var st = statusList.FirstOrDefault(x => x.DictValue == ma.Type); var detail = new ShipmentDetail2(); detail.WarehouseId = shipment.WarehouseId; detail.ShipmentId = shipment.ID; detail.ShipmentCode = shipment.Code; detail.MaterialCode = item.MaterialCode; - detail.MaterialName = item.MaterialName; - detail.Lot = item.Lot; + detail.MaterialName = HttpUtility.HtmlDecode(item.MaterialName); + detail.Lot = HttpUtility.HtmlDecode(item.Lot); detail.Qty = item.ThisQty; - detail.Unit = item.Unit; + detail.Unit = item.Unit ?? ma?.MasterUnit ?? ""; detail.UserDef3 = item.UserDef3;//地点 //detail.PurchasQty = item.THISQTYUOM; //detail.PurchasUnits = item.UOM_0; - detail.InventoryStatus = item.Status; + detail.InventoryStatus = "A,Q,R".Contains(item.Status) && !string.IsNullOrEmpty(item.Status) ? item.Status : st.Remark; detail.PurchasUnits = item.UserDef2;//状态 detail.Batch = item.Batch; detail.Status = 0; diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs index 0bc794b..42dde46 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs @@ -128,7 +128,7 @@ public class XWMSSHIPController : BaseController x.Code == item.ITMREF_0 && x.Batch == item.LOT_0 ); - if(qr == null) + if (qr == null) { tran.Rollback(); return JsonMore(null, 500, $"未查找到物料码 {item.ITMREF_0} 对应的二维码"); diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Print.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Print.cshtml index d3f07c7..1ce1dbc 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Print.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Print.cshtml @@ -132,139 +132,7 @@ } }, }); - let template = { - "panels": [{ - "index": 0, - "height": 50, - "width": 80, - "paperHeader": 43.5, - "paperFooter": 141.73228346456693, - "printElements": [{ - "options": { - "left": 3, - "top": 3, - "height": 40, - "width": 220, - "field": "lot", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 8, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 3, - "top": 3, - "height": 130, - "width": 220, - "borderWidth": "1.5", - "borderStyle": "solid" - }, - "printElementType": { - "type": "rect" - } - }, { - "options": { - "left": 3, - "top": 42, - "height": 9, - "width": 219 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 135, - "top": 42, - "height": 90, - "width": 9 - }, - "printElementType": { - "type": "vline" - } - }, { - "options": { - "left": 3, - "top": 43.5, - "height": 28.5, - "width": 132, - "field": "code", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 150, - "top": 49.5, - "height": 48, - "width": 51, - "textType": "qrcode", - "field": "qrcode", - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 3, - "top": 72, - "height": 9, - "width": 132 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 3, - "top": 72, - "height": 30, - "width": 132, - "field": "qty", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 4.5, - "top": 102, - "height": 9, - "width": 217.5 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 4.5, - "top": 102, - "height": 28.5, - "width": 132, - "field": "batch", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }], - "paperNumberLeft": 196.5, - "paperNumberTop": 118.5, - "paperNumberDisabled": true - }] - }; + let template = { "panels": [{ "index": 0, "height": 50, "width": 80, "paperHeader": 43.5, "paperFooter": 141.73228346456693, "printElements": [{ "options": { "left": 3, "top": 3, "height": 40, "width": 220, "field": "lot", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 8, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 3, "height": 130, "width": 220, "borderWidth": "1.5", "borderStyle": "solid" }, "printElementType": { "type": "rect" } }, { "options": { "left": 3, "top": 42, "height": 9, "width": 219 }, "printElementType": { "type": "hline" } }, { "options": { "left": 135, "top": 42, "height": 90, "width": 9 }, "printElementType": { "type": "vline" } }, { "options": { "left": 3, "top": 43.5, "height": 28.5, "width": 132, "field": "code", "testData": "1324123412341234123", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 138, "top": 46.5, "height": 79.5, "width": 81, "textType": "qrcode", "field": "qrcode", "testData": "1234123413234132" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 72, "height": 30, "width": 132, "field": "qty", "testData": "5555", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 72, "height": 9, "width": 132 }, "printElementType": { "type": "hline" } }, { "options": { "left": 3, "top": 102, "height": 9, "width": 132 }, "printElementType": { "type": "hline" } }, { "options": { "left": 4.5, "top": 102, "height": 28.5, "width": 132, "field": "batch", "testData": "HYB2202030003", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }], "paperNumberLeft": 196.5, "paperNumberTop": 118.5, "paperNumberDisabled": true }] }; let printData = []; diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml index 8c3cb66..1097b2b 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml @@ -28,143 +28,7 @@ ff.OpenDialog('/xwms/ReceiptDetail2/Create/' + headerId, '@Guid.NewGuid()', '添加明细', 600); } } - let template = { - "panels": [{ - "index": 0, - "height": 50, - "width": 80, - "paperHeader": 43.5, - "paperFooter": 141.73228346456693, - "printElements": [{ - "options": { - "left": 3, - "top": 3, - "height": 40, - "width": 220, - "field": "lot", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 8, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 3, - "top": 3, - "height": 130, - "width": 220, - "borderWidth": "1.5", - "borderStyle": "solid" - }, - "printElementType": { - "type": "rect" - } - }, { - "options": { - "left": 3, - "top": 42, - "height": 9, - "width": 219 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 135, - "top": 42, - "height": 90, - "width": 9 - }, - "printElementType": { - "type": "vline" - } - }, { - "options": { - "left": 3, - "top": 43.5, - "height": 28.5, - "width": 132, - "field": "code", - "testData": "1324123412341234123", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 150, - "top": 49.5, - "height": 48, - "width": 51, - "textType": "qrcode", - "field": "qrcode", - "testData": "1234123413234132" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 3, - "top": 72, - "height": 9, - "width": 132 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 3, - "top": 72, - "height": 30, - "width": 132, - "field": "qty", - "testData": "5555", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }, { - "options": { - "left": 4.5, - "top": 102, - "height": 9, - "width": 217.5 - }, - "printElementType": { - "type": "hline" - } - }, { - "options": { - "left": 4.5, - "top": 102, - "height": 28.5, - "width": 132, - "field": "batch", - "testData": "HYB2202030003", - "textAlign": "center", - "textContentVerticalAlign": "middle", - "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" - }, - "printElementType": { - "type": "text" - } - }], - "paperNumberLeft": 196.5, - "paperNumberTop": 118.5, - "paperNumberDisabled": true - }] - }; + let template = { "panels": [{ "index": 0, "height": 50, "width": 80, "paperHeader": 43.5, "paperFooter": 141.73228346456693, "printElements": [{ "options": { "left": 3, "top": 3, "height": 40, "width": 220, "field": "lot", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 8, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 3, "height": 130, "width": 220, "borderWidth": "1.5", "borderStyle": "solid" }, "printElementType": { "type": "rect" } }, { "options": { "left": 3, "top": 42, "height": 9, "width": 219 }, "printElementType": { "type": "hline" } }, { "options": { "left": 135, "top": 42, "height": 90, "width": 9 }, "printElementType": { "type": "vline" } }, { "options": { "left": 3, "top": 43.5, "height": 28.5, "width": 132, "field": "code", "testData": "1324123412341234123", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 138, "top": 46.5, "height": 79.5, "width": 81, "textType": "qrcode", "field": "qrcode", "testData": "1234123413234132" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 72, "height": 30, "width": 132, "field": "qty", "testData": "5555", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }, { "options": { "left": 3, "top": 72, "height": 9, "width": 132 }, "printElementType": { "type": "hline" } }, { "options": { "left": 3, "top": 102, "height": 9, "width": 132 }, "printElementType": { "type": "hline" } }, { "options": { "left": 4.5, "top": 102, "height": 28.5, "width": 132, "field": "batch", "testData": "HYB2202030003", "textAlign": "center", "textContentVerticalAlign": "middle", "fontFamily": "Microsoft YaHei", "fontSize": 12, "fontWeight": "bold" }, "printElementType": { "type": "text" } }], "paperNumberLeft": 196.5, "paperNumberTop": 118.5, "paperNumberDisabled": true }] }; let printData = []; diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml index 01f34fa..c4dd922 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml @@ -53,7 +53,7 @@ - + @@ -99,18 +100,20 @@ - + - - + + - + + +
{{scope.row.ThisQty}}
- +
@@ -168,8 +171,8 @@ label: 'HYB' }], address2List: [{ - value: 'HYB', - label: 'HYB' + value: '', + label: '=请选择=' }], options: [{ value: '', @@ -194,13 +197,13 @@ }], wareList: [{ value: '', - label: '=请选择=' + label: '=请选择移入仓库=' }], loading: false, tableData: [], currentPage: 1, // 当前页码 total: 20, // 总条数 - pageSize: 20, // 每页的数据条数 + pageSize: 50, // 每页的数据条数 // 需要编辑的属性 editProp: ['ThisQty', 'UserDef2', 'UserDef3'], multipleSelection: [] @@ -216,8 +219,8 @@ data: {}, url: "/xwms/ShipmentHeader2/SearchWare", success: function (json) { - app.wareList.push(...json.Data) - console.log(app.wareList); + app.wareList.push(...json.Data); + app.address2List = app.wareList; }, error: function (json) { alert("加载失败"); @@ -263,6 +266,10 @@ this.currentPage = val; }, handleSelectionChange(val) { + var _this = this; + val.forEach(function (item) { + item.UserDef3 = _this.form.address2; + }); this.multipleSelection = val; }, search() { @@ -313,7 +320,7 @@ _this.$refs.tableData.clearSelection(); } else { - layer.alert("创建失败!!", { icon: 5, shadeClose: true, title: "错误信息" }); + layer.alert("创建失败!!"+json.Msg, { icon: 5, shadeClose: true, title: "错误信息" }); } }, error: function (json) { diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml index 2fdb647..46fd2b0 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml @@ -74,10 +74,11 @@ @@ -90,12 +91,14 @@ - + - - + + - + + +
{{scope.row.ThisQty}}
@@ -120,7 +123,7 @@ @@size-change="handleSizeChange" @@current-change="handleCurrentChange" :current-page="currentPage" - :page-sizes="[1,5,10,20]" + :page-sizes="[20,50,100,1000]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length"> @@ -185,7 +188,7 @@ tableData: [], currentPage: 1, // 当前页码 total: 20, // 总条数 - pageSize: 20, // 每页的数据条数 + pageSize: 50, // 每页的数据条数 // 需要编辑的属性 editProp: ['ThisQty', 'UserDef1'], multipleSelection: [] @@ -231,13 +234,13 @@ cell.querySelector('.item__input').style.display = 'none' cell.querySelector('.item__txt').style.display = 'block' } - if (property == "ThisQty") { - // 库存单位除以系数 - if (row.ThisQty > row.QTY) { - row.ThisQty = row.QTY; - layer.alert("不能超出库存数量!!", { icon: 5, shadeClose: true, title: "错误信息" }); - } - } + // if (property == "ThisQty") { + // // 库存单位除以系数 + // if (row.ThisQty > row.QTY) { + // row.ThisQty = row.QTY; + // layer.alert("不能超出库存数量!!", { icon: 5, shadeClose: true, title: "错误信息" }); + // } + // } }, //每页条数改变时触发 选择一页显示多少行 handleSizeChange(val) { @@ -302,7 +305,7 @@ _this.$refs.tableData.clearSelection(); } else { - layer.alert("创建失败!!", { icon: 5, shadeClose: true, title: "错误信息" }); + layer.alert("创建失败!!" + json.Msg, { icon: 5, shadeClose: true, title: "错误信息" }); } }, error: function (json) { diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml index 749dc46..85fc035 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml @@ -105,7 +105,7 @@ @@size-change="handleSizeChange" @@current-change="handleCurrentChange" :current-page="currentPage" - :page-sizes="[1,5,10,20]" + :page-sizes="[1,5,10,20,50,100,1000]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length"> @@ -209,7 +209,7 @@ this.multipleSelection = val; }, handleClickTableRow(row) { - this.$refs.tableData.toggleRowSelection(row) + this.$refs.tableData.toggleRowSelection(row, true) }, search() { var _this = this; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml index 4f564ce..20409fa 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml @@ -264,7 +264,7 @@ @@size-change="handleSizeChange" @@current-change="handleCurrentChange" :current-page="currentPage" - :page-sizes="[1,5,10,20]" + :page-sizes="[1,5,10,20,50,100,1000]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length"> @@ -369,7 +369,7 @@ this.multipleSelection = val; }, handleClickTableRow(row) { - this.$refs.tableData.toggleRowSelection(row) + this.$refs.tableData.toggleRowSelection(row, true) }, search() { var _this = this; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml index 3581d21..25a37e2 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml @@ -102,7 +102,7 @@ @@size-change="handleSizeChange" @@current-change="handleCurrentChange" :current-page="currentPage" - :page-sizes="[1,5,10,20]" + :page-sizes="[1,5,10,20,50,100,1000]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length"> @@ -197,7 +197,7 @@ this.multipleSelection = val; }, handleClickTableRow(row) { - this.$refs.tableData.toggleRowSelection(row) + this.$refs.tableData.toggleRowSelection(row, true) }, search() { var _this = this; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml index afdcdfd..fdd073b 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml @@ -52,11 +52,14 @@ - @@ -200,7 +203,7 @@ this.multipleSelection = val; }, handleClickTableRow(row) { - this.$refs.tableData.toggleRowSelection(row) + this.$refs.tableData.toggleRowSelection(row, true) }, search() { var _this = this; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml index e23adcd..08ce745 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml @@ -90,7 +90,7 @@ @@size-change="handleSizeChange" @@current-change="handleCurrentChange" :current-page="currentPage" - :page-sizes="[1,5,10,20]" + :page-sizes="[1,5,10,20,50,100,1000]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.length"> @@ -180,7 +180,7 @@ this.multipleSelection = val; }, handleClickTableRow(row) { - this.$refs.tableData.toggleRowSelection(row) + this.$refs.tableData.toggleRowSelection(row,true) }, search() { var _this = this; diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index cdb0c8c..5c77b4a 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -30,7 +30,7 @@ }, { "Key": "hangyong", - "Value": "Server=172.16.12.212;Port=3306;Database=hangyongwms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=127.0.0.1;Port=3306;Database=hangtongwms2;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", "DBType": "mysql" }