From 8c6799d4e3e60bef161c9e68fb052f349ec39745 Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期三, 03 十一月 2021 17:28:45 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI --- WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 1008 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html | 10 WebTM/layuiadmin/Scripts/webConfig.js | 4 WebTM/views/index.html | 2 WebTM/WebTM.csproj | 1 5 files changed, 1,017 insertions(+), 8 deletions(-) diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index efa3755..7ccd06f 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -761,6 +761,7 @@ <Content Include="views\璐ㄩ噺绠$悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" /> <Content Include="views\璐ㄩ噺绠$悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" /> <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" /> + <Content Include="views\璐ㄩ噺绠$悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBillList.html" /> <Content Include="views\璐ㄩ噺绠$悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" /> <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBill.html" /> <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillList.html" /> diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index f6d4f0e..802a542 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -2,11 +2,11 @@ function GetWEBURL() { //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒 //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴 - //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 + var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆 - var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃� + //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃� //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣� //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃� diff --git a/WebTM/views/index.html b/WebTM/views/index.html index 9173efb..498ad67 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -421,7 +421,7 @@ <dd> <a>鐗╂祦妫�楠�</a> <dl class="layui-nav-child"> - <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd> + <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟缁存姢</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">鐢熶骇鍏ュ簱妫�楠屽崟null</a></dd> <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">鐢熶骇鍏ュ簱妫�楠屽崟缁存姢</a></dd> diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" new file mode 100644 index 0000000..e55bed4 --- /dev/null +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" @@ -0,0 +1,1008 @@ +锘�<!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"> + <style type="text/css"> + .layui-form-item .layui-inline { + margin-right: 0; + } + + html { + background-color: white; + color: white; + } + + .layui-table-cell { + overflow: visible !important; + } + + td .layui-form-select { + margin-top: -10px; + margin-left: -15px; + margin-right: -15px; + } + </style> +</head> +<body> + <div class="layui-fluid" style="padding: 0;"> + <div class="layui-card" style="padding: 15px;"> + <div class="layui-card-body" style="padding: 1px;"> + <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-tab" lay-filter="tab-POStockInBill"> + <h1 style="text-align: center; padding: 10px 0;"><b>鏉ユ枡妫�楠屽崟</b></h1> + <ul class="layui-tab-title" lay-filter="tab-all"> + <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li> + <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li> + </ul> + <div class="layui-tab-content"> + <!--鍩烘湰淇℃伅--> + <div class="layui-tab-item layui-show"> + <div class="layui-form-item" style="padding-top: 10px;"> + <div class="layui-row"> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">鍗曟嵁鍙�</label> + <div class="layui-input-inline"> + <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly> + <input type="hidden" name="HInterID" id="HInterID" value="0"> + <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID"> + </div> + </div> + <div class="layui-col-xs4 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 class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">渚涘簲鍟�</label> + <div class="layui-input-inline"> + <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> + </button> + </div> + </div> + + </div> + <div class="layui-row"> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">浜у搧鍐呯爜</label> + <div class="layui-input-inline"> + <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> + </button> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">鍏ュ簱鏁伴噺</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HInStockQty" id="HInStockQty" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">鍚堟牸鏁伴噺</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HRightQty" id="HRightQty" autocomplete="off"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">妫�楠屽憳</label> + <div class="layui-input-inline"> + <input type="text" name="HFirstCheckEmpName" id="HFirstCheckEmpName" class="layui-input" value="" style="float:left;width:150px;"> + <input type="hidden" name="HFirstCheckEmpID" id="HFirstCheckEmpID" class="layui-input" value="" style="float:left;width:150px;"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> + </button> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">鎶芥鏁伴噺</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HCheckQty" id="HCheckQty" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">涓嶅悎鏍兼暟閲�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HBadQty" id="HBadQty" autocomplete="off"> + </div> + </div> + </div> + + <div class="layui-row"> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">閽㈡潗鐐夊彿</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HSteelStoveNo" id="HSteelStoveNo" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">澶栬</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HAspect" id="HAspect" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">灏哄</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HSize" id="HSize" autocomplete="off"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">閽㈠巶鎶ュ憡涓婁紶</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HSteelCompReport" id="HSteelCompReport" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs4 layui-inline"> + <label class="layui-form-label">鍒ゅ畾缁撹</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HCheckerResult" id="HCheckerResult" autocomplete="off"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-col-xs7 layui-inline"> + <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 class="layui-tab-item"> + <div class="layui-form-item"> + <div class="layui-row"> + <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="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly> + </div> + </div> + </div> + <div class="layui-row"> + <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="HUpDater" id="HUpDater" 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="HDeleteMan " id="HDeleteMan " 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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly> + </div> + </div> + + + </div> + + <div class="layui-row"> + <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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly> + </div> + </div> + <div class="layui-row"> + <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + + <table class="layui-hide" 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-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> + <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 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> + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'laydate', 'table', 'element'], function () { + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , laydate = layui.laydate + , element = layui.element; + + var params = get_UrlVars(); + if (typeof (params[params[0]]) == "undefined") { + var OperationType = 1;//鎿嶄綔绫诲瀷 + var closeType = 2; //鍏抽棴绫诲瀷 + } else { + var OperationType = params[params[0]];//鎿嶄綔绫诲瀷 + var linterid = params[params[1]];//婧愬崟id + var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷 + var closeType = params[params[3]]; //鍏抽棴绫诲瀷 + } + var hID = params[params[1]];//缂栬緫鏌ョ湅 + //甯歌鐢ㄦ硶 + laydate.render({ + elem: '#HDate' + + }); + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + //if (sessionStorage.login != "login") { + // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + // }, function () { window.location.href = "../../user/login.html"; }); + //} + var tableReload = table.reload; + var option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , height: 500 + , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲� + //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛 + , page: true //寮�鍚垎椤� + , cols: [[ //琛ㄥご + { type: 'checkbox', fixed: 'left' } + , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 } + , { field: 'HQCCheckClassID', title: 'HQCCheckClassID', edit: 'text', width: 100, hide: true } + , { field: 'HQCCheckClassNumber', title: '妫�楠岄」鐩被鍒�', edit: 'text', event: "HQCCheckClassCheck", width: 100 } + , { field: 'HQCCheckClassName', title: '妫�楠岄」鐩被鍒悕绉�', edit: 'text', width: 100, hide: true } + , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', edit: 'text', hide: true } + , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩�', edit: 'text', event: "HQCCheckItemCheck", width: 100 } + , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 100, hide: true } + , { field: 'HQCRelValue', title: '妫�楠屾暟鎹�', edit: 'text' } + , { field: 'HResult', title: '鍒ゅ畾', edit: 'text', event: "" } + , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "" } + , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', edit: 'text', width: 100, hide: true } + , { field: 'HProcCheckEmpName', title: '妫�娴嬪憳', edit: 'text', event: 'HProcCheckEmpCheck', width: 150 } + , { field: 'HProcCheckEmpNumber', title: '妫�娴嬪憳浠g爜', edit: 'text', width: 100, hide: true } + , { field: 'HProcCheckTime', title: '妫�娴嬫棩鏈�', event: "", edit: 'text' } + , { field: 'HRemark', title: '澶囨敞', edit: 'text' } + , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 } + ]] + }; + //鍒ゆ柇鏄惁鏂板 + if (OperationType == 1) { + $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); + $("#HMaker").val(sessionStorage["HUserName"]); + //$("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HChecker").val(sessionStorage["HUserName"]); + //$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HUpDater").val(sessionStorage["HUserName"]); + //$("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HCloseMan").val(sessionStorage["HUserName"]); + //$("#HDeleteMan").val(sessionStorage["HUserName"]); + //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " } + option.data = [{ + "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ", + "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": " ", "HResult": " " + , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": " ", "HRemark": " " + }]; + table.render(option); + } + else { + $("#HInterID").val(hID);//淇敼鏃朵富琛↖D + //缂栬緫鍔犺浇鏁版嵁 + $.ajax({ + url: GetWEBURL() + '/QC_POStockInCheckBill/QC_POStockInCheckBillListProjectDetai', + type: "GET", + data: { "sqlWhere": "and HInterID=" + hID }, + success: function (result) { + //console.log(result); + //console.log('gouba' + result); + if (result.count == 1) { + option.data = result.data; + table.render(option); + + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index0); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //澶村伐鍏锋爮浜嬩欢 + var rowid = 0; + var rows = 0; + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data;; + var AddRow = table.cache['mainTable']; + var NewRow = { + "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ", + "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": " ", "HResult": " " + , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": " ", "HRemark": " " }; + switch (obj.event) { + case 'btn-AddLine': + //table.cache["mainTable"].push(AddRow[rows]); + table.cache["mainTable"].push(NewRow); + option.data = table.cache["mainTable"]; + table.render(option); + + rows++; + //layer.msg('澧炲姞涓�琛屾寜閽紒') + break; + case 'btn-CopyLine': + var copydata = JSON.stringify(data); + if (data.length <= 0) { + layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒"); + } + else if (data.length > 1) { + layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒"); + } + 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓� + + } + break; + } + }); + //琛屽唴浜嬩欢 + table.on('tool(mainTable)', function (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(); + option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓� + table.reload(option); + layer.close(index); + } + }); + } + + $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) { + if (event.key == "F7") { + if (obj.event === 'HQCCheckClassCheck') //妯″叿淇℃伅 + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '妫�楠岄」鐩被鍒�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.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({ + HQCCheckClassID: checkStatus.data[0].HItemID, + HQCCheckClassNumber: checkStatus.data[0].浠g爜, + HQCCheckClassName: checkStatus.data[0].鍚嶇О, + + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + + if (obj.event === 'HQCCheckItemCheck') //妫�楠岄」鐩� + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '妫�楠岄」鐩�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index]; + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table'); + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + obj.update({ + HQCCheckItemName: checkStatus.data[0].鍚嶇О + , HQCCheckItemID: checkStatus.data[0].HItemID + , HQCCheckItemNumber: checkStatus.data[0].浠g爜 + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + if (obj.event === 'HProcCheckEmpCheck') //妫�娴嬪憳 + { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '妫�娴嬪憳鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html ','yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HProcCheckEmpName: checkStatus.data[0].HName + , HProcCheckEmpID: checkStatus.data[0].HItemID + , HProcCheckEmpNumber: checkStatus.data[0].HNumber + }); + + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + } + + + obj.event = ""; + return false; + + } + }) + }); + + //鐩戝惉鍗曞厓鏍肩紪杈� + table.on('edit(mainTable)', function (obj) { + // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊� + var oldText = $(this).prev().text(); + var value = obj.value //寰楀埌淇敼鍚庣殑鍊� + , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊� + , field = obj.field; //寰楀埌瀛楁 + //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value); + + switch (field) { + case "HDesignLife": //璁捐瀵垮懡 + value = isNaN(value) ? 0 : value; + var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HDesignLife: value, //璁捐瀵垮懡 + HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡 + }); + break; + case "HLeaveLife": //鍓╀綑瀵垮懡 + var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife; + var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife); + obj.update({ + HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡 + }); + break; + case "HUseLife": //浣跨敤瀵垮懡 + var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife; + value = isNaN(value) ? 0 : value; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡 + }); + break; + case "HQty": //瀹炲彂鏁伴噺 + value = isNaN(value) ? 0 : value; + var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环 + }); + break; + case "HPrice": //鍗曚环 + value = isNaN(value) ? 0 : value; + var HQty = isNaN(data.HQty) ? 0 : data.HQty; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环 + }); + break; + case "HMoney": //閲戦 + var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice; + var HQty = isNaN(data.HQty) ? 0 : data.HQty; + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + obj.update({ + HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环 + }); + break; + default: + } + }); + function RoadBillMain(hID)//鍔犺浇琛ㄥご + { + //alert(hID); + //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪 + $.ajax({ + url: GetWEBURL() + "/QC_POStockInCheckBill/QC_POStockInCheckBillListCheckDetail", + type: "GET", + data: { + "HID": hID + }, + success: function (result) { + + if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.h_v_QC_Edit_POStockInCheckBillList[0]; + console.info(data); + form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫�� + "HBillNo": data.鍗曟嵁鍙� + , "HDate": formatDate(data.鏃ユ湡) + , "HSupID": data.HSupID + , "HSupName": data.渚涘簲鍟嗗悕绉� + , "HMater": data.浜у搧鍚嶇О + , "HMaterID": data.浜у搧ID + , "HMaterNumber": data.浜у搧鍐呯爜 + , "HInStockQty": data.鍏ュ簱鏁伴噺 + , "HRightQty": data.鍚堟牸鏁伴噺 + , "HEmpName": data.妫�楠屽憳鍚嶇О + , "HFirstCheckEmp": data.妫�楠屽憳 + , "HCheckQty": data.鎶芥鏁伴噺 + , "HBadQty": data.涓嶅悎鏍兼暟閲� + , "HSteelStoveNo": data.閽㈡潗鐐夊彿 + , "HAspect": data.澶栬 + , "HSize": data.灏哄 + , "HSteelCompReport": data.閽㈠巶鎶ュ憡涓婁紶 + , "HCheckerResult": data.鍒ゅ畾缁撹 + , "HRemark": data.琛ㄥご澶囨敞 + }); + + } else { + layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); + } + }, error: function () { + layer.alert("鍙戠敓閿欒!", { icon: 5 }); + } + }); + } + + + var date = new Date(); + var day = date.getDate(); + var month = date.getMonth() + 1; + var year = date.getFullYear(); + var shijian = year + "-" + month + "-" + day; + + //鍒ゆ柇鏄惁鏂板 + if (hID == null || hID == 0) { + //鑾峰彇鏈�澶у崟鎹彿 new + $("#HInterID").val("0"); + $("#HBillNo").val(""); + $.ajax({ + url: GetWEBURL() + "/Web/GetMAXNum", + type: "GET", + data: { "HBillType": '7503' }, + success: function (d) { + //console.log(d.data); + $("#HBillNo").val(d.data[0].HBillNo); + $("#HDate").val(shijian); + $("#HInterID").val(0); + } + }); + } + else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new + RoadBillMain(hID); + /* RoadBillSub(linterid);*/ + } + + //琛ㄥご淇℃伅浠撳簱寮圭獥 + form.on('submit(HSupList)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '渚涘簲鍟嗗垪琛�', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇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) { + + } + }); + }); + + + //琛ㄥご淇℃伅浜у搧鍐呯爜 + form.on('submit(HMaterList)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '浜у搧鍐呯爜鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HMaterName").val(checkStatus.data[0].HName); + $("#HMaterID").val(checkStatus.data[0].HItemID); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //妫�楠屽憳寮圭獥 + form.on('submit(HEmpList)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '妫�楠屽憳鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HFirstCheckEmpName").val(checkStatus.data[0].HName); + $("#HFirstCheckEmpID").val(checkStatus.data[0].HItemID); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //閫�鍑� + form.on('submit(Exit)', function (data) { + if (OperationType == 1) { + Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻�� + } + else if (OperationType == 3) { + Pub_Close(closeType); + } + else { + Pub_Close(2); + } + }); + 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('-'); + } + form.on('submit(Saver)', function (data) {//淇濆瓨 + //debugger; + data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜� + var sMainStr = JSON.stringify(data.field); + var sSubStr = JSON.stringify(table.cache['mainTable']); + var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]; + if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉 + { + return false; + } + $.ajax( + { + type: "POST", + url: GetWEBURL() + "/QC_POStockInCheckBill/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + async: true, + data: { "msg": sMainSub }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () { + $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true); + var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩 + parent.layer.close(index); //鍐嶆墽琛屽叧闂� + }); + } + 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); + } + }); + }); + function f_alert(sMsg) { + layer.alert(sMsg, { icon: 5 }); + + } + //鐩戝惉鎻愪氦 + form.verify({ + numberOrEmpty: function (value, item) { + // if (value != '') { + if (!/^\d+$/.test(value)) { + return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0'; + } + //} + } + }); + + + }); + //瀹氫箟鍏ㄥ眬鍙橀噺 + var HReasonName, ReasonID, EmpName, SQProcName, + ProcID, ZRProcName, QRName + ; + function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜 + { + HReasonName = obj[0].HName; + ReasonID = obj[0].HItemID; + } + //杩斿洖鐗╂枡 + function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡 + $("#HMater").val(obj[0].HName); + $("#HMaterID").val(obj[0].HItemID); + $("#HMaterNumber").val(obj[0].HNumber); + } + //杩斿洖宸ュ簭 + function GetHProcValue(obj) { //杩斿洖宸ュ簭 + $("#HProcName").val(obj[0].宸ュ簭); + $("#HProcID").val(obj[0].HItemID); + $("#HProcNumber").val(obj[0].宸ュ簭浠g爜); + } + function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬 + $("#HDepName").val(obj[0].HName); + $("#HDeptID").val(obj[0].HItemID); + $("#HDeptNumber").val(obj[0].HNumber); + } + //杩斿洖鍗曚綅 + function GetHUnitNameValue(obj) { + $("#HUName").val(obj[0].HName); + $("#HUnitID").val(obj[0].HItemID); + $("#HUnitNumber").val(obj[0].HNumber); + } + + function GetHKeeperValue(obj) { //杩斿洖璐d换浜� + EmpName = obj[0].HName; + } + function GetHZRValue(obj) { //杩斿洖璐d换宸ュ簭 + ZRProcName = obj[0].宸ュ簭; + } + function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜� + QRName = obj[0].HName; + } + //闈炵┖楠岃瘉 + function AllowLoadData(sSubStr) { + var HStockStyle = $("#HStockStyle").val(); + 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].HWHID == "") { + // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + // return Result = false; + // } + // if (sSubStr[i].HSCWHID == "") { + // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + // return Result = false; + // } + // if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) { + // layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + // return Result = false; + // } + // if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) { + // 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; + } + + + </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/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" index 754007a..fdf13a5 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" @@ -168,8 +168,8 @@ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' } , { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115 } , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', width: 200, hide: true } - , { field: 'HProcCheckEmpNumber', title: '妫�娴嬪憳浠g爜', width: 125 } - , { field: 'HProcCheckEmpName', title: '妫�娴嬪憳', width: 125 } + , { field: '妫�娴嬪憳浠g爜', title: '妫�娴嬪憳浠g爜', width: 125 } + , { field: 'HFirstCheckEmp', title: '妫�娴嬪憳', width: 125 } , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 } , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" } , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 } @@ -191,9 +191,9 @@ function get_Display(sWhere) { var ajaxLoad = layer.load(); $.ajax({ - url: GetWEBURL() + '/QC_Management/MES_QC_POStockInCheckBillList_Json', + url: GetWEBURL() + '/QC_POStockInCheckBill/GetPOStockInCheckBill', type: "GET", - data: { "sqlWhere": sWhere }, + data: { "sWhere": sWhere }, success: function (data1) { if (data1.count == 1) { option.data = data1.data; @@ -260,7 +260,7 @@ var wait = layer.load(); //閫昏緫鍒犻櫎鏂规硶 $.ajax({ - url: GetWEBURL() + 'DeltetQC_POStockInCheck', + url: GetWEBURL() + 'QC_POStockInCheckBill/DeltetPOStockInCheckBill', type: "GET", data: { "HItemID": HItemID }, success: function (result) { -- Gitblit v1.9.1