From 81cafe1e89c45a8f68b160947dab29e9b3c45204 Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期三, 16 二月 2022 11:11:11 +0800 Subject: [PATCH] nothing --- WebTM/App_Data/MssqlReportData.cs | 9 WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.designer.cs | 2 WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html | 115 ++++++- WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 744 +++++++++++++++++++++++++++++++++++++++++++++++++ WebTM/views/index.html | 1 WebTM/WebTM.csproj | 1 6 files changed, 848 insertions(+), 24 deletions(-) diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs index d054753..82e57b0 100644 --- a/WebTM/App_Data/MssqlReportData.cs +++ b/WebTM/App_Data/MssqlReportData.cs @@ -172,6 +172,15 @@ QueryList.Add(new ReportQueryItem(ParameterQuerySQL, "Master")); GenMultiRecordset(DataPage, QueryList); } + public static void GenEntireData1(System.Web.UI.Page DataPage, System.Collections.Generic.List<ReportQueryItem> SqlList) + { + ArrayList QueryList = new ArrayList(); + for (int i = 0; i < SqlList.Count; i++) + { + QueryList.Add(new ReportQueryItem(SqlList[i].QuerySQL, SqlList[i].RecordsetName)); + } + GenMultiRecordset(DataPage, QueryList); + } public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL) { GenEntireData(DataPage, RecordsetQuerySQL, ParameterQuerySQL, ReportDataBase.DefaultDataType); diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 99cb273..df7c020 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -138,6 +138,7 @@ <Content Include="views\浠撳瓨绠$悊\鏉$爜鍑哄叆搴撹褰曡〃\Kf_ICStockBillSubList.html" /> <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryByMaterID.html" /> <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMS.html" /> + <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" /> diff --git a/WebTM/views/index.html b/WebTM/views/index.html index 5dd80b5..4f31a0c 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -231,6 +231,7 @@ <dd> <a>鏉$爜涓绘。</a> <dl class="layui-nav-child"> + <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill.html">鏉$爜鐢熸垚</a></dd> <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉$爜涓绘。缁存姢</a></dd> </dl> </dd> diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" new file mode 100644 index 0000000..2d80867 --- /dev/null +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" @@ -0,0 +1,744 @@ +锘�<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8" /> + <title>鏂板/缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <script src="../../../layuiadmin/layui/layui.js"></script> + <script src="../../../layuiadmin/Scripts/json2.js"></script> + <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> + <script src="../../../layuiadmin/Scripts/webConfig.js"></script> + <script src="../../../layuiadmin/PubCustom.js"></script> + <style type="text/css"> + + /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/ + .layui-form-item .layui-inline { + margin-top: 5px; + margin-bottom: 5px; + margin-right: 0px; + } + /*end*/ + + </style> +</head> +<body> + <div id="layout1" class="layui-fluid"> + <div class="layui-row layui-col-space15"> + <div class="layui-col-md12"> + <div class="layui-card"> + <form id="form0" class="layui-form" lay-filter="component-form-group" action=""> + <div class="layui-card-header"> + <div class="layui-btn-group"> + + <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button> + <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">鏂板</button> + <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button> + + </div> + + </div> + + <div class="layui-card-body"> + <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> + <h1 style="text-align:center;"><b>鏉$爜鐢熸垚</b></h1> + <div class="layui-tab-content"> + <div class="layui-tab-item layui-show"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">缁勭粐</label> + <div class="layui-input-inline"> + <select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px"> + <option value="1">渚涘簲鍟�</option> + <option value="2">瀹㈡埛</option> + <option value="3">杞﹂棿閮ㄩ棬</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">宸ュ巶浠g爜</label> + <div class="layui-input-inline"> + <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px"> + <option value="1">渚涘簲鍟�</option> + <option value="2">瀹㈡埛</option> + <option value="3">杞﹂棿閮ㄩ棬</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鏃ユ湡</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd"> + </div> + </div> + </div> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">婧愬崟绫诲瀷</label> + <div class="layui-input-inline"> + <select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" class="layui-input" value="" style="float:left;width:150px"> + <option value="1">渚涘簲鍟�</option> + <option value="2">瀹㈡埛</option> + <option value="3">杞﹂棿閮ㄩ棬</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label> + <div class="layui-input-inline"> + <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鏉$爜绫诲瀷</label> + <div class="layui-input-inline"> + <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px"> + <option value="1">渚涘簲鍟�</option> + <option value="2">瀹㈡埛</option> + <option value="3">杞﹂棿閮ㄩ棬</option> + </select> + </div> + </div> + </div> + + </div> + </div> + </div> + </div> + + <div class="layui-tab layui-tab-card" lay-filter="TabTest"> + <ul class="layui-tab-title"> + <li class="layui-this">鐗╂枡淇℃伅</li> + <li>鏉$爜淇℃伅</li> + </ul> + <div class="layui-tab-content"> + <div class="layui-tab-item layui-show"> + <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table> + </div> + <div class="layui-tab-item"> + <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table> + </div> + </div> + </div> + + <script type="text/html" id="toolbarDemo"> + <div class="layui-btn-container"> + + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button> + + </div> + </script> + <script type="text/html" id="xuhao"> + {{d.LAY_TABLE_INDEX+1}} + </script> + </form> + </div> + </div> + </div> + </div> + <script type="text/html" id="barDemo"> + <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>--> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> + </script> + <script> + //鑾峰彇鍙傛暟 + var params = get_UrlVars(); + if (typeof (params[params[0]]) == "undefined") { + var OperationType = 1;//鎿嶄綔绫诲瀷 + var closeType = 2; //鍏抽棴绫诲瀷 + } else { + debugger; + var OperationType = params[params[0]];//鎿嶄綔绫诲瀷 + var linterid = params[params[1]];//婧愬崟id + var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷 + var closeType = params[params[3]]; //鍏抽棴绫诲瀷 + } + + + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'laydate', 'table', 'element'], function () { + //#region 鍏叡鍙橀噺 + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , laydate = layui.laydate + , element = layui.element; + //鏌ヨ鏉′欢 + var option = []; + var option1 = []; + var sWhere = ""; + var sBillType = "3801"; + //#endregion + + + //#region 杩涘叆椤甸潰鏃㈠姞杞� + //鍒濆鍖栬〃鍗曟彃浠� + set_InitFrom(); + //鍒濆鍖栬〃鏍� + set_InitGrid(); + set_CountGrid(); + //鍒ゆ柇鎿嶄綔绫诲瀷 + if (OperationType == 1) {//鏃犳簮鏂板 + set_AddFNew(); + set_AddFNew1(); + } + else if (OperationType == 3) {//缂栬緫 + set_EditFromGrid(linterid); + } + else { + layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 }); + } + //#endregion + + //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢 + //澶村伐鍏锋爮 + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data;; + var AddRow = table.cache['mainTable']; + var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }; + console.log(NewRow); + switch (obj.event) { + //鏂板涓�琛� + case 'btn-AddLine': btnAddLine(NewRow); + break; + //澶嶅埗涓�琛� + case 'btn-CopyLine': btnCopyLine(data); + break; + } + }); + //琛屽唴浜嬩欢 + table.on('tool(mainTable)', function (obj) { + set_GridDelete(obj); //琛屽唴鍒犻櫎 + set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫� + }); + //涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂 + form.on('select(HSupTypeID)', function (data) { + $("#HSupID").val(""); + $("#HSupName").val(""); + }); + + function getSupType() { + var type = $("#HSupTypeID").val(); + console.log(type) + switch (type) { + case '1': + return "SupplierInformation"; + break; + case '2': + return "CustomerInformation"; + break; + case '3': + return "DeptInformation"; + break; + } + } + //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐� + form.on('submit(HSupList)', function () { + debugger; + if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) { + return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�'); + } + //椤甸潰灞�-鑷畾涔� + var url = '../../PublicPage/' + getSupType() + '.html'; + //alert(url); + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '寰�鏉ュ崟浣嶅垪琛�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: [url, 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HSupName").val(checkStatus.data[0].HName); + $("#HSupID").val(checkStatus.data[0].HItemID); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //#endregion + + //#region 姝ら〉闈㈡墍鏈夋柟娉� + //鍒濆鍖栬〃鍗曟彃浠� + function set_InitFrom() { + laydate.render({ + elem: '#HDate' + }); + } + //鍒濆鍖栨槑缁嗚〃鏍� + function set_InitGrid() { + columns = [ + { type: 'checkbox', fixed: 'left' } + , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 } + , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true } + , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true } + , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', event: 'HMaterCode', width: 100 } + , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', width: 100, hide: true } + , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', width: 100 } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 } + , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', edit: 'text', width: 100, hide: true } + , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HUnitCode', width: 100 } + , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', edit: 'text', width: 100 } + , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', edit: 'text', width: 100, hide: true } + , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 } + , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 } + , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 } + , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', edit: 'text', width: 100 } + , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 } + , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 } + , { field: 'HBQty', title: '绠辨暟', edit: 'text', width: 100 } + , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 } + , { field: 'HDate', title: '杩涙枡鏃ユ湡', edit: 'text', width: 100 } + , { field: 'HCusID', title: '瀹㈡埛ID', edit: 'text', width: 100, hide: true } + , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HWHCode', width: 120 } + , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', edit: 'text', width: 120 } + , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 } + , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 } + , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' } + ]; + option = { + id: 'mainTable' + , elem: '#mainTable' + , toolbar: '#toolbarDemo' + , page: false + , cellMinWidth: 120 + , height: 650 + , cols: [columns] + , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲� + , done: function (res, curr, count) { + } + }; + } + //鍒濆姹囨�讳俊鎭� + function set_CountGrid() { + //琛ㄥご + columns = [ + { type: 'checkbox', fixed: 'left' } + , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 } + , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 } + , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 } + , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true } + , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 } + , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 } + , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 } + ]; + option1 = { + id: 'mainTable1' + , elem: '#mainTable1' + , height: 500 + , page: true + , limit: 500 + , cellMinWidth: 120 + , height: 650 + , cols: [columns] + , done: function (res, curr, count) { + } + }; + } + + //鏃犳簮鍗曟柊澧� + function set_AddFNew() { + option.data = [{ "HSourceInterID": 0, "HSourceEntryID": 0,"HSourceBillNo":"", "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }]; + table.render(option); + } + function set_AddFNew1() { + option1.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }]; + table.render(option1); + } + //鏃ユ湡鏍煎紡鍖� + function formatDate(date) { + var d = new Date(date), + month = '' + (d.getMonth() + 1), + day = '' + d.getDate(), + year = d.getFullYear(); + + if (month.length < 2) month = '0' + month; + if (day.length < 2) day = '0' + day; + + return [year, month, day].join('-'); + } + //澧炲姞涓�琛� + function btnAddLine(NewRow) { + //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁 + //buttonArr = [];//娓呯┖鏁扮粍 + //for (var i = 0; i < tableBak.length; i++) { + // buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍 + //} + //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛� + //table.reload("mainTable", { + // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍� + //}) + //table.cache["mainTable"].push(AddRow[rows]); + table.cache["mainTable"].push(NewRow); + option.data = table.cache["mainTable"]; + table.render(option); + rows++; + layer.msg('澧炲姞涓�琛屾寜閽紒') + } + //澶嶅埗涓�琛� + function btnCopyLine(data) { + var copydata = JSON.stringify(data); + if (data.length <= 0) { + layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒"); + } + else if (data.length > 1) { + layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒"); + } + else { + var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'[' + var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']' + table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂 + option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓� + table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓� + } + } + // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎 + function set_GridDelete(obj) { + var data = obj.data; + var rowIndex = $(obj.tr).attr("data-index"); + if (obj.event === 'del') { + layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) { + console.log("绱㈠紩涓�:" + rowIndex); + if (rowIndex === '0') { + layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�'); + } else { + //obj.del(); + //layer.close(index); + var oldData = table.cache["mainTable"]; + oldData.splice(obj.tr.data('index'), 1); + table.reload('mainTable', { data: oldData }); + layer.close(index); + } + }); + } + } + //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫� + function set_GridCellCheck(obj) { + $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) { + if (event.key == "F7") { + //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7 + if (obj.event === 'HMaterCode') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7 + { + //椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿 + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鍣ㄥ叿鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/MouldInformation.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //console.log(obj.data); + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HMaterID: checkStatus.data[0].HItemID, + HMaterCode: checkStatus.data[0].HNumber, + HMaterName: checkStatus.data[0].HName, + HMaterSpec: checkStatus.data[0].HModel, + + HDesignLife: 0, //璁捐瀵垮懡 + HLeaveLife: 0, //鍓╀綑瀵垮懡 + HQty: 1, //瀹炴敹鏁伴噺 + HMoney: 0, //閲戦 + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + //杈呭姪灞炴�т俊鎭� + if (obj.event === 'HPropertyCode') //杈呭姪灞炴�т俊鎭� + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '杈呭姪灞炴�у垪琛�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/PropertyInformation.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HPropertyID: checkStatus.data[0].HItemID, + HPropertyCode: checkStatus.data[0].HNumber, + HPropertyName: checkStatus.data[0].HName, + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + + //璁¢噺鍗曚綅浠g爜 + if (obj.event === 'HUnitCode') //璁¢噺鍗曚綅浠g爜 + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '璁¢噺鍗曚綅鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/UnitInformation.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HUnitID: checkStatus.data[0].HItemID, + HUnitCode: checkStatus.data[0].HNumber, + HUnitName: checkStatus.data[0].HName, + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + //浠撳簱浠g爜 + if (obj.event === 'HWHCode') //浠撳簱浠g爜 + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '浠撳簱鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/WareHouseInformation.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HWHID: checkStatus.data[0].HItemID, + HWHCode: checkStatus.data[0].HNumber, + HWHName: checkStatus.data[0].HName, + HSPID: "", + HSPCode: "", + HSPName: "", + + }); + ////琛ㄥご浠撳簱涓虹┖鏃� 缁戝畾鏄庣粏琛屼粨搴撲俊鎭� + //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) { + // $("#HWHName").val(checkStatus.data[0].HName); + // $("#HWHID").val(checkStatus.data[0].HItemID); + //} + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + //浠撲綅浠g爜 + if (obj.event === 'HSPCode') //浠撲綅浠g爜 + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '浠撲綅鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/WareLocationInformation.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HSPID: checkStatus.data[0].HItemID, + HSPCode: checkStatus.data[0].HNumber, + HSPName: checkStatus.data[0].HName, + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + obj.event = ""; + return false; + } + }) + } + //? + function f_alert(sMsg) { + layer.alert(sMsg, { icon: 5 }); + + } + //闈炵┖楠岃瘉 + function AllowLoadData(sSubStr) { + var Result = true; + if ($("#HWHID").val() == '' || $("#HWHID").val() == null) { + layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) { + layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) { + layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) { + layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + + if (typeof (sSubStr) == "undefined" || sSubStr == "") { + layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") { + sSubStr = JSON.parse(sSubStr); + for (var i = 0; i < sSubStr.length; i++) { + if (sSubStr[i].HMaterID == "") { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if (sSubStr[i].HUnitID == "") { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if (sSubStr[i].HWHID == "") { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + } + } + else { + return Result = true; + } + return Result; + } + + //#endregion + + + }); + </script> +</body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs" index c488bb6..b8aa324 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs" @@ -11,7 +11,7 @@ { - public partial class xmlLBM_ICStockBill + public partial class xmlLBM_EquipFileMainBill { /// <summary> diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" index 377457a..418bbab 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" @@ -133,6 +133,8 @@ , laypage = layui.laypage , laydate = layui.laydate , util = layui.util + + //鏌ヨ鏉′欢 var sWhere = ""; var option = []; @@ -494,38 +496,23 @@ //#endregion - table.on('toolbar(LAY_TABLE_TOOL_COLS)', function (obj) { - console.log(obj); - }); - - //宸ュ叿鏍忔搷浣滀簨浠� - table.on('toolbar(mainTable)', function (e) { + table.on('toolbar(mainTable)', function (obj0) { var othis = $(this) , events = othis.attr('lay-event') , openPanel = function (sets) { var list = $(sets.list) , panel = $('<ul class="layui-table-tool-panel"></ul>'); - panel.html(list); - - }; - - switch (events) { + switch (events) { case 'LAYTABLE_COLS': //绛涢�夊垪 openPanel({ list: function () { - var lis = []; - table.eachCols(function (i, item) { - if (item.field && item.type == 'normal') { - lis.push('<li><input type="checkbox" name="' + item.field + '" data-key="' + item.key + '" data-parentkey="' + (item.parentKey || '') + '" lay-skin="primary" ' + (item.hide ? '' : 'checked') + ' title="' + (item.title || item.field) + '" lay-filter="LAY_TABLE_TOOL_COLS"></li>'); - } - }); - return lis.join(''); + }() , done: function () { form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) { - console.log(obj); + console.log("a"); var othis = $(obj.elem) , checked = this.checked , key = othis.data('key') @@ -555,10 +542,92 @@ } }); break; - } - - + }; }); + + + form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) { + console.log("a"); + var othis = $(obj.elem) + , checked = this.checked + , title = this.title + , value = this.value + , key = othis.data('key') + , parentKey = othis.data('parentkey'); + console.log(title, value, checked, key, parentKey); + + layui.each(option.cols, function (i1, item1) { + layui.each(item1, function (i2, item2) { + //console.log(item1, item2); + if (i1 + '-' + i2 === key) { + var hide = item2.hide; + //鍚屾鍕鹃�夊垪鐨� hide 鍊煎拰闅愯棌鏍峰紡 + item2.hide = !checked; + //layui.elem.find('*[data-key="' + options.index + '-' + key + '"]') + //[checked ? 'removeClass' : 'addClass'](HIDE); + + + } + + }); + }); + }); + //宸ュ叿鏍忔搷浣滀簨浠� + //table.on('click', '*[lay-event]', function (e) { + // var othis = $(this) + // , events = othis.attr('lay-event') + // , openPanel = function (sets) { + // var list = $(sets.list) + // , panel = $('<ul class="layui-table-tool-panel"></ul>'); + + // panel.html(list); + // }; + + // switch (events) { + // case 'LAYTABLE_COLS': //绛涢�夊垪 + // openPanel({ + // list: function () { + // var lis = []; + // that.eachCols(function (i, item) { + // if (item.field && item.type == 'normal') { + // lis.push('<li><input type="checkbox" name="' + item.field + '" data-key="' + item.key + '" data-parentkey="' + (item.parentKey || '') + '" lay-skin="primary" ' + (item.hide ? '' : 'checked') + ' title="' + (item.title || item.field) + '" lay-filter="LAY_TABLE_TOOL_COLS"></li>'); + // } + // }); + // return lis.join(''); + // }() + // , done: function () { + // form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) { + // var othis = $(obj.elem) + // , checked = this.checked + // , key = othis.data('key') + // , parentKey = othis.data('parentkey'); + + // layui.each(options.cols, function (i1, item1) { + // layui.each(item1, function (i2, item2) { + // if (i1 + '-' + i2 === key) { + // var hide = item2.hide; + + // //鍚屾鍕鹃�夊垪鐨� hide 鍊煎拰闅愯棌鏍峰紡 + // item2.hide = !checked; + // that.elem.find('*[data-key="' + options.index + '-' + key + '"]') + // [checked ? 'removeClass' : 'addClass'](HIDE); + + // //鏍规嵁鍒楃殑鏄剧ず闅愯棌锛屽悓姝ュ绾ц〃澶寸殑鐖剁骇鐩稿叧灞炴�у�� + // if (hide != item2.hide) { + // that.setParentCol(!checked, parentKey); + // } + + // //閲嶆柊閫傞厤灏哄 + // that.resize(); + // } + // }); + // }); + // }); + // } + // }); + // break; + // } + //}); //鐩戝惉澶村伐鍏锋爮 //table.on('toolbar(mainTable)', function (obj) { @@ -586,7 +655,7 @@ //浠ヤ笂鏄痩ayui妯″潡 }); - + </script> -- Gitblit v1.9.1