From 525e50b560899e023c823a3eb59ddac97a386678 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 17 十一月 2021 08:21:58 +0800
Subject: [PATCH] 丸井器具即时库存报表,器具维修登记单选源单

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html     |   30 +
 WebTM/views/PublicPage/PurchOrder.html                      |  296 +++++++++++++++++
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html |  174 +++++++++
 WebTM/views/index.html                                      |    2 
 WebTM/views/模治具管理/器具报表/ReportMouldStock.html                |  482 ++++++++++++++++++++++++++++
 WebTM/WebTM.csproj                                          |    2 
 6 files changed, 969 insertions(+), 17 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1e82b8c..b77c05d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -116,6 +116,7 @@
     <Content Include="views\PublicPage\PeopleInformations.html" />
     <Content Include="views\PublicPage\PeopleInformation.html" />
     <Content Include="views\PublicPage\PowerInformation.html" />
+    <Content Include="views\PublicPage\PurchOrder.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\test\testRenderAutomationList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrjSub.html" />
@@ -644,6 +645,7 @@
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
diff --git a/WebTM/views/PublicPage/PurchOrder.html b/WebTM/views/PublicPage/PurchOrder.html
new file mode 100644
index 0000000..d747687
--- /dev/null
+++ b/WebTM/views/PublicPage/PurchOrder.html
@@ -0,0 +1,296 @@
+锘�<!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>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+
+        .layui-body {
+            overflow-y: scroll;
+        }
+        .layui-input {
+          width:150px;
+        }
+    </style>
+</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" style="margin-left:-0.5em;">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="Status" lay-filter="Status">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈鏍�</option>
+                                            <option value="1">宸插鏍�</option>
+                                            <option value="2">宸插叧闂�</option>
+                                        </select>
+                                    </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="HBillNo" id="HBillNo">
+                                    </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="PartNumber" id="PartNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">妯″叿鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartName" id="PartName">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鏁呴殰鍘熷洜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartSpec" id="PartSpec">
+                                        </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>-->
+                               
+
+                            </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>
+        var total=31;
+        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
+                , util = layui.util
+
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+
+            var index = layer.load(0);
+            table.render({
+                elem: '#mainTable'            
+                , url: GetWEBURL() + '/Cg_PurchaseOrder/GetPurchaseOrderBill'
+                , where: { sWhere: "" } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                , page: true   //寮�鍚垎椤�
+                , limit: 20     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                ,limits: [20, 40,60,80,100] //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                , method: 'get'  //鎻愪氦鏂瑰紡
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                    , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
+                    , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
+                    , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
+                    , { field: '鏁呴殰绫诲埆浠g爜', title: '鏁呴殰绫诲埆浠g爜', width: 200 }
+                    , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
+                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200}
+                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                    , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', width: 200 }
+                    , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
+                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                    , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200, templet: "<div>{{d.鏁呴殰鍙戠敓鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏁呴殰鍙戠敓鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200, templet: "<div>{{d.瑕佹眰瀹屽杽鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佹眰瀹屽杽鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鎽樿', title: '鎽樿', width: 200 }
+                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                    , { field: '鏁呴殰鎻忚堪', title: '鏁呴殰鎻忚堪', width: 200 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true}
+                    , { field: 'HConkReasonID', title: 'HConkReasonID', width: 200, hide: true }
+                    , { field: '鏁呴殰鍘熷洜浠g爜', title: '鏁呴殰鍘熷洜浠g爜', width: 200 }
+                    , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
+                    , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
+                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                    , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
+                    , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
+                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                    , { field: 'HBillType', title: 'HBillType', width: 200 }
+                ]]
+                , response: {
+                    statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                }
+                , done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                    layer.close(index);    //杩斿洖鏁版嵁鍏抽棴loading		    	
+                }
+            });        
+          
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");
+                $("#PartNumber").val("");
+                $("#PartName").val("");
+                $("#PartSpec").val("");
+                $("#btnSearch").click();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                SearchLoad(sWhere, table);
+
+            });
+
+            //鐩戝惉琛屽弻鍑讳簨浠�
+            table.on('rowDouble(mainTable)', function (obj) {
+                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        function SearchLoad(sWhere,table) {
+            var Status = $("select[name='Status']").val();//鐘舵��
+            var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+            var PartNumber = $("#PartNumber").val();  //浜у搧缂栫爜
+            var PartName = $("#PartName").val();  //浜у搧鍚嶇О
+            var PartSpec = $("#PartSpec").val();  //浜у搧瑙勬牸
+            if (Status) {
+                switch (Status) {
+                    case '-1':   //鍏ㄩ儴
+                        sWhere += "";
+                        break;
+                    case '0':    //鏈鏍�
+                        sWhere += " and 瀹℃牳浜�=''";
+                        break;
+                    case '1':    //宸插鏍�
+                        sWhere += " and 瀹℃牳浜�<>''";
+                        break;
+                    case '2':    //宸插叧闂�
+                        sWhere += " and 鍏抽棴浜�<>''";
+                    default:
+
+                }
+            }
+            if (HDate) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+            }
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (PartNumber) {
+                sWhere += " and 浜у搧妯″叿浠g爜 like '%" + PartNumber + "%'";
+            }
+            if (PartName) {
+                sWhere += " and 浜у搧妯″叿 like '%" + PartName + "%'";
+            }
+            if (PartSpec) {
+                sWhere += " and 鏁呴殰鍘熷洜 like '%" + PartSpec + "%'";
+            }
+            table.reload('mainTable', {
+                method: 'get'
+                , where: {
+                    sWhere: sWhere
+                }
+                , page: {
+                    curr: 1
+                }
+                , response: {
+                    statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                }
+            });
+            //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            sWhere = "";
+        }
+
+       
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 2547c91..49ee0aa 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -534,7 +534,7 @@
                                 <dd>
                                     <a>鍣ㄥ叿鎶ヨ〃</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="">鍣ㄥ叿搴撳瓨鏌ヨn</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
                                         <dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
                                     </dl>
                                 </dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
new file mode 100644
index 0000000..d606c7f
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
@@ -0,0 +1,482 @@
+锘�<!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>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</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-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <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 class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber" 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" name="HBarCode" id="HBarCode" 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" name="HSupName" id="HSupName" style="width:190px;">
+                                                </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>
+                                        </div>
+                                    </div>
+                                    <table class="" id="layTable" lay-filter="layTable"></table>
+                                    <script type="text/html" id="toolbarDemo">
+                                        <div class="layui-btn-container">
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+                                        </div>
+                                    </script>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <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 class="layui-input" name="HDate1" id="HDate1" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" class="layui-input" name="HNumber1" id="HNumber1" 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" name="HSupName1" id="HSupName1" style="width:190px;">
+                                                </div>
+                                            </div>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+                                                <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="btnReSearch1" id="btnReSearch1" style="padding:0 5px">閲嶇疆</button>
+                                            <div class="layui-colla-content">
+                                                <div class="layui-inline">
+                                                    <div class="layui-inline">
+                                                        <span>鍏朵粬鏉′欢</span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <table class="" id="layTable1" lay-filter="layTable1"></table>
+                                    <script type="text/html" id="toolbarDemo1">
+                                        <div class="layui-btn-container">
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+                                        </div>
+                                    </script>
+                                </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 cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+        var cols_arr1 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+        var table = null;
+        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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var HDate = "";
+            var HNumber = "";
+            var HBarCode = "";
+            var HSupName = "";
+            var HDate1 = "";
+            var HNumber1 = "";
+            var HSupName1 = "";
+
+            var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+            var resultTableHead1 = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+            //鍒濆鍖栫晫闈�
+            set_ClearBill(HDate, HNumber, HBarCode, HSupName);
+            //set_ClearBill1(HDate1, HNumber1, HSupName1);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+
+                };
+            });
+            $('.layui-tab-title').on('click', function (title) {
+                if (title.toElement.textContent == "鏄庣粏淇℃伅") {
+                    get_FastQuery();
+                } else if (title.toElement.textContent == "姹囨�讳俊鎭�") {
+                    get_FastQuery1();
+                } 
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            form.on('submit(btnSearch1)', function (data) {
+                get_FastQuery1();
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            form.on('submit(btnReSearch1)', function (data) {
+                set_ClearQuery1();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栬〃鍗�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate1'
+                });
+            }
+            //#endregion
+
+            // #region 鍒濆鍖栫晫闈�
+            function set_ClearBill(HDate, HNumber, HBarCode, HSupName) {
+                resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+                //鍒濆鏌ヨ
+                get_Display(HDate, HNumber, HBarCode, HSupName);
+
+            }
+
+            function set_ClearBill1(HDate1, HNumber1, HSupName1) {
+                resultTableHead1 = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+                //鍒濆鏌ヨ
+                get_Display1(HDate1, HNumber1, HSupName1);
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(HDate, HNumber, HBarCode, HSupName) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillList',
+                    type: "GET",
+                    data: { "page": 1, "limit": 500, "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
+                    async: false,
+                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                    success: function (data1) {
+                        for (var key in data1.list) {
+                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        set_InitGrid(HDate, HNumber, HBarCode, HSupName);
+                    }, error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            function get_Display1(HDate1, HNumber1, HSupName1) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillSumList',
+                    type: "GET",
+                    data: { "page": 1, "limit": 500, "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
+                    async: false,
+                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                    success: function (data1) {
+                        for (var key in data1.list) {
+                            resultTableHead1.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        set_InitGrid1(HDate1, HNumber1, HSupName1);
+                    }, error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            //#endregion
+
+            //#region  鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid(HDate, HNumber, HBarCode, HSupName) {
+                //濉厖琛ㄦ牸澶存暟缁�
+                var data = resultTableHead;
+                cols_arr[0] = [];
+                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name == 'HItemID') {
+                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+                    }
+                    else {
+                        switch (data[i].Type) {
+                            //int
+                            case 'Int32':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            //Decimal
+                            case 'Decimal':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            default:
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+                        }
+                    }
+                }
+                //濉厖琛ㄦ牸鏁版嵁
+                table.render({
+                    elem: '#layTable',
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillList',
+                    toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    title: '鍣ㄥ叿鍗虫椂搴撳瓨鏄庣粏琛�',
+                    cols: cols_arr,    //濉厖琛ㄦ牸澶存暟鎹�,
+                    id: 'layTable', //琛ㄦ牸id
+                    where: { "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                    page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
+                    limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                    limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                    method: 'get',  //鎻愪氦鏂瑰紡
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    response: {
+                        statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                    },
+                    done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                        layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading
+                    }
+                });
+            }
+
+            function set_InitGrid1(HDate1, HNumber1, HSupName1) {
+                //濉厖琛ㄦ牸澶存暟缁�
+                var data = resultTableHead1;
+                cols_arr1[0] = [];
+                cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name == 'HItemID') {
+                        cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+                    }
+                    else {
+                        switch (data[i].Type) {
+                            //int
+                            case 'Int32':
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            //Decimal
+                            case 'Decimal':
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+                                break;
+                            default:
+                                cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+                        }
+                    }
+                }
+                //濉厖琛ㄦ牸鏁版嵁
+                table.render({
+                    elem: '#layTable1',
+                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillSumList',
+                    toolbar: '#toolbarDemo1', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
+                    cols: cols_arr1,    //濉厖琛ㄦ牸澶存暟鎹�,
+                    id: 'layTable1', //琛ㄦ牸id
+                    where: { "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                    page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
+                    limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+                    limits: [50,100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                    method: 'get',  //鎻愪氦鏂瑰紡
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    response: {
+                        statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                    },
+                    done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                        layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading
+                    }
+                });
+            }
+            //endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//鏃ユ湡
+                var HNumber = $("#HNumber").val();//鐗╂枡
+                var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+                var HSupName = $("#HSupName").val();//寰�鏉ュ崟浣�
+                set_ClearBill(HDate, HNumber, HBarCode, HSupName);
+
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery1() {
+                var HDate1 = $("#HDate1").val();//鏃ユ湡
+                var HNumber1 = $("#HNumber1").val();//鐗╂枡
+                var HSupName1 = $("#HSupName1").val();//寰�鏉ュ崟浣�
+                set_ClearBill1(HDate1, HNumber1,HSupName1);
+
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HDate").val("");//鏃ユ湡
+                $("#HNumber").val("");//鐗╂枡
+                $("#HBarCode").val("");//鏉″舰鐮�
+                $("#HSupName").val("");//寰�鏉ュ崟浣�
+                get_FastQuery();
+
+            }
+            function set_ClearQuery1() {
+                $("#HDate1").val("");//鏃ユ湡
+                $("#HNumber1").val("");//鐗╂枡
+                $("#HSupName1").val("");//寰�鏉ュ崟浣�
+                get_FastQuery();
+
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 閲嶆柊鍔犺浇琛ㄦ牸(澶囩敤鏂规硶)
+            function reloadByKeyword() {
+                table.reload('layTable', {
+                    page: {
+                        curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+                    },
+                    request: {
+                        pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
+                        limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
+                    },
+                    where: {
+                        keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇琛ㄦ牸涓殑鍊�(澶囩敤鏂规硶)
+            function batchDel() {
+                var data = table.checkStatus('layTable').data;
+                var ids = "";
+                for (var i = 0; i < data.length; i++) {
+                    ids += data[i].id + ",";
+                }
+                alert(ids);
+            }
+            //#endregion
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index 71f5e38..348a003 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -354,11 +354,16 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
-                    //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                    //window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
-                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                        , resize: false
+                    })
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
@@ -370,11 +375,16 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
-                    //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                    //window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
-                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+                        , resize: false
+                    })
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index da07288..deec087 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -209,6 +209,28 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
+                                                        <option value="2" selected="selected">閲囪喘璁㈠崟</option>
+                                                        <option value="1">鎵嬪伐褰曞叆</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">閫夊崟鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" 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-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">缁翠慨鍐呭</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮淇唴瀹�" class="layui-textarea" name="HRepairContent" id="HRepairContent"></textarea>
@@ -286,7 +308,7 @@
             var option;
             var sBillType = "3807";
             //var TabRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
-           //#endregion
+            //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
@@ -309,12 +331,30 @@
 
             //#region 瑙﹀彂浜嬩欢锛�
 
+            //鑾峰彇涓嬫媺閫変腑鍊�
+            form.on('select(HMainSourceBillType)', function (data) {
+                Sctag = data.value;
+                form.render('select');
+                switch (Sctag) {
+                    //鏃犳簮鍗曟柊澧�
+                    case '1':
+                        $('#HMainSourceBillNo').attr("disabled", false);
+                        $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                        break;
+                    //鏈夋簮鍗曟柊澧灺� 聽
+                    case '2':
+                        $('#HMainSourceBillNo').attr("disabled", true);
+                        $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+                        break;
+                }
+            });
+
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
+                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -598,6 +638,113 @@
                 });
             });
 
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閲囪喘璁㈠崟鍒楄〃',
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    content: ['../../PublicPage/PurchOrder.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
+                        //table.render(option);
+                        var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        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('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        //鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
+                        //var oldData = table.cache["mainTable"];
+                        //var rowIndex = $("#mainTable").find("tbody tr").attr('data-index');//褰撳墠琛岀殑绱㈠紩
+                        //$(".layui-table-view .layui-table tbody tr[data-index=" + 1+ "]").remove();
+
+                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+                        var list = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            list.push(checkStatus.data[i].鍗曟嵁鍙�)
+                        }
+                        if (isAllEqual(list))  //鐩稿悓鍗曞彿
+                        {
+                            var rowdate = layui.table.cache["mainTable"];
+                            if (rowdate.length == 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < checkStatus.data.length; i++) {
+                                    var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                            if (rowdate.length > 0 && rowdate.length <=checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < rowdate.length; i++) {
+                                    var checkrow = {
+                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+                                        "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,
+                                        "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷
+                                    };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                            if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                            {
+                                buttonArr = [];//娓呯┖鏁扮粍
+                                for (var i = 0; i < rowdate.length; i++) {
+                                    var checkrow = {
+                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+                                        "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,
+                                        "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[0].鍗曟嵁绫诲瀷
+                                    };
+                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                }
+                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                table.reload("mainTable", {
+                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                })
+                            }
+                         
+                            //console.log(rowdate.length);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        else {
+                            layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
+                        }
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+                        //layer.full(index);
+                    }
+                });
+            });
+            //#endregion
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
                 if (linterid == undefined) {
@@ -685,6 +832,10 @@
                     , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
                     , { field: 'HMoney', title: '缁翠慨璐圭敤', event: "", edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�' }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�' }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ];
                 option = {
@@ -703,7 +854,7 @@
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
-                get_MAXNum();
+                //get_MAXNum();
                 option.data = [];
                 table.render(option);
             }
@@ -729,7 +880,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " }];
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
                 table.render(option);
             }
             //缂栬緫鍔犺浇琛ㄥご
@@ -1047,9 +1198,20 @@
 
         //#endregion
 
+        //#region 鍒ゆ柇婧愬崟甯﹀洖鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+        function isAllEqual(array) {
+            if (array.length > 0) {
+                return !array.some(function (value, index) {
+                    return value !== array[0];
+                });
+            } else {
+                return true;
+            }
+        }
+        //#endregion
         //#region 鏁版嵁楠岃瘉
         function AllowLoadData(sSubStr) {
-           
+
 
             if ($("#HMouldCodeHMouldCode").val() == '') {
                 layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1134,7 +1296,7 @@
                 return true;
             }
         }
-            //#endregion
+                //#endregion
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1