From 5e216900edf45ea2b9c4c105430dcae0369ff288 Mon Sep 17 00:00:00 2001 From: lilili Date: Wed, 7 Jun 2023 18:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/PickMaterial/ICSMOPickMerge.cshtml | 110 ++++++++++-------- 1 file changed, 61 insertions(+), 49 deletions(-) diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml index 0dd7b5f..a9ce28a 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml @@ -16,14 +16,20 @@ gridList(); gridList2(flag); - $("#selShow").change(function () { + //$("#selShow").change(function () { - debugger; - SetCols(); - gridList(); - }); + // debugger; + // SetCols(); + // gridList(); + //}); }); + function Seach() { + document.getElementById("gridPanel").innerHTML = ' 详细信息
';//重置grid + SetCols(); + gridList(); + + } //function gridList() { // document.getElementById("gridPanel").innerHTML = ' 详细信息
';//重置grid // var Type = $("#selShow").val(); @@ -110,10 +116,10 @@ cols.push(collast); var collast = { label: '操作日期', name: 'MTIME', width: 150, align: 'left' }; cols.push(collast); - var collast = { label: '维护人', name: 'MUSER', width: 80, align: 'left' }; - cols.push(collast); - var collast = { label: '维护人名称', name: 'MUSERName', width: 80, align: 'left' }; - cols.push(collast); + //var collast = { label: '维护人', name: 'MUSER', width: 80, align: 'left' }; + //cols.push(collast); + //var collast = { label: '维护人名称', name: 'MUSERName', width: 80, align: 'left' }; + //cols.push(collast); var collast = { label: '是否合并拣料', name: 'IsNew', width: 80, align: 'left' }; cols.push(collast); var cols1 = new Array(); @@ -173,12 +179,12 @@ cols.push(collast); var collast = { label: '物料描述（父项生产订单主物料）', name: 'OrderInvDescribe', width: 150, align: 'left' }; cols.push(collast); - var collast = { label: '调度工号', name: 'DispatchNumber', width: 120, align: 'left', }; - cols.push(collast); - var collast = { label: '调度姓名', name: 'DispatcherName', width: 120, align: 'left' }; - cols.push(collast); - var collast = { label: '收料人工号', name: 'ReceiverNumber', width: 150, align: 'left' }; + //var collast = { label: '调度工号', name: 'DispatchNumber', width: 120, align: 'left', }; + //cols.push(collast); + var collast = { label: '调度人姓名', name: 'DispatcherName', width: 120, align: 'left' }; cols.push(collast); + //var collast = { label: '收料人工号', name: 'ReceiverNumber', width: 150, align: 'left' }; + //cols.push(collast); var collast = { label: '收料人姓名', name: 'ReceiverName', width: 150, align: 'left' }; cols.push(collast); var collast = { label: '紧急程度', name: 'Urgency', width: 120, align: 'left', }; @@ -246,7 +252,7 @@ } function gridList() { - document.getElementById("gridPanel").innerHTML = ' 详细信息
';//重置grid + var Type = $("#selShow").val(); var $gridList = $("#gridList"); @@ -297,6 +303,38 @@ } }); + //$("#warehouse a.btn-default").click(function () { + // $("#warehouse a.btn-default").removeClass("active"); + // $(this).addClass("active"); + // $("#btn_search").unbind("click"); // 取消之前的绑定 + // $('#btn_search').trigger("click"); + //}); + //$("#btn_search").click(function () { + // debugger; + // var warehouse = $("#warehouse a.active").attr('data-value'); + // var Types = $("#selShow").val(); + // var queryJson = { + // POCode: $("#txt_POCode").val(), + // InvCode: $("#txt_InvCode").val(), + // Area: $("#txt_Area").val(), + // WHCode: $("#txt_WHCode").val(), + // CusCode: $("#txt_CusCode").val(), + // CusName: $("#txt_CusName").val(), + // AreaType: $("#selShow1").val(), + // Status: $("#selShow2").val(), + // Order: $("#txt_Order").val(), + // Container: $("#txt_Container :checked").val(), + // CreateDate: $("#txt_CreateDate").val(), + // NeedDate: $("#txt_NeedDate").val() + // } + // $gridList.jqGrid('setGridParam', { + // postData: { queryJson: JSON.stringify(queryJson), Type: Types }, + // }).trigger('reloadGrid'); + // /* sleep(5000);*/ + //}); + + + function bindSubGrid(subgrid_id, rowid) { var Type = $("#selShow").val(); @@ -486,33 +524,7 @@ }); } - $("#warehouse a.btn-default").click(function () { - $("#warehouse a.btn-default").removeClass("active"); - $(this).addClass("active"); - $('#btn_search').trigger("click"); - }); - $("#btn_search").click(function () { - debugger; - var warehouse = $("#warehouse a.active").attr('data-value'); - var Types = $("#selShow").val(); - var queryJson = { - POCode: $("#txt_POCode").val(), - InvCode: $("#txt_InvCode").val(), - Area: $("#txt_Area").val(), - WHCode: $("#txt_WHCode").val(), - CusCode: $("#txt_CusCode").val(), - CusName: $("#txt_CusName").val(), - AreaType: $("#selShow1").val(), - Status: $("#selShow2").val(), - Order: $("#txt_Order").val(), - Container: $("#txt_Container :checked").val(), - CreateDate: $("#txt_CreateDate").val(), - NeedDate: $("#txt_NeedDate").val() - } - $gridList.jqGrid('setGridParam', { - postData: { queryJson: JSON.stringify(queryJson) ,Type:Types}, - }).trigger('reloadGrid'); - }); + } @@ -564,11 +576,11 @@ }); - $("#warehouse a.btn-default").click(function () { - $("#warehouse a.btn-default").removeClass("active"); - $(this).addClass("active"); - $('#btn_search').trigger("click"); - }); + //$("#warehouse a.btn-default").click(function () { + // $("#warehouse a.btn-default").removeClass("active"); + // $(this).addClass("active"); + // $('#btn_search').trigger("click"); + //}); //$("#btn_search").click(function () { // var warehouse = $("#warehouse a.active").attr('data-value'); // var queryJson = { @@ -815,7 +827,7 @@
- @**@ @@ -923,7 +935,7 @@ - +