From cc712b4a7960109b7442c5b7be410bcb953a1c4c Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期二, 16 七月 2024 16:46:17 +0800 Subject: [PATCH] 1 --- WebTM/views/基础资料/公用基础资料/Gy_RestDay.html | 730 +++++++++++++++++++++++ WebTM/WebTM.csproj.user | 7 WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 140 ++-- WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_RestDay.html | 419 +++++++++++++ WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 67 + WebTM/views/基础资料/公用基础资料/SumAdd_Gy_RestDay.html | 466 +++++++++++++++ WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 7 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 2 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 6 WebTM/WebTM.csproj | 3 10 files changed, 1,763 insertions(+), 84 deletions(-) diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index ba19b17..879eb76 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -339,10 +339,13 @@ <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" /> + <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" /> + <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_RestDay.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" /> + <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_RestDay.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Excel.html" /> <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_UnitConvertRateList.html" /> diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user index 98df84b..e39639b 100644 --- a/WebTM/WebTM.csproj.user +++ b/WebTM/WebTM.csproj.user @@ -1,7 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> @@ -16,8 +16,9 @@ <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> - <StartPageUrl>views/user/login.html</StartPageUrl> - <StartAction>SpecificPage</StartAction> + <StartPageUrl> + </StartPageUrl> + <StartAction>CurrentPage</StartAction> <AspNetDebugging>True</AspNetDebugging> <SilverlightDebugging>False</SilverlightDebugging> <NativeDebugging>False</NativeDebugging> 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/Add_Edit_Gy_RestDay.html" "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/Add_Edit_Gy_RestDay.html" new file mode 100644 index 0000000..2f7c969 --- /dev/null +++ "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/Add_Edit_Gy_RestDay.html" @@ -0,0 +1,419 @@ +锘�<!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"> +</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="form" class="layui-form" lay-filter="component-form-group" action=""> + <div class="layui-card-header"> + <div class="layui-btn-group"> + + <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> + + </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" style="width: 120px">浠g爜锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off"> + <input name="HItemID" id="HItemID" autocomplete="off" type="hidden"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HName" id="HName" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off"> + </div> + </div> + </div> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">杞﹂棿</label> + <div class="layui-input-inline"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptID" id="HDeptID" value="0"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HDept-BT" 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" style="width: 120px">浼戞伅鏃ユ湡锛�</label> + <div class="layui-input-inline"> + <input type="date" class="layui-input" lay-verify="HRestDay" name="HRestDay" id="HRestDay"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">鐢熶骇缁勭粐锛�</label> + <div class="layui-input-inline"> + <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label> + <div class="layui-input-inline"> + <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID"> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label> + <div class="layui-input-inline"> + <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag"> + <option value="鏈娴�" selected>鏈娴�</option> + <option value="鏈娇鐢�">鏈娇鐢�</option> + <option value="宸蹭娇鐢�">宸蹭娇鐢�</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label> + <div class="layui-input-inline"> + <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value=""> + </div> + </div> + </div> + <div class="layui-form-item"> + <div class="layui-col-xs11"> + <label class="layui-form-label"> 澶囨敞锛�</label> + <div class="layui-input-block"> + <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off"> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + </form> + </div> + </div> + </div> + </div> + + <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> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script> + //鑾峰彇鍙傛暟 + var params = get_UrlVars(); + if (typeof (params[params[0]]) == "undefined") { + var OperationType = 1;//鎿嶄綔绫诲瀷 + } else { + var OperationType = params[params[0]];//鎿嶄綔绫诲瀷 + var linterid = params[params[1]];//婧愬崟id + var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷 + } + HRestDay + 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; + //#endregion + //#region 杩涘叆椤甸潰鍗冲姞杞� + var HOrgIDBar = ""; + var HOrgIDBar1 = ""; + + //鍒ゆ柇鎿嶄綔绫诲瀷 + if (OperationType == 1) {//鏃犳簮鍗� + //鍒濆鍖栫晫闈� + set_ClearBill(); + set_AddFNew(); + //鍒濆鍖栨棩鏈� + $("#HRestDay").val(Format(new Date(), "yyyy-MM-dd")); + + } + else if (OperationType == 3) {//缂栬緫 + set_EditFromGrid(); + + } + else { + layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 }); + } + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + //淇濆瓨 + form.on('submit(Saver)', function (data) {//淇濆瓨 + var isWeekendCheck = isWeekend(data.field.HRestDay); + if (isWeekendCheck == true) { + var isEndCheck = document.getElementById("HStopflag").checked; + isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓� + var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"]; + $.ajax( + { + type: "POST", + url: GetWEBURL() + "SaveGy_RestDayList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + async: true, + data: { "msg": sMainStr }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + layer.msg(data.Message, { icon: 1 }); + $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true); + } + else { + f_alert(data.Message); + console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable)); + } + layer.closeAll("loading"); + }, + error: function (err) { + + f_alert("閿欒:" + err); + console.log("Reason" + sMainStr); + } + }); + } else { + f_alert("浼戞伅鏃ユ湡涓嶆槸鏄熸湡鍏垨鏄熸湡鏃�,璇烽噸鐜伴�夋嫨!"); + } + + }); + //閫�鍑� + form.on('submit(Exit)', function (data) {// + if (linterid == undefined) { + //鍏抽棴椤电 + Pub_Close(2); + } + else { + //鍏抽棴椤电 + Pub_Close(1); + } + }); + + //鐩戝惉鎻愪氦 + form.verify({ + numberOrEmpty: function (value, item) { + // if (value != '') { + if (!/^\d+$/.test(value)) { + return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0'; + } + //} + } + }); + //#endregion + + + //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶 + + //鍒濆鍖栫晫闈� + function set_ClearBill() { + Organ(); + Organ1(); + } + //鏃犳簮鍗曟柊澧� + function set_AddFNew() { + $("#HItemID").val("0"); + $("#HNumber").val(""); + var HName = sessionStorage["HUserName"] + set_HDeptOrgId(HName); + } + //缂栬緫 + function set_EditFromGrid() { + $("#HItemID").val(linterid); + set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご + //鍒濆鍖栫晫闈� + set_ClearBill(); + } + //缂栬緫鍔犺浇琛ㄥご + function set_EditForm(linterid) { + //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪 + $.ajax({ + url: GetWEBURL() + "GetGy_RestDayDetailEdit", + type: "GET", + async: false, + data: { + "HID": linterid + }, + success: function (result) { + if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.h_v_Gy_RestDay[0]; + $("#HItemID").val(data.HItemID);//浠g爜ID + $("#HNumber").val(data.浼戞伅鏃ヤ唬鐮�);//浠g爜 + $("#HName").val(data.浼戞伅鏃ュ悕绉�);//鍚嶇О + $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮� + $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐 + $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵�� + $("#HDeptID").val(data.HDeptID);//浠g爜ID + $("#HDeptName").val(data.杞﹂棿鍚嶇О);//浠g爜 + $("#HRestDay").val(formatDate(data.浼戞伅鏃ユ湡));//浠g爜 + $("#HOrgID").val(data.鐢熶骇缁勭粐);//浣跨敤缁勭粐 + $("#HRemark").val(data.澶囨敞);//澶囨敞 + $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑 + layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽 + //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌� + HOrgIDBar = data.HUSEORGID; + HOrgIDBar1 = data.HOrgID; + } else { + layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); + } + }, error: function () { + layer.alert("鍙戠敓閿欒!", { icon: 5 }); + } + }); + } + + //鏍规嵁褰撳墠浜鸿幏鍙栭儴闂�,缁勭粐 + function set_HDeptOrgId(HName) { + $.ajax({ + url: GetWEBURL() + "GetGy_RestDayDetail", + type: "GET", + data: { + "HName": HName + }, + success: function (result) { + if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.Gy_Czygl[0]; + $("#HDeptID").val(data.HDeptID);//浠g爜ID + $("#HDeptName").val(data.閮ㄩ棬鍚嶇О);//浠g爜 + $("#HNumber").val(generateString(data.閮ㄩ棬缂栫爜, data.缁勭粐缂栫爜));//浠g爜 + $("#HName").val(generateString1(data.閮ㄩ棬鍚嶇О, data.缁勭粐鍚嶇О));//鍚嶇О + + } else { + layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); + } + }, error: function () { + layer.alert("鍙戠敓閿欒!", { icon: 5 }); + } + }); + } + //鑷姩鐢熸垚浠g爜 + function generateString(HDeptNumber, HOrgNumber) { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 鑾峰彇鏈堜唤鏃堕渶鍔�1锛屼笖琛ラ綈涓や綅鏁� + var day = currentDate.getDate().toString().padStart(2, '0'); // 鑾峰彇鏃ユ湡锛屼笖琛ラ綈涓や綅鏁� + // 鎷兼帴瀛楃涓� + var result = HDeptNumber + '-' + HOrgNumber + '-' + year + month + day; + return result; + } + //鑷姩鐢熸垚鍚嶇О + function generateString1(HDeptName, HOrgName) { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 鑾峰彇鏈堜唤鏃堕渶鍔�1锛屼笖琛ラ綈涓や綅鏁� + var day = currentDate.getDate().toString().padStart(2, '0'); // 鑾峰彇鏃ユ湡锛屼笖琛ラ綈涓や綅鏁� + // 鎷兼帴瀛楃涓� + var result = HDeptName + '-' + HOrgName + '-' + year + month + day; + return result; + } + //鍒ゆ柇鏄惁鏄懆鍏懆鏃� + function isWeekend(dateString) { + var date = new Date(dateString); + var dayOfWeek = date.getDay(); + return (dayOfWeek === 0 || dayOfWeek === 6); + } + //杩斿洖椤甸潰鎻愮ず淇℃伅 + function f_alert(sMsg) { + layer.alert(sMsg, { icon: 5 }); + + } + //#region 鏃堕棿杞崲 + 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 Organ() { + var Organization = ''; + $.ajax({ + type: "get", + async: false, + url: GetWEBURL() + "/Web/GetOrganizations", + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data; + for (var i = 0; i < data.length; i++) { + Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>'; + } + $("#HUSEORGID").append(Organization); + if (OperationType == 1 || OperationType == 4) { + HOrgIDBar = sessionStorage["OrganizationID"]; + } + $("#HUSEORGID").val(HOrgIDBar); + form.render('select'); + } + layer.closeAll("loading"); + } + }) + } + function Organ1() { + var Organization1 = ''; + $.ajax({ + type: "get", + async: false, + url: GetWEBURL() + "/Web/GetOrganizations", + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data; + for (var i = 0; i < data.length; i++) { + Organization1 += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>'; + } + $("#HOrgID").append(Organization1); + if (OperationType == 1 || OperationType == 4) { + HOrgIDBar1 = sessionStorage["OrganizationID"]; + } + $("#HOrgID").val(HOrgIDBar1); + form.render('select'); + } + layer.closeAll("loading"); + } + }) + } + //#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/Gy_RestDay.html" "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/Gy_RestDay.html" new file mode 100644 index 0000000..01c49c8 --- /dev/null +++ "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/Gy_RestDay.html" @@ -0,0 +1,730 @@ +锘�<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1"> + <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/HideButton.js"></script> + <script src="../../../layuiadmin/PubCustom.js"></script> + +</head> +<body> + <div class="layui-fluid"> + <div class="layui-col-md12"> + <div class="layui-card" style="padding: 1px"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-collapse"> + <div class="layui-colla-item"> + <div class="layui-colla-title layui-inline"> + <div class="layui-inline"> + <span>鏇村</span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浼戞伅鏃ヤ唬鐮�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HNumber" id="HNumber"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浼戞伅鏃ュ悕绉�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HName" id="HName"> + </div> + </div> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;"> + <div class="layui-row" style="margin-top:5px"> + <div class="layui-inline"> + <label class="layui-form-label">杩囨护</label> + <div class="layui-input-block"> + <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;"> + </select> + </div> + </div> + <div class="layui-inline"> + <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> + <option value="0" selected="selected"></option> + <option value="=">=</option> + <option value=">=">>=</option> + <option value=">">></option> + <option value="<="><=</option> + <option value="<"><</option> + <option value="<>"><></option> + <option value="7">鍖呭惈</option> + <option value="8">宸﹀寘鍚�</option> + <option value="9">鍙冲寘鍚�</option> + <option value="10">涓嶅寘鍚�</option> + </select> + </div> + <div class="layui-inline"> + <input type="text" class="layui-input" value="" name="ColContent" id="ColContent"> + </div> + </div> + </div> + </div> + </div> + <table class="" id="mainTable" lay-filter="mainTable"></table> + <script type="text/html" id="toolbarDemo"> + <div class="layui-btn-container"> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-SumAdd" id="SumAddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> + </div> + </script> + + </form> + </div> + </div> + </div> + </div> + <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> + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index', //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + //#region 鍏叡鍙橀噺 + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element + , laypage = layui.laypage + , laydate = layui.laydate + //鏌ヨ鏉′欢 + var sWhere = ""; + var option = []; + var HModName = "Gy_RestDay"; + //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� + var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HDeptID", "HOrgID","HUSEORGID"]; + + + var ins; //鐢ㄤ簬瀵煎嚭excel + //#endregion + + //#region 杩涘叆椤甸潰鏃㈠姞杞� + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + //澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch (obj.event) { + //鏂板 + case 'btn-Add': set_AddNew(); + break; + //鎵归噺鏂板 + case 'btn-SumAdd': set_SumAddNew(); + break; + //缂栬緫 + case 'btn-Edit': set_ShowBill(); + break; + //鍒犻櫎 + case 'btn-Delete': set_DeleteBill(); + break; + //鍒锋柊 + case 'get_Refresh': get_Refresh(); + break; + //閫�鍑烘寜閽� + case 'get_Exit': Pub_Close(2); + break; + //瀹℃牳鎸夐挳 + case 'btn-Audit': + set_CheckBill(0); + break; + //鍙嶅鏍告寜閽� + case 'btn-DeAudit': + set_CheckBill(1); + break; + //绂佺敤鎸夐挳 + case 'btn-Stop': + set_De_Stop(0); + break; + //鍙嶇鐢ㄦ寜閽� + case 'btn-DeStop': + set_De_Stop(1); + break; + //瀵煎嚭excel + case 'get_export': + get_Export(); + break; + //鍒楄缃� + case 'set_HideColumn': get_HideColumn(); + break; + case 'set_HideButton': + var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞� + var HBillType = "Gy_RestDay"; + get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]); + break; + }; + }); + //鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery( ); + }); + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + set_ClearQuery(); + }); + //#endregion + + //#region 鐐瑰嚮琛岄�変腑楂樹寒 + table.on('row(mainTable)', function (obj) { + //閫変腑琛屾敼鍙橀鑹� + var flag = !obj.tr.find(':checkbox:first').prop('checked'); + obj.tr.find(':checkbox').prop('checked', flag); + if (flag) { + obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡 + $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹� + } else { + obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡 + $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊 + } + //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊 + layui.each(table.cache.mainTable, function (i, l) { + if (obj.tr.index() == l.LAY_TABLE_INDEX) { + l.LAY_CHECKED = flag; + } + }); + }) + //#endregion + + //#region 鍙屽嚮杩斿洖鏁版嵁 + table.on('rowDouble(mainTable)', function (obj) { + var data = []; + data.push(obj.data); + parent.Gy_RestDayValue(data); + var index = parent.layer.getFrameIndex(window.name); + btnrowDouble(obj); + }); + + function btnrowDouble(obj) { + var index = parent.layer.getFrameIndex(window.name); + var data = obj.data; + //杩斿洖鏂规硶 + parent.Gy_RestDayValue(data); + parent.layer.close(index); + } + //#endregion + + //#region 姝ら〉闈㈡墍鏈夋柟娉� + // 鍒濆鍖栫晫闈� + function set_ClearBill() { + //鍒濆鍖栬〃鏍� + set_InitGrid(); + get_FastQuery(); + + } + //鍒濆鍖栬〃鏍� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 'full-50' + , page: true + , limits: [50, 500, 5000, 50000] + , limit: 50 + , cellMinWidth: 90 + + }; + } + //鏌ヨ + function get_Display(sWhere) { + var index = layer.load(0, { shade: false }); + var ajaxLoad = layer.load(); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + + url: GetWEBURL() + '/Gy_BadReason/Gy_RestDayList', + type: "GET", + async:false, + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + var data = []; + var col = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) { + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); + } + //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋 + col.push({ type: 'checkbox', fixed: 'left' }); + for (var i = 0; i < data.length; i++) { + // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { + if ($.inArray(data[i].name, titleData) > -1) { + col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + else { + switch (data[i].Type) { + //int + case 'DateTime': + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); + break; + default: + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + } + } + } + + //鍔ㄦ�佹樉绀哄垪鍚� + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , cols: [col] + , data: data1.data + , height: 'full-80' + , page: true + , limits: [50, 500, 5000, 50000] + , limit: 50 + , cellMinWidth: 90 + } + ins = table.render(option); + //鍒锋柊鎸夐挳鏄剧ず + var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞� + var HBillType = "Gy_RestDay"; + Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]); + + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + + layer.close(ajaxLoad); + if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + ColFilter(); + } + + //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + layer.close(index); + } + //蹇�熸煡璇� + function get_FastQuery( ) { + var HNumber = $("#HNumber").val(); + var HName = $("#HName").val(); + var ColName = $("#ColName").val();//澶嶉�夋 + var Comparator = $("#Comparator").val() + var ColContent = $("#ColContent").val(); + + if (ColName != 0 && Comparator != 0) { + var com = ""; + switch (Comparator) { + case "7": + com = "like'%" + ColContent + "%'"; + break; + case "8": + com = "like'%" + ColContent + "'"; + break; + case "9": + com = "like'" + ColContent + "%'"; + break; + case "10": + com = "not like'%" + ColContent + "%'"; + break; + default: + com = "" + Comparator + "'" + ColContent + "'"; + break; + } + sWhere += " and " + ColName + " " + com; + } + if (HNumber) { + sWhere += " and 浼戞伅鏃ヤ唬鐮� like '%" + HNumber + "%'"; + } + if (HName) { + sWhere += " and 浼戞伅鏃ュ悕绉� like '%" + HName + "%'"; + } + get_Display(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + //閲嶇疆蹇�熸煡璇� + function set_ClearQuery() { + $("#HNumber").val(""); + $("#HName").val(""); + $("#btnSearch").click(); + $("#ColContent").val(""); + $("#ColName").val("0"); + $("#Comparator").val("0"); + form.render('select'); + + sWhere = ""; + } + //鍒锋柊 + function get_Refresh() { + $("#btnSearch").trigger('click'); + } + + //#region 瀵煎嚭Execel + function get_Export() { + var ModRightNameCheck = "Gy_RestDay_ExportExcel"; + + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] }, + success: function (result) { + if (result.count == 1) { + table.exportFile(ins.config.id, option.data, "xls"); + } else { + layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion + + //#region 鏂板 + function set_AddNew() { + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鏂板浼戞伅鏃�', + closeBtn: 1, + shift: 2, + area: ['100%', '100%'], + maxmin: true, + content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_RestDay.html?OperationType=1&linterid=&HSouceBillType=', + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + }, + success: function (layero, index) { + + } + }); + } + //#endregion + + //#region 鎵归噺鏂板 + function set_SumAddNew() { + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鎵归噺鏂板浼戞伅鏃�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: '../鍏敤鍩虹璧勬枡/SumAdd_Gy_RestDay.html?OperationType=1&linterid=&HSouceBillType=', + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + }, + success: function (layero, index) { + + } + }); + } + //#endregion + + //#region 缂栬緫 + function set_ShowBill() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var hID = data[0].HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫浼戞伅鏃�' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_RestDay.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒'); + } + } + //#endregion + + //#region 鍒犻櫎 + function set_DeleteBill() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var HItemID = data[0].HItemID.toString(); + //閫昏緫鍒犻櫎鏂规硶 + layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) { + $.ajax({ + type: "GET", + url: GetWEBURL() + "DeltetGy_RestDay", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]}, + success: function (result) { + if (result.count == 1) { + layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { + // 寰楀埌frame绱㈠紩 + var index = layer.getFrameIndex(window.name); + //鍏抽棴褰撳墠frame + layer.close(index); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + window.location.reload(); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + }) + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); + } + } + //#endregion + + //#region 鍙嶅鏍�/瀹℃牳鏁版嵁 + function set_CheckBill(num) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var InterID = data[0].HItemID.toString(); + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Gy_BadReason/AuditGy_RestDay", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }, + success: function (result) { + if (result.count == 1) { + layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { + // 寰楀埌frame绱㈠紩 + var index = layer.getFrameIndex(window.name); + //鍏抽棴褰撳墠frame + layer.close(index); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + $("#btnSearch").trigger('click'); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒'); + } + } + //#endregion + + //#region 鍙嶇鐢�/绂佺敤鏁版嵁 + function set_De_Stop(num) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + if (checkStatus.data.length === 1) { + var InterID = data[0].HItemID.toString(); + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Gy_BadReason/StopGy_RestDay", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }, + success: function (result) { + if (result.count == 1) { + layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { + // 寰楀埌frame绱㈠紩 + var index = layer.getFrameIndex(window.name); + //鍏抽棴褰撳墠frame + layer.close(index); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + $("#btnSearch").trigger('click'); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒'); + } + } + //#endregion + + + //#region 闅愯棌鍒楄缃� + function get_HideColumn() { + var colName = ""; + var contentUrl = ""; + for (var i = 1; i < option.cols[0].length; i++) { + colName += option.cols[0][i]["title"] + ","; + } + var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞 + var urlLen = urlStr.split('/'); + for (var i = 0; i < urlLen.length - 4; i++) { + contentUrl += "../"; + } + colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜 + + contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName; + + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "闅愯棌鍒楄缃�" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["50%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: [contentUrl, "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹� + layer.close(index);//鍏抽棴寮圭獥 + } + }) + } + //#endregion + + //#region 鏄剧ず鍒楁暟鎹� + function DisPlay_HideColumn() { + $.ajax({ + url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', + type: "GET", + async: false, + data: { "HModName": HModName, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.data.length != 0) { + + var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁 + + dataCol = data1.data[0].HGridString.split(','); + + for (var i = 0; i < option.cols[0].length - 1; i++) { + var dataCols = dataCol[i].split('|'); + //闅愯棌鍒� + if (dataCols[1] == 1) { + option.cols[0][i + 1]["hide"] = true; + } + //璁剧疆鍒楀 + if (dataCols[3] > 0) { + option.cols[0][i + 1]["width"] = dataCols[3]; + } + //璁剧疆鍐呭瀛椾綋澶у皬 + if (data1.data[0].HFontSize != 0) { + option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;"; + } else { + option.cols[0][i + 1]["style"] = "font-size:100%"; + } + + //鏄剧ず鍒� + if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) { + option.cols[0][i + 1]["hide"] = false; + } + //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�) + switch (dataCols[2]) { + case "L": + option.cols[0][i + 1]["align"] = "left"; + break; + case "M": + option.cols[0][i + 1]["align"] = "center"; + break; + case "R": + option.cols[0][i + 1]["align"] = "right"; + break; + } + } + + //鍙栨秷鍐荤粨鍒� + for (var i = 1; i < option.cols[0].length - 1; i++) { + if (option.cols[0][i]["fixed"] != null) { + option.cols[0][i]["fixed"] = null; + } + else { + break; + } + } + //鍐荤粨鍒� + if (data1.data[0].HFixCols != 0) { + for (var i = 0; i < data1.data[0].HFixCols; i++) { + if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) { + data1.data[0].HFixCols += 1; + } + option.cols[0][i + 1]["fixed"] = "left"; + } + } + table.render(option); + } else { + table.render(option); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }) + } + //#endregion + + //#region 鍒楁槑鏄剧ず涓嬫媺妗� + function ColFilter() { + var Organization = '<option value="0" selected="selected" ></option>'; + for (var i = 1; i < option.cols[0].length; i++) { + if (option.cols[0][i].hide != true) { + Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>'; + } + } + $("#ColName").empty(); + $("#ColName").append(Organization); + form.render('select'); + } + //#endregion + + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + }); + </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/SumAdd_Gy_RestDay.html" "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/SumAdd_Gy_RestDay.html" new file mode 100644 index 0000000..d054996 --- /dev/null +++ "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/SumAdd_Gy_RestDay.html" @@ -0,0 +1,466 @@ +锘�<!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"> +</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="form" class="layui-form" lay-filter="component-form-group" action=""> + <div class="layui-card-header"> + <div class="layui-btn-group"> + + <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> + + </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-form-item"> + <div class="layui-inline" style="display:none"> + <label class="layui-form-label" style="width: 120px">浠g爜锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off"> + <input name="HItemID" id="HItemID" autocomplete="off" type="hidden"> + </div> + </div> + <div class="layui-inline" style="display:none"> + <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HName" id="HName" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="display:none"> + <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off"> + </div> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">骞村害:</label> + <div class="layui-input-inline"> + <select name="HYear" id="HYear" lay-filter="HYear" style="width:190px;"> + <option style="color:blue;" selected="selected" value="2024">2024</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">杞﹂棿</label> + <div class="layui-input-inline"> + <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HDeptNumber" id="HDeptNumber" value=""> + <input type="hidden" name="HDeptID" id="HDeptID" value="0"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HDept-BT" 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" style="width: 120px"> 鏄熸湡鍏�:</label> + <div class="layui-input-inline"> + <input type="checkbox" name="Saturday" id="Saturday" lay-skin="primary" title="" value=""> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px"> 鏄熸湡澶�:</label> + <div class="layui-input-inline"> + <input type="checkbox" name="Sunday" id="Sunday" lay-skin="primary" title="" value=""> + </div> + </div> + + </div> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">鐢熶骇缁勭粐锛�</label> + <div class="layui-input-inline"> + <input type="hidden" name="HOrgNumber" id="HOrgNumber" value=""> + <input type="hidden" name="HOrgName" id="HOrgName" value=""> + <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label> + <div class="layui-input-inline"> + <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID"> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label> + <div class="layui-input-inline"> + <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag"> + <option value="鏈娴�" selected>鏈娴�</option> + <option value="鏈娇鐢�">鏈娇鐢�</option> + <option value="宸蹭娇鐢�">宸蹭娇鐢�</option> + </select> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label> + <div class="layui-input-inline"> + <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value=""> + </div> + </div> + </div> + <div class="layui-form-item"> + <div class="layui-col-xs11"> + <label class="layui-form-label"> 澶囨敞锛�</label> + <div class="layui-input-block"> + <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off"> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + </form> + </div> + </div> + </div> + </div> + + <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> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script> + //鑾峰彇鍙傛暟 + var params = get_UrlVars(); + if (typeof (params[params[0]]) == "undefined") { + var OperationType = 1;//鎿嶄綔绫诲瀷 + } else { + var OperationType = params[params[0]];//鎿嶄綔绫诲瀷 + var linterid = params[params[1]];//婧愬崟id + var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷 + } + + 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; + //#endregion + //#region 杩涘叆椤甸潰鍗冲姞杞� + var HOrgIDBar = ""; + var HOrgIDBar1 = ""; + + //鍒ゆ柇鎿嶄綔绫诲瀷 + if (OperationType == 1) {//鏃犳簮鍗� + //鍒濆鍖栫晫闈� + set_ClearBill(); + set_AddFNew(); + //鍒濆鍖栨棩鏈� + Init_selectYearAndMonth(); + + } + else if (OperationType == 3) {//缂栬緫 + set_EditFromGrid(); + + } + else { + layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 }); + } + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + //淇濆瓨 + form.on('submit(Saver)', function (data) {//淇濆瓨 + var isEndCheck = document.getElementById("HStopflag").checked; + var Saturday = document.getElementById("Saturday").checked; + var Sunday = document.getElementById("Sunday").checked; + isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓� + Saturday == true ? data.field.Saturday = 'true' : data.field.Saturday = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓� + Sunday == true ? data.field.Sunday = 'true' : data.field.Sunday = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓� + var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"]; + $.ajax( + { + type: "POST", + url: GetWEBURL() + "SaveSumGy_RestDayList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + async: true, + data: { "msg": sMainStr }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + layer.msg(data.Message, { icon: 1 }); + $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true); + } + else { + f_alert(data.Message); + console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable)); + } + layer.closeAll("loading"); + }, + error: function (err) { + + f_alert("閿欒:" + err); + console.log("Reason" + sMainStr); + } + }); + + }); + //閫�鍑� + form.on('submit(Exit)', function (data) {// + if (linterid == undefined) { + //鍏抽棴椤电 + Pub_Close(2); + } + else { + //鍏抽棴椤电 + Pub_Close(1); + } + }); + + //鐩戝惉鎻愪氦 + form.verify({ + numberOrEmpty: function (value, item) { + // if (value != '') { + if (!/^\d+$/.test(value)) { + return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0'; + } + //} + } + }); + //#endregion + + + //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶 + + //鍒濆鍖栫晫闈� + function set_ClearBill() { + Organ(); + Organ1(); + } + //鏃犳簮鍗曟柊澧� + function set_AddFNew() { + $("#HItemID").val("0"); + $("#HNumber").val(""); + var HName = sessionStorage["HUserName"] + set_HDeptOrgId(HName); + } + //缂栬緫 + function set_EditFromGrid() { + $("#HItemID").val(linterid); + set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご + //鍒濆鍖栫晫闈� + set_ClearBill(); + } + //缂栬緫鍔犺浇琛ㄥご + function set_EditForm(linterid) { + //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪 + $.ajax({ + url: GetWEBURL() + "GetGy_RestDayDetailEdit", + type: "GET", + async: false, + data: { + "HID": linterid + }, + success: function (result) { + if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.h_v_Gy_RestDay[0]; + $("#HItemID").val(data.HItemID);//浠g爜ID + $("#HNumber").val(data.浼戞伅鏃ヤ唬鐮�);//浠g爜 + $("#HName").val(data.浼戞伅鏃ュ悕绉�);//鍚嶇О + $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮� + $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐 + $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵�� + $("#HDeptID").val(data.HDeptID);//浠g爜ID + $("#HDeptName").val(data.杞﹂棿鍚嶇О);//浠g爜 + $("#HRestDay").val(formatDate(data.浼戞伅鏃ユ湡));//浠g爜 + $("#HOrgID").val(data.鐢熶骇缁勭粐);//浣跨敤缁勭粐 + $("#HRemark").val(data.澶囨敞);//澶囨敞 + $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑 + layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽 + //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌� + HOrgIDBar = data.HUSEORGID; + HOrgIDBar1 = data.HOrgID; + } else { + layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); + } + }, error: function () { + layer.alert("鍙戠敓閿欒!", { icon: 5 }); + } + }); + } + + //鏍规嵁褰撳墠浜鸿幏鍙栭儴闂�,缁勭粐 + function set_HDeptOrgId(HName) { + $.ajax({ + url: GetWEBURL() + "GetGy_RestDayDetail", + type: "GET", + data: { + "HName": HName + }, + success: function (result) { + if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.Gy_Czygl[0]; + $("#HDeptID").val(data.HDeptID);//浠g爜ID + $("#HDeptNumber").val(data.閮ㄩ棬缂栫爜);//浠g爜ID + $("#HDeptName").val(data.閮ㄩ棬鍚嶇О);//浠g爜 + $("#HOrgNumber").val(data.缁勭粐缂栫爜);//浠g爜 + $("#HOrgName").val(data.缁勭粐鍚嶇О);//浠g爜 + $("#HNumber").val(generateString(data.閮ㄩ棬缂栫爜, data.缁勭粐缂栫爜));//浠g爜 + $("#HName").val(generateString1(data.閮ㄩ棬鍚嶇О, data.缁勭粐鍚嶇О));//鍚嶇О + + } else { + layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); + } + }, error: function () { + layer.alert("鍙戠敓閿欒!", { icon: 5 }); + } + }); + } + //鑷姩鐢熸垚浠g爜 + function generateString(HDeptNumber, HOrgNumber) { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 鑾峰彇鏈堜唤鏃堕渶鍔�1锛屼笖琛ラ綈涓や綅鏁� + var day = currentDate.getDate().toString().padStart(2, '0'); // 鑾峰彇鏃ユ湡锛屼笖琛ラ綈涓や綅鏁� + // 鎷兼帴瀛楃涓� + var result = HDeptNumber + '-' + HOrgNumber + '-' + year + month + day; + return result; + } + //鑷姩鐢熸垚鍚嶇О + function generateString1(HDeptName, HOrgName) { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 鑾峰彇鏈堜唤鏃堕渶鍔�1锛屼笖琛ラ綈涓や綅鏁� + var day = currentDate.getDate().toString().padStart(2, '0'); // 鑾峰彇鏃ユ湡锛屼笖琛ラ綈涓や綅鏁� + // 鎷兼帴瀛楃涓� + var result = HDeptName + '-' + HOrgName + '-' + year + month + day; + return result; + } + //涓嬫媺鍒楄〃鍒濆鍖� + function Init_selectYearAndMonth() { + // 椤甸潰鍒濆闇�瑕佺殑鍛ㄥ拰鏈堢殑鏁版嵁 + const date = new Date(); + + //鍒濆鍖栧勾涓嬫媺鍒楄〃 + var Year = date.getFullYear(); + var YearList = []; + var YearSelect = ""; + for (var i = Year - 5; i < Year + 5; i++) { + YearList.push(i); + } + for (var i = 0; i < YearList.length; i++) { + YearSelect += '<option style="color:blue;" value="' + YearList[i] + '">' + YearList[i] + '</option>'; + } + $("#HYear").empty(); + $("#HYear").append(YearSelect); + $("#HYear").val(Year); + form.render('select'); + + //鍒濆鍖栨湀涓嬫媺鍒楄〃 + var Month = date.getMonth() + 1; + var MonthSelect = ""; + + for (var i = 0; i < 12; i++) { + MonthSelect += '<option style="color:blue;" value="' + (i + 1) + '">' + (i + 1) + '</option>'; + } + $("#HMonth").empty(); + $("#HMonth").append(MonthSelect); + $("#HMonth").val(Month); + form.render('select'); + } + + //杩斿洖椤甸潰鎻愮ず淇℃伅 + function f_alert(sMsg) { + layer.alert(sMsg, { icon: 5 }); + + } + //#region 鏃堕棿杞崲 + 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 Organ() { + var Organization = ''; + $.ajax({ + type: "get", + async: false, + url: GetWEBURL() + "/Web/GetOrganizations", + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data; + for (var i = 0; i < data.length; i++) { + Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>'; + } + $("#HUSEORGID").append(Organization); + if (OperationType == 1 || OperationType == 4) { + HOrgIDBar = sessionStorage["OrganizationID"]; + } + $("#HUSEORGID").val(HOrgIDBar); + form.render('select'); + } + layer.closeAll("loading"); + } + }) + } + function Organ1() { + var Organization1 = ''; + $.ajax({ + type: "get", + async: false, + url: GetWEBURL() + "/Web/GetOrganizations", + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data; + for (var i = 0; i < data.length; i++) { + Organization1 += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>'; + } + $("#HOrgID").append(Organization1); + if (OperationType == 1 || OperationType == 4) { + HOrgIDBar1 = sessionStorage["OrganizationID"]; + } + $("#HOrgID").val(HOrgIDBar1); + form.render('select'); + } + layer.closeAll("loading"); + } + }) + } + //#endregion + }); + + </script> +</body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" index ce876cc..8f66079 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" @@ -97,8 +97,8 @@ <label class="layui-form-label" style="width: 85px;">涓婇檺</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly> - <input type="hidden" class="layui-input" name="HControlUpperLimit" id="HControlUpperLimit" > - <input type="hidden" class="layui-input" name="HControlLowerLimit" id="HControlLowerLimit" > + <input type="hidden" class="layui-input" name="HControlUpperLimit" id="HControlUpperLimit"> + <input type="hidden" class="layui-input" name="HControlLowerLimit" id="HControlLowerLimit"> </div> </div> </div> @@ -132,31 +132,56 @@ </div> </div> </div> - <div class="layui-row" style="margin: 10px 0 10px;display:none;"> + <div class="layui-row" style="margin-top:5px;"> <div class="layui-inline"> - <label class="layui-form-label">杩囨护</label> - <div class="layui-input-block"> - <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;"> - </select> + <label class="layui-form-label" style="width: 85px;">Std.Dev</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" id="HStdDev" name="HStdDev" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-inline"> - <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> - <option value="0" selected="selected"></option> - <option value="=">=</option> - <option value=">=">>=</option> - <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> - <option value="7">鍖呭惈</option> - <option value="8">宸﹀寘鍚�</option> - <option value="9">鍙冲寘鍚�</option> - <option value="10">涓嶅寘鍚�</option> - </select> + <label class="layui-form-label" style="width: 85px;">Sigma</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" id="HSigma" name="HSigma" style="background-color:#efefef4d;" readonly> + </div> </div> <div class="layui-inline"> - <input type="text" class="layui-input" value="" name="ColContent" id="ColContent"> + <label class="layui-form-label" style="width: 85px;">锛帮及锛�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HPPK" id="HPPK" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">锛帮及</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HPP" id="HPP" style="background-color:#efefef4d;" readonly> + </div> + </div> + </div> + <div class="layui-row" style="margin-top:5px;"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">C a</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" id="HCA" name="HCA" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">C P K</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" id="HCPK" name="HCPK" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">C P</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HCP" id="HCP" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">Grade</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HGrade" id="HGrade" style="background-color:#efefef4d;" readonly> + </div> </div> </div> </div> @@ -379,9 +404,21 @@ if (limit > data1.data.length - 3) { layer.msg("鍙栨牱鏁伴噺瓒呰繃瀹為檯鏁伴噺!", { icon: 5 }); } else { + var data = [];//鍒楀瓧娈垫暟鎹� + var col = []; + var totalArray = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍 + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁 + } + for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁 + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 }); + } + + option.cols = [col]; option.data = data1.data; - optionAVG = data1.data[limit + 1]; - optionS = data1.data[limit + 2]; + optionAVG[0] = data1.data[limit + 1]; + optionS[0] = data1.data[limit + 2]; table.render(option); set_Line(); } @@ -409,49 +446,18 @@ let HAvg = [];//骞冲潎鍊� let HDifference = [];//宸�� - //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸� - var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂� - var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿 - var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24)); - //鑾峰彇骞� - var yyyy = new Date($("#HBeginDate").val()).getFullYear(); - //鑾峰彇鏈堜唤 - var MM = new Date($("#HBeginDate").val()).getMonth() + 1; - //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁� - var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸� - //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟 - var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁� - - var k = 0;//鏀堕泦寰幆娆℃暟 - for (var j = 0; j <= (Days - k); j++) { - /* columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 120 })*/ - if (optionAVG != [] || optionS != []) { - HAvg.push(optionAVG[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]); - HDifference.push(optionS[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]); + for (var j = 1; j < option.cols[0].length; j++) { + if (optionAVG.length != 0 || optionS.length != 0) { + HAvg.push(optionAVG[0][option.cols[0][j].field]); + HDifference.push(optionS[0][option.cols[0][j].field]); } else { HAvg.push(0); HDifference.push(0); } - - //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮� - if (MM == 12 && (HBEGINDATE + j) == 31) { - yyyy += 1; - MM = 1; - SumMonth = new Date(yyyy, MM, 0).getDate(); - HBEGINDATE = 0; - k += j; - j = 0; - } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮� - HBEGINDATE = 0; - MM += 1; - SumMonth = new Date(yyyy, MM, 0).getDate(); - k += j; - j = 0; - } } - for (let i = 0; i <= Days; i++) { - H_X.push(i + 1); + for (let i = 1; i < option.cols[0].length; i++) { + H_X.push(option.cols[0][i].field); } option_ZXT_Avg = { @@ -471,9 +477,9 @@ }, yAxis: { type: 'value', - min: parseInt($("#HTargetVal").val()) + parseInt($("#HDownLimit").val()) - 1, // 璁剧疆鏈�灏忓�� - max: parseInt($("#HTargetVal").val()) + parseInt($("#HUpLimit").val()) + 1, // 璁剧疆鏈�澶у�� - interval: 0.1, // 璁剧疆闂磋窛 + min: parseFloat($("#HDownLimit").val()) != 0 ? (parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()) * 1.3) : 0, // 璁剧疆鏈�灏忓�� + max: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()) * 1.3, // 璁剧疆鏈�澶у�� + interval: (parseFloat($("#HUpLimit").val()) - parseFloat($("#HDownLimit").val()))/10, // 璁剧疆闂磋窛 }, series: [ { @@ -498,15 +504,15 @@ markLine: { symbol: 'none',//鍘绘帀绠ご data: [ - { yAxis: $("#HUpLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } }, + { yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } }, { - yAxis: $("#HDownLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } + yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } }, { - yAxis: $("#HControlUpperLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 } + yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlUpperLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 } }, { - yAxis: $("#HControlLowerLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 } + yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlLowerLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 } } ] }, diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" index 266d808..ed5c7b2 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" @@ -587,7 +587,7 @@ var ajaxLoad = layer.load(); $.ajax({ //h_v_QC_FirstPieceCheckBill - url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList', + url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList', type: "GET", async: false, data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] }, diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" index 9b76b20..9612c77 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" @@ -587,7 +587,7 @@ option = { elem: '#mainTable' , toolbar: '#toolbarDemo' - , height: 'full-50' + , height: 700 , page: true , totalRow: true , cellMinWidth: 90 @@ -1694,7 +1694,7 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 }); break; default: - if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺') { + if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺') { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true }); } else { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); @@ -1709,7 +1709,7 @@ , toolbar: '#toolbarDemo' , cols: [col] , data: data1.data - , height: 300 + , height: 700 , page: true , totalRow: true , cellMinWidth: 90 diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" index f8bee57..2325e5c 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" @@ -2032,6 +2032,13 @@ } } + var HMouldNum = $('#HMouldNum').val(); + + if (HMouldNum == "") { + layer.msg("妯$┐鍙蜂笉鑳戒负绌猴紒"); + return; + } + //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴� diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" index f865aee..1ccd251 100644 --- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" +++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" @@ -66,6 +66,15 @@ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + + <div class="layui-inline"> + <label class="layui-form-label">鍗曟嵁鍙�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;"> + </div> + </div> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button> + <!--鏄剧ず褰撳墠杩囨护鏂规--> <div class="layui-inline" style="margin-left:5px;"> <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div> @@ -90,17 +99,17 @@ </div> </div> <!--<div class="layui-inline"> - <label class="layui-form-label">鐗╂枡浠g爜</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" id="HMaterNumber" style="width:190px;"> + <label class="layui-form-label">鐗╂枡浠g爜</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" id="HMaterNumber" style="width:190px;"> + </div> </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鐗╂枡鍚嶇О</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" id="HMaterName" style="width:190px;"> - </div> - </div>--> + <div class="layui-inline"> + <label class="layui-form-label">鐗╂枡鍚嶇О</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" id="HMaterName" style="width:190px;"> + </div> + </div>--> <div class="layui-inline"> <label class="layui-form-label">鍒跺崟浜�</label> <div class="layui-input-block"> @@ -351,6 +360,44 @@ }); //#endregion + //#region 閲嶆柊鍚屾鎸夐挳 + form.on('submit(btnResCnz)', function (data) { + set_ResCnz(); + }); + + //閲嶆柊鍚屾鎸夐挳 + function set_ResCnz() { + var HBillno2 = $('#HBillno2').val(); + if (HBillno2 == "") { + layer.msg('璇疯緭鍏ラ渶瑕佸悓姝ョ殑鍗曟嵁鍙凤紒'); + return; + } + $.ajax({ + url: GetWEBURL() + '/Kf_MateOutBillController/GetKf_MateOutBill_Sync_Json', + type: "GET", + data: { "HBillNo": HBillno2, "HBillType": 1204 }, + success: function (result) { + if (result.count == 1) { + layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { + // 寰楀埌frame绱㈠紩 + var index = layer.getFrameIndex(window.name); + //鍏抽棴褰撳墠frame + layer.close(index); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + window.location.reload(); + }); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.close(wait); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); -- Gitblit v1.9.1