From bb6448cbfc31b59e32173046304613bcd62150f8 Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期二, 13 四月 2021 17:44:39 +0800 Subject: [PATCH] 不良评审单列表展示和添加模板 --- /dev/null | 10 WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBillList.html | 322 ++++++++++++++++++ WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 13 WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html | 614 ++++++++++++++++++++++++++++++++++++ WebTM/views/index.html | 1 WebTM/WebTM.csproj | 2 6 files changed, 941 insertions(+), 21 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user index 0fffdc2..cc33fb1 100644 --- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user +++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user @@ -17,10 +17,10 @@ <publishTime>03/23/2021 16:57:43</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>04/12/2021 19:50:15</publishTime> + <publishTime>04/13/2021 15:07:44</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>04/12/2021 19:50:15</publishTime> + <publishTime>04/13/2021 15:07:44</publishTime> </File> <File Include="layuiadmin/config.js"> <publishTime>03/23/2021 16:57:43</publishTime> @@ -947,7 +947,7 @@ <publishTime>03/23/2021 16:57:43</publishTime> </File> <File Include="views/index.html"> - <publishTime>04/12/2021 19:49:48</publishTime> + <publishTime>04/13/2021 15:45:25</publishTime> </File> <File Include="views/senior/echarts/bar.html"> <publishTime>03/23/2021 16:57:43</publishTime> @@ -1171,11 +1171,14 @@ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html"> <publishTime>04/08/2021 10:57:44</publishTime> </File> + <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html"> + <publishTime>04/13/2021 17:39:51</publishTime> + </File> <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBill.html"> <publishTime>04/12/2021 19:50:54</publishTime> </File> <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html"> - <publishTime>04/12/2021 19:50:51</publishTime> + <publishTime>04/13/2021 15:29:46</publishTime> </File> <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ崟/WW_EntrustWorkOrderBillMainList.html"> <publishTime>03/29/2021 19:54:43</publishTime> @@ -1190,7 +1193,7 @@ <publishTime>04/09/2021 17:56:11</publishTime> </File> <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html"> - <publishTime>04/09/2021 21:10:28</publishTime> + <publishTime>04/13/2021 17:38:51</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html"> <publishTime>03/23/2021 16:57:43</publishTime> diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index ec7fb39..37ea3f9 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -454,7 +454,7 @@ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsMaintainBillList.html" /> <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsDotCheckPlanBillList.html" /> <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsRepairWorkBillList.html" /> - <Content Include="views\鐢熶骇宸ュ簭绠$悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdCheckBill.html" /> + <Content Include="views\鐢熶骇宸ュ簭绠$悊\澧炲姞涓嶈壇璇勫鍗昞QC_Add_NoPassProdCheckBill.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdCheckBillList.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\濮斿宸ュ崟\WW_EntrustWorkOrderBillMainList.html" /> <Content Include="views\鐢熶骇宸ュ簭绠$悊\濮斿宸ュ簭姹囨姤鍗昞Sc_StationOutBillMainList.html" /> diff --git a/WebTM/views/index.html b/WebTM/views/index.html index c0f5f90..105846e 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -147,6 +147,7 @@ <a>澧炲姞涓嶈壇璇勫鍗�</a> <dl class="layui-nav-child"> <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">涓嶈壇璇勫鍗曞垪琛�</a></dd> + <dd><a href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html" target="main_self_frame">鏂板涓嶈壇璇勫鍗�</a></dd> </dl> </dd> diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" new file mode 100644 index 0000000..321c8ac --- /dev/null +++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" @@ -0,0 +1,614 @@ +锘�<!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="form0" class="layui-form" action=""> + <div class="layui-card-header"> + <div class="layui-btn-group"> + + <button type="button" 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="Cancel">閫�鍑�</button> + + </div> + + </div> + <div class="layui-card-body"> + <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> + <!--<ul class="layui-tab-title"> + <li class="layui-this">鍩烘湰淇℃伅</li>--> + <!--<li>鍏朵粬淇℃伅</li>--> + <!--</ul>--> + <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-row"> + <div class="layui-col-xs2"> + <label class="layui-form-label">鍗� 鎹� 鍙凤細</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off"> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label">璁㈠崟璺熻釜鍙凤細</label> + <div class="layui-input-inline"> + <input class="layui-input" name="" id="" autocomplete="off" disabled> + <input id="" name="" type="hidden" /> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label">浜у搧锛�</label> + <div class="layui-input-inline"> + <input type="text" name="" id="" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input"> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label">浜у搧浠g爜锛�</label> + <div class="layui-input-inline"> + <input type="text" name="" id="" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input"> + </div> + </div> + </div> + <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>--> + </div> + <div class="layui-form-item"> + <div class="layui-row"> + <div class="layui-col-xs2"> + <label class="layui-form-label">娴佽浆鍗″彿锛�</label> + <div class="layui-input-inline"> + <input type="text" name="" id="" lay-verify="" autocomplete="off" class="layui-input"> + + <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + <input id="" name="" type="hidden" /> + + </div> + </div> + + <div class="layui-col-xs2"> + <label class="layui-form-label"> 宸ヤ綔涓績锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="" lay-verify="" id="" readonly="readonly" autocomplete="off"> + <input id="" name="" type="hidden" /> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label> + <div class="layui-input-inline"> + <input class="layui-input" name="" lay-verify="" id="" readonly="readonly" autocomplete="off"> + + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="" lay-verify="" id="" readonly="readonly" autocomplete="off"> + <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button>--> + </div> + </div> + <div class="layui-col-xs2"> + <label class="layui-form-label"> 涓嶈壇鏁伴噺锛�</label> + <div class="layui-input-inline"> + <input class="layui-input" name="" lay-verify="" id="" autocomplete="off"> + + </div> + </div> + + </div> + </div> + + + <div class="layui-form-item"> + <div class="layui-row"> + + <div class="layui-colorpicker-xs"> + <label class="layui-form-label"> 璇勫鎰忚锛�</label> + <div class="layui-input-block"> + <input class="layui-input" name="" id="" autocomplete="off"> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + </div> + <table class="layui-table" id="mainTable" lay-filter="mainTable"> + <thead> + <tr> + <th>搴忓彿</th> + <th>涓嶈壇鍘熷洜</th> + <th>鍔犲叆鏃堕棿</th> + <th>绛惧悕</th> + </tr> + </thead> + <tbody> + <tr> + <td>璐ゅ績</td> + <td>2016-11-29</td> + <td>浜虹敓灏卞儚鏄竴鍦轰慨琛�</td> + </tr> + <tr> + <td>璁搁棽蹇�</td> + <td>2016-11-28</td> + <td>浜庡崈涓囦汉涔嬩腑閬囪浣犳墍閬囪鐨勪汉锛屼簬鍗冧竾骞翠箣涓紝鏃堕棿鐨勬棤娑殑鑽掗噹閲屸��</td> + </tr> + </tbody> + + </table> + + </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', 'laydate', 'table', 'element'], function () { + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element; + //娓呯┖鐣岄潰 new + + //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new + $("#HWHID").val(sessionStorage["HWHID"]); + $("#HWHNAME").val(sessionStorage["HWHName"]); + $("#HStockPlaceID").val(sessionStorage["HSPID"]); + $("#HStockPlaceName").val(sessionStorage["HSPName"]); + //$("#HSupID").val(sessionStorage["HSupID"]); + //$("#HSupName").val(sessionStorage["HSupName"]); + $("#HDeptID").val(sessionStorage["HDeptID"]); + $("#HDeptName").val(sessionStorage["HDept"]); + $("#HSecManagerID").val(sessionStorage["HSecManagerID"]); + $("#HSecManager").val(sessionStorage["HSecManager"]); + $("#HKeeperID").val(sessionStorage["HKeeperID"]); + $("#HKeeper").val(sessionStorage["HKeeper"]); + $("#HMaker").val(sessionStorage["HUserName"]); + $("#HMaker").hide(); + $("#HMakerID").hide(); + $("#HBillerID").val(sessionStorage["HBillerID"]); + $("#HBillerID").hide(); + var HSourceFlag = sessionStorage["SourceFlag"]; + //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new + + $("#HBarCode").focus(); + + //鑾峰彇鍙傛暟 + function getUrlVars() { + var vars = [], hash; + var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); + for (var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars.push(hash[0]); + vars[hash[0]] = hash[1]; + } + return vars; + } + + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + if (sessionStorage.login != "login") { + layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + }, function () { window.location.href = "../../user/login.html"; }); + } + + var params = getUrlVars(); + var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜 + var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷 + + function RoadBillMain(linterid)//鍔犺浇琛ㄥご + { + $.ajax({ + url: GetWEBURL() + "/Web/GetPonderationBill", + type: "GET", + data: { "HInterID": linterid }, + success: function (d) { + // console.log(d.data); + $("#HInterID").val(d.data[0].HInterID); + $("#HBillNo").val(d.data[0].HBillNo); + //$("#HBillType").val(d.data[0].HSourceBillType); + $("#HSourceBillNo").val(d.data[0].HSourceBillNo); + //$("#HWHID").val(d.data[0].HWhID); + //$("#HKeeperID").val(d.data[0].HKeeperID); + //$("#HSecManagerID").val(d.data[0].HSecManagerID); + //$("#HDeptID").val(d.data[0].HDeptID); + //$("#HBarCode").val(d.data[0].HBarCode); + //$("#HQty").val(d.data[0].HQty); + } + }) + } + + + function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋 + { + table.render({ + elem: '#wl-table' + , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json' + , cellMinWidth: 80 + , toolbar: '#toolbarDemo' + , where: { HBillID: linterid, HBillType: '1202', sWhere: '' } + , cols: [[ + { type: 'radio' } + , { field: 'HQty', title: '鏁伴噺', width: 80 } + , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 } + , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 } + , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 } + , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 } + , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 } + , { field: 'HBatchNo', title: '鎵规', width: 100 } + , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 } + , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 } + , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 } + ]] + , height: 500 + }) + } + + //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new + + + + + + var date = new Date(); + var day = date.getDate(); + var month = date.getMonth() + 1; + var year = date.getFullYear(); + var shijian = year + "-" + month + "-" + day; + + //鍒ゆ柇鏄惁鏂板 + if (linterid == null || linterid == 0) { + //鑾峰彇鏈�澶у崟鎹彿 new + $("#HInterID").val(""); + $("#HBillNo").val(""); + $.ajax({ + url: GetWEBURL() + "/Web/GetMAXNum", + type: "GET", + data: { "HBillType": '7509' }, + success: function (d) { + //console.log(d.data); + $("#HInterID").val(d.data[0].HInterID); + $("#HBillNo").val(d.data[0].HBillNo); + $("#HDate").val(shijian); + } + }); + } + else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new + RoadBillMain(linterid); + RoadBillSub(linterid); + } + + + //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣 new + //if (1 == 2) + //{ + // element.tabChange('tab-ProductlnBill', '3'); + // var pFocus = $("#HBarCode"); + // pFocus.focus(); + // pFocus.select(); + //} + //else + //{ + // element.tabChange('tab-ProductlnBill', '1'); + // var pFocus = $("#HSourceBillNo"); + // pFocus.focus(); + // pFocus.select(); + //} + // + // + + //閫夋嫨浠撳簱 + form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '浠撳簱鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + }); + + //閫夋嫨浠撲綅 + form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '浠撲綅鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + }); + + //閫夋嫨淇濈 + form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '淇濈鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + }); + + //閫夋嫨楠屾敹 + form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹 + var sMainStr = JSON.stringify(data.field); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '楠屾敹鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + }); + + //閫夋嫨閮ㄩ棬 + form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '閮ㄩ棬鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + }); + + //缂栬緫 + form.on('submit(cmdModify)', function () {//缂栬緫 + var sSubStr = table.cache['wl-table']; + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '鏄庣粏鍒楄〃' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + // } + }); + + form.on('submit(Cancel)', function () { + //sessionStorage["SourceFlag"] = false; + parent.location.href = "../../../views/index.html" + //window.close();//鍏抽棴褰撳墠椤� + }) + + //鎻愪氦 + form.on('submit(Saver)', function (data) {//鎻愪氦 + //debugger; + if ($("#HExplanation").val() == "") { + if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") { + $("#HWHNAME").val(""); + $("#HWHID").val(""); + layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + else + { + $("#HExplanation").val($("#HWHNAME").val()); + } + } + var sMainStr = JSON.stringify(data.field); + var sSubStr = table.cache['wl-table']; + //var sSourceType = $("#HBillType").val(); + var sSourceType = "3711"; + if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉 + { + layer.load(3); + $.ajax( + { + type: "POST", + //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json", + async: true, + data: { "oMain": sMainStr }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� + layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), { + icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'], + btn2: function () { + //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 + //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 + parent.location.href = "../../../views/index.html" + }//鍏抽棴 + }, function () { window.location.reload(); });//鏂板 + } + else { + layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + layer.closeAll("loading"); + }, + error: function (err) { + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + return false; + } + }); + + //鐩戝惉鎻愪氦 + form.verify({ + numberOrEmpty: function (value, item) { + // if (value != '') { + if (!/^\d+$/.test(value)) { + return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0'; + } + //} + } + }); + + + //鍒锋柊鏄庣粏椤电 + table.render({ + elem: '#mx-table' + // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub' + //, toolbar: '#toolbarDemo' + // , where: { sMsg: linterid, sMsg2: lentryid } + , cols: [[ + , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true } + ]] + , page: true + , height: 500 + , done: function () { + } + }); + }); + function GetHWHValue(obj) //杩斿洖璋冨叆浠撳簱 + { + $("#HWHNAME").val(obj[0].HName); + //sessionStorage["HWHID"] = obj[0].HItemID; + $("#HWHID").val(obj[0].HItemID); + } + function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅 + $("#HStockPlaceName").val(obj[0].HName); + $("#HStockPlaceID").val(obj[0].HItemID); + } + function GetHKeeperValue(obj) { //杩斿洖淇濈 + $("#HKeeper").val(obj[0].HName); + $("#HKeeperID").val(obj[0].HItemID); + } + function GetHSecManagerValue(obj) { //杩斿洖楠屾敹 + $("#HSecManager").val(obj[0].HName); + $("#HSecManagerID").val(obj[0].HItemID); + } + function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬 + $("#HDeptName").val(obj[0].HName); + $("#HDeptID").val(obj[0].HItemID); + } + function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉 + //if ($("#HSourceBillNo").val() == '') { + // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 }); + // return false; + //} + if($("#HDeptName").val()=='') + { + layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + if ($("#HSecManager").val() == '') { + layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + if ($("#HKeeper").val() == '') { + layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + //if ($("#HWHNAME").val() == '') { + // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 }); + // return false; + //} + if ($("#HBillNo").val() == '') { + layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + if ($("#HInterID").val() == '') { + layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + if (typeof (sSubStr) == "undefined") + { + layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + if (!typeof (sSubStr) == "undefined") { + //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺 + // if (parseFloat(sSubStr[i].HQtyMust) > 0) { + // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) + // { + // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' }); + // return false; + // } + // } + //} + for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0 + if (parseFloat(sSubStr[i].HQty) > 0) { + s = 1; + } + } + if (s == 0) { + layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return false; + } + } + else + { + return true; + } + } + </script> + </body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBill.html" deleted file mode 100644 index 7a8b889..0000000 --- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBill.html" +++ /dev/null @@ -1,10 +0,0 @@ -锘�<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8" /> - <title></title> -</head> -<body> - -</body> -</html> \ No newline at end of file diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" index e00d95b..9ad904b 100644 --- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" @@ -1,10 +1,322 @@ 锘�<!DOCTYPE html> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta charset="utf-8" /> - <title></title> +<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> + </head> <body> - <h1>鍝囧挃鍜旓紒锛侊紒锛�</h1> + <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">寮�濮嬫棩鏈�</label> + <div class="layui-input-block"> + <input type="date" class="layui-input" id="HDate"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">缁撴潫鏃ユ湡</label> + <div class="layui-input-block"> + <input type="date" class="layui-input" id="HDate1"> + </div> + </div> + <!--<div class="layui-inline"> + <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO"> + </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"> + <div class="layui-inline"> + <div class="layui-inline"> + <span>鍏朵粬鏉′欢></span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍗曟嵁鍙�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter"> + </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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> + <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>--> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>娣诲姞</button> + <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>娣诲姞</button>--> + + </div> + </script> + </form> + </div> + </div> + </div> + </div> + + <script type="text/html" id="barDemo"> + <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> +</script> + <script 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 () { + 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 = " 浜у搧浠g爜 = 'BX0002'"; + var sWhere = ""; + + var option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + ,height: 'full-50' + , page: true + ,cellMinWidth: 90 + , cols: [[ + //{ type: 'checkbox' } + + { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true } + , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 } + , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 } + , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' } + , { field: '鐢熶骇璧勬簮鍚嶇О ', title: '鐢熶骇璧勬簮鍚嶇О ', width: 115 } + , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' } + , { field: '鐗╂枡鍐呯爜', title: '鐗╂枡鍐呯爜', width: 100 } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' } + , { field: '妫�楠屽憳浠g爜', title: '妫�楠屽憳浠g爜' } + , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О' } + , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' } + , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' } + , { field: '涓嶈壇鍘熷洜浠g爜 ', title: '涓嶈壇鍘熷洜浠g爜' } + , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' } + , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' } + , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' } + , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' } + , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' } + , { field: '淇敼浜�', title: '淇敼浜�' } + , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' } + , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' } + , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' } + , { field: '浣滃簾浜�', title: '浣滃簾浜�' } + , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' } + , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' } + , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true } + + //,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150} + ]] + }; + + +//鐩戝惉琛屽伐鍏蜂簨浠� + //table.on('tool(mainTable)', function(obj){ + // var data = obj.data; + // //console.log(obj) + // if(obj.event == 'del'){ + // layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function(index){ + // obj.del(); + // layer.close(index); + // }); + // } else if(obj.event == 'edit'){ + // layer.prompt({ + // formType: 2 + // ,value: data.HDate + // }, function(value, index){ + // obj.update({ + // HDate: value + // }); + // layer.close(index); + // }); + // //layer.alert('鎴戞槸缂栬緫涓�'); + // } + //}); + //澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch (obj.event) { + case 'btn-Pushdown': + // var checkStatus = table.checkStatus('mainTable') + // , data = checkStatus.data; + // ajaxLabelData = data; + // var rows = ''; + // var HEntry = ''; + // for (var i = 0; i < data.length; i++) { + // rows += data[i].hmainid.toString() + ',' ; + + // } + + // if (checkStatus.data.length < 1) + // { + // layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺�'); + // } else + // { + + ////椤甸潰灞� + //layer.open({ + // type: 2 //Page灞傜被鍨� + // ,area: ['100%', '100%'] + // ,title: '鏂板娲惧伐鍗�' + // ,shade: 0.6 //閬僵閫忔槑搴� + // ,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲 + // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + // , content: ['../宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].璁″垝寮�宸ユ棩鏈�.toString(), '&PlanEndDate=' + data[0].璁″垝瀹屽伐鏃ユ湡.toString(), 'yes'] + // , resize: false + // , cancel: function () { + // //$(".layui-btn").removeClass("layui-btn-disabled"); + // } + + // }); + + // } + layer.msg('鍝囧挃鍜旓紒锛侊紒锛侊紒锛�'); + break; + case 'btn-Add': + layer.open({ + type: 2 //Page灞傜被鍨� + ,area: ['100%', '100%'] + ,title: '鏂板娲惧伐鍗�' + ,shade: 0.6 //閬僵閫忔槑搴� + ,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html' , 'yes'] + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + + }); + break; + case '': + layer.msg(''); + break; + + }; + }); + + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + var index0 = layer.load(0, { shade: false }); + $.ajax({ + //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", + url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index0); + } else { + layer.close(index0); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index0); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + + //閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + $("#HDate").val("");//寮�濮嬫棩鏈� + $("#HDate1").val("");//缁撴潫鏃ユ湡 + //$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙� + //$("#WorkCenter").val("");//鍗曟嵁鍙� + $("#btnSearch").click(); + }); + + //鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅 + var HDate = $("#HDate").val();//寮�濮嬫棩鏈� + var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡 + //var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙� + //var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙� + if (HDate) { + sWhere += " and 鏃ユ湡 >= '" + HDate + "'"; + } + if (HDate1) { + sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'"; + } + //if (HOrderProcNO) { + // sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'"; + //} + //if (WorkCenter) { + // sWhere += " and HBillNo like '%" + WorkCenter + "%'"; + //} + var index = layer.load(0, { shade: false }); + $.ajax({ + url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json', + type: "GET", + data: { "sWhere": sWhere }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index); + layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.close(index); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + }); + + + //laydate.render({ + // elem: '#HDate' + // , type: 'datetime' + // , trigger: 'click' + // , format:'yyyy-MM-dd HH:mm' + //}); + + + //浠ヤ笂鏄痩ayui妯″潡 + }); + + + + + </script> + </body> -</html> \ No newline at end of file +</html> -- Gitblit v1.9.1