From 3a0ec5cafddf65b658f8b1d24f329163f6708b96 Mon Sep 17 00:00:00 2001
From: 杨乐 <杨乐@DESKTOP-5CU1TNO>
Date: 星期二, 15 三月 2022 08:24:39 +0800
Subject: [PATCH] 生产叫料平台

---
 WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html          |  395 ++++++++++
 WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html          |  525 +++++++++++++
 WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html      |  699 +++++++++++++++++
 WebTM/views/生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html |  444 +++++++++++
 WebTM/views/生产管理/生产叫料平台/JIT_HlpBillList.html                 |  234 ++++++
 WebTM/WebTM.csproj                                           |    5 
 6 files changed, 2,302 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b14a8b0..8cce4c2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -791,6 +791,8 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫闃查敊\Sc_MaterToSourceStepBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBindStep.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
@@ -798,6 +800,8 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_MESStopWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodBillMain.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍙枡骞冲彴\JIT_HlpBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瀹屽伐鍗昞Sc_MESEndWorkBillList.html" />
@@ -814,6 +818,7 @@
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\閫�鏂欑敵璇峰崟\JIT_CallGoodsBackRequestBillList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
     <Content Include="views\绯荤粺绠$悊\鍏憡\GG_NoticeBillList.html" />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
new file mode 100644
index 0000000..6101dc7
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
@@ -0,0 +1,395 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>閰嶆枡鍗曞垪琛�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-row .layui-btn layui-btn-normal {
+            margin: 0px 10px;
+        }
+
+        .layui-inline {
+            margin: 0px 80px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">閫�鍑�</button>
+                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sc" id="Sc">涓婃煡</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>-->
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row" style="text-align:center;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 80px;font-size:25px;">閰嶆枡鍗�</label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 80px;">鎷f枡閰嶉�佸崟鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
+                                            </div>
+                                            <label class="layui-form-label"></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
+                                            </div>
+                                        </div>
+                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">鍖归厤搴撳瓨</button>
+                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ckfl" id="Ckfl">浠撳簱鍙戞枡</button>
+                                    </div>
+                                    <div class="layui-tab" lay-filter="">
+                                        <ul class="layui-tab-title" lay-filter="tab-all">
+                                            <li lay-id="1" style="padding:1px;" class="layui-this">鎷f枡淇℃伅</li>
+                                            <li lay-id="2" style="padding:1px;" >鎷f枡鏄庣粏</li>
+                                        </ul>
+                                        <div class="layui-tab-content">
+                                            <!--鎷f枡淇℃伅-->
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                                </div>
+                                            </div>
+                                            <!--鎷f枡鏄庣粏-->
+                                            <div class="layui-tab-item">
+                                                <div class="layui-form-item">
+                                                    <table class="" id="mainTable1" lay-filter="mainTable1"></table>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) != "undefined") {
+            sWhere = params[params[0]];
+        }
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //杩囨护鏌ヨ
+        form.on('submit(Cx)', function () {
+            get_FastQuery();
+        })
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill()
+        {
+            set_InitGrid();
+            get_Display(sWhere);
+
+            //set_InitGrid1();
+            //get_Display1(sWhere);
+        }
+        //#region 鎷f枡淇℃伅
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 350
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    //{ type: 'checkbox', fixed: 'left' }
+                     { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
+                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 170 }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
+                    , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160}
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
+                    , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
+                    , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
+                    , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+                    , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+                    , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
+                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
+                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
+                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+                ]]
+            };
+        }
+
+        //鏌ヨ鍔犺浇鏁版嵁
+        function get_Display(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": "Admin" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+        //#region 鏄庣粏淇℃伅
+        function get_Display1(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": "Admin" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option1.data = data1.data;
+                        table.render(option1);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        function set_InitGrid1() {
+            option1 = {
+                elem: '#mainTable1'
+                //, toolbar: '#toolbarDemo'
+                , height: 350
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    //{ type: 'checkbox', fixed: 'left' }
+                    { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150 }
+                    //, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170 }
+                    //, { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 170 }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
+                    , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160 }
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
+                    , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text' }
+                    , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text' }
+                    , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text' }
+                    , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160 }
+                    , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+                    , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+                    , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160 }
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
+                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
+                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
+                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+                ]]
+            };
+        }
+        //#endregion
+
+        //蹇�熻繃婊�
+        function get_FastQuery() {
+            var MaterialNumber = $("#MaterialNumber").val(); //鐗╂枡浠g爜
+            var MaterialName = $("#MaterialName").val(); //鐗╂枡鍚嶇О
+            var MaterialModel = $("#MaterialModel").val(); //鐗╂枡瑙勬牸鍨嬪彿
+            var HGD = $("#HGD").val(); //宸ユ
+            var HWHName = $("#HWHName").val(); //浠撳簱
+            var Organization = $("#Organization").val(); //缁勭粐
+            var HBeginDate = $("#HBeginDate").val(); //鎷f枡鏃ユ湡
+            var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+            var HDeptName = $("#HDeptName").val(); //閮ㄩ棬
+            var HJLStatus = $("#HJLStatus").val(); //鎷f枡鐘舵��
+            var user = sessionStorage["HUserName"]; //鍒跺崟浜�
+            sWhere = {
+
+                MaterialNumber: MaterialNumber,
+                MaterialName: MaterialName,
+                MaterialModel: MaterialModel,
+                HGD: HGD,
+                HWHName: HWHName,
+                Organization: Organization,
+                HBeginDate: HBeginDate,
+                HEndDate: HEndDate,
+                HDeptName: HDeptName,
+                HJLStatus: HJLStatus,
+                user: user
+            };
+            get_Display(JSON.stringify(sWhere));
+            sWhere = "";
+        }
+
+        //琛屽唴鍒犻櫎蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == "Warehouse") {
+                        //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "浠撳簱鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "璋冨嚭浠撳簱": checkStatus.data[0].HName
+                                    , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
+                                })
+                                console.log(checkStatus.data[0].HItemID)
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                }
+            })
+        }
+
+        //鑾峰彇浼犻�掓暟鎹�
+        function get_UrlVars() {
+            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;
+        }
+
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
new file mode 100644
index 0000000..5249bf9
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -0,0 +1,525 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎷f枡閰嶉�佸崟鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-row .layui-btn layui-btn-normal {
+            margin: 0px 10px;
+        }
+
+        .layui-inline {
+            margin: 0px 80px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sc" id="Sc">涓婃煡</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ユ</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠撳簱</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">褰撳墠缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="Organization" id="Organization" lay-verify="Organization">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎷f枡鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;text-align:center;">鈥�</label>
+                                            <div class="layui-input-block" style="margin-left: 118px;">
+                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鎷f枡鐘舵��</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+                                                <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
+                                                    <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+                                                    <option value="宸叉嫞鏂�">宸叉嫞鏂�</option>
+                                                    <option value="鏈嫞鏂�">鏈嫞鏂�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 90px;">
+                                                <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="浠呮樉绀烘湭瀹屽叏閰嶉��">
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
+                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">鎷f枡閰嶉��</button>
+                                    </div>
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //杩囨护鏌ヨ
+        form.on('submit(Cx)', function () {
+            get_FastQuery();
+        })
+
+        //鐗╂枡
+        form.on('submit(btnMaterial)', function () {
+            btnMaterial();
+        })
+
+        //宸ユ
+        form.on('submit(btnHGD)', function () {
+            btnHGD();
+        })
+
+        //浠撳簱
+        form.on('submit(btnHWHName)', function () {
+            btnHWHName();
+        })
+
+        //閮ㄩ棬
+        form.on('submit(btnHDeptName)', function () {
+            btnHDeptName();
+        })
+
+        //閰嶉�佸崟鍒楄〃
+        form.on('submit(Jlps)', function () {
+            btnJlps();
+        })
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill()
+        {
+            set_InitGrid();
+            get_Display(sWhere);
+            Organ();
+            //鏃堕棿鍒濆鍖�
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+        }
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 350
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    //{ type: 'checkbox', fixed: 'left' }
+                     { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
+                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 170 }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
+                    , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160}
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
+                    , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
+                    , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
+                    , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+                    , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+                    , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
+                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
+                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
+                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+                ]]
+            };
+        }
+
+        //鏌ヨ鍔犺浇鏁版嵁
+        function get_Display(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+      
+        //鐗╂枡
+        function btnMaterial() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#MaterialID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#MaterialName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#MaterialModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#MaterialNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //宸ユ --鏃犺〃
+        function btnHGD() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '浜у搧鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#CPID").val(checkStatus.data[0].HItemID);//浜у搧id
+                    $("#CPName").val(checkStatus.data[0].HName);//浜у搧鍚嶇О
+                    $("#CPModel").val(checkStatus.data[0].HModel);//浜у搧瑙勬牸鍨嬪彿
+                    $("#CPNumber").val(checkStatus.data[0].HNumber);//浜у搧浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //浠撳簱
+        function btnHWHName() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '浠撳簱鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWHName").val(checkStatus.data[0].HName);//浠撳簱鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //閮ㄩ棬
+        function btnHDeptName() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HDeptName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //閰嶉�佸崟鍒楄〃
+        function btnJlps() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            else {
+                var HBillNo = CheckStatus.data[0].鎷f枡閰嶉�佸崟鍙�;
+
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['100%', '100%']//澶у皬
+                    , title: '閰嶉�佸崟鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , maxmin: true
+                    , content: "../../鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsBill.html?HBillNo=" + HBillNo
+                })
+            }
+        }
+
+        //蹇�熻繃婊�
+        function get_FastQuery() {
+            var MaterialNumber = $("#MaterialNumber").val(); //鐗╂枡浠g爜
+            var MaterialName = $("#MaterialName").val(); //鐗╂枡鍚嶇О
+            var MaterialModel = $("#MaterialModel").val(); //鐗╂枡瑙勬牸鍨嬪彿
+            var HGD = $("#HGD").val(); //宸ユ
+            var HWHName = $("#HWHName").val(); //浠撳簱
+            var Organization = $("#Organization").val(); //缁勭粐
+            var HBeginDate = $("#HBeginDate").val(); //鎷f枡鏃ユ湡
+            var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+            var HDeptName = $("#HDeptName").val(); //閮ㄩ棬
+            var HJLStatus = $("#HJLStatus").val(); //鎷f枡鐘舵��
+            var user = sessionStorage["HUserName"]; //鍒跺崟浜�
+            sWhere = {
+                MaterialNumber: MaterialNumber,
+                MaterialName: MaterialName,
+                MaterialModel: MaterialModel,
+                HGD: HGD,
+                HWHName: HWHName,
+                Organization: Organization,
+                HBeginDate: HBeginDate,
+                HEndDate: HEndDate,
+                HDeptName: HDeptName,
+                HJLStatus: HJLStatus,
+                user: user
+            };
+            get_Display(JSON.stringify(sWhere));
+            sWhere = "";
+        }
+
+        //琛屽唴鍒犻櫎蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == "Warehouse") {
+                        //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "浠撳簱鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "璋冨嚭浠撳簱": checkStatus.data[0].HName
+                                    , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
+                                })
+                                console.log(checkStatus.data[0].HItemID)
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                }
+            })
+        }
+     
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
new file mode 100644
index 0000000..e7c0a58
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -0,0 +1,699 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢熶骇鍙枡骞冲彴鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-row .layui-btn layui-btn-normal {
+            margin: 0px 10px;
+        }
+       /* .layui-inline {
+            margin: 0px 80px;
+        }*/
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">鏍囧噯浠跺彨鏂�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">閰嶅鍙枡</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">鏈�灏忓寘瑁呭彨鏂�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
+                    </div>
+                    <div class="layui-collapse">
+                        <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="Organization" id="Organization" lay-verify="Organization">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                            <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                <div class="layui-row" style="margin-top:10px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+                                            <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浜у搧瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly onmouseover="this.title=this.value">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" onmouseover="this.title=this.value">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;text-align:center;">鈥�</label>
+                                        <div class="layui-input-block" style="margin-left: 118px;">
+                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px;">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-block" style="margin-left: 90px;">
+                                            <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="浠呮樉绀烘湭瀹屽叏閰嶉��">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-collapse">
+                        <div class="layui-colla-item">
+
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                             
+                               
+
+                                <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Kcxd" id="Kcxd">搴撳瓨鏍″</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">鍙枡</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">鐢熸垚鎷f枡鍗�</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">涓嶈壇鍝侀��鐢宠鏂�</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">浣欓噺閫�鏂欑敵璇峰崟</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">鎶ュ簾閫�鏂欑敵璇峰崟</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">鐢熸垚閫�鏂欏崟</button>
+                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Hbtl" id="Hbtl">鍚堝苟閫�鏂�</button>
+                                </div>
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //杩囨护鏌ヨ
+        form.on('submit(Cx)', function () {
+            get_FastQuery();
+        })
+
+        //閫夋嫨鐢熶骇杞﹂棿
+        form.on('submit(btnDepartment)', function () {
+            btnDepartment();
+        })
+
+        //閫夋嫨鐗╂枡
+        form.on('submit(btnMaterial)', function () {
+            btnMaterial();
+        })
+
+        //閫夋嫨浜у搧
+        form.on('submit(btnCP)', function () {
+            btnCP();
+        })
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        })
+
+        //鏂板鍙枡鍗�
+        form.on('submit(Jl)', function () {
+            set_AddNew_Jl();
+        })
+
+        //鏂板涓嶈壇鍝侀��鏂欑敵璇峰崟
+        form.on('submit(Blptl)', function () {
+            set_AddNew_Blptl();
+        })
+
+        //鏂板浣欓噺閫�鏂欑敵璇峰崟
+        form.on('submit(Yltl)', function () {
+            set_AddNew_Yltl();
+        })
+
+        //鏂板鎶ュ簾閫�鏂欑敵璇峰崟
+        form.on('submit(Bftl)', function () {
+            set_AddNew_Bftl();
+        })
+       
+
+        //涓嬫煡
+        form.on('submit(Xc)', function () {
+            getXc();
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill()
+        {
+            set_InitGrid();
+            get_Display(sWhere);
+            Organ();
+            //鏃堕棿鍒濆鍖�
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+        }
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 500
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
+                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 170 }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
+                    , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160}
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
+                    , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
+                    , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
+                    , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+                    , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+                    , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
+                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
+                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
+                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+                ]]
+            };
+        }
+
+        //鏌ヨ鍔犺浇鏁版嵁
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鐢熶骇杞﹂棿
+        function btnDepartment() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#DepartmentID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+                    $("#DepartmentName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鐗╂枡
+        function btnMaterial() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#MaterialID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#MaterialName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#MaterialModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#MaterialNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //浜у搧
+        function btnCP() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '浜у搧鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#CPID").val(checkStatus.data[0].HItemID);//浜у搧id
+                    $("#CPName").val(checkStatus.data[0].HName);//浜у搧鍚嶇О
+                    $("#CPModel").val(checkStatus.data[0].HModel);//浜у搧瑙勬牸鍨嬪彿
+                    $("#CPNumber").val(checkStatus.data[0].HNumber);//浜у搧浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //蹇�熻繃婊�
+        function get_FastQuery() {
+            var HSeOrderBillNo = $("#HSeOrderBillNo").val(); //閿�鍞鍗曞彿
+            var DepartmentName = $("#DepartmentName").val(); //鐢熶骇杞﹂棿
+            var Organization = $("#Organization").val(); //缁勭粐
+            var MaterialNumber = $("#MaterialNumber").val(); //鐗╂枡浠g爜
+            var MaterialName = $("#MaterialName").val(); //鐗╂枡鍚嶇О
+            var MaterialModel = $("#MaterialModel").val(); //鐗╂枡瑙勬牸鍨嬪彿
+            var CPNumber = $("#CPNumber").val(); //浜у搧浠g爜
+            var CPName = $("#CPName").val(); //浜у搧鍚嶇О
+            var CPModel = $("#CPModel").val(); //浜у搧瑙勬牸鍨嬪彿
+            var HICMOBillNo = $("#HICMOBillNo").val(); //鐢熶骇璁㈠崟鍙�
+            var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+            var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+            var ps = $("#ps").prop("checked"); //浠呮樉绀烘湭瀹屽叏閰嶉��
+            if (ps) {
+                ps = 1; //浠呮樉绀烘湭瀹屽叏閰嶉��
+            }
+            else {
+                ps = 0; //鍏ㄩ儴
+            }
+            var user = sessionStorage["HUserName"]; //鍒跺崟浜�
+            sWhere = {
+                HSeOrderBillNo: HSeOrderBillNo,
+                DepartmentName: DepartmentName,
+                Organization: Organization,
+                MaterialNumber: MaterialNumber,
+                MaterialName: MaterialName,
+                MaterialModel: MaterialModel,
+                CPNumber: CPNumber,
+                CPName: CPName,
+                CPModel: CPModel,
+                HICMOBillNo: HICMOBillNo,
+                HBeginDate: HBeginDate,
+                HEndDate: HEndDate,
+                ps: ps,
+                user: user
+            };
+            get_Display(JSON.stringify(sWhere));
+            sWhere = "";
+        }
+
+        //琛屽唴鍒犻櫎蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == "Warehouse") {
+                        //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "浠撳簱鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "璋冨嚭浠撳簱": checkStatus.data[0].HName
+                                    , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
+                                })
+                                console.log(checkStatus.data[0].HItemID)
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                }
+            })
+        }
+
+        //鏂板鍙枡鍗�
+        function set_AddNew_Jl() {
+
+            if (table.cache['mainTable'].length == 0) {
+                return layer.msg("鏃犳暟鎹�,鏃犳硶鍙枡!");
+            }
+            else {
+                var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Sc_ComplementGoodBill/InsertCallGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            }
+        }
+
+        //鏂板涓嶈壇鍝侀��鏂欑敵璇峰崟
+        function set_AddNew_Blptl() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            else {
+                if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
+                    return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
+                }
+
+                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_BLP_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            }
+        }
+
+        //鏂板浣欓噺閫�鏂欑敵璇峰崟
+        function set_AddNew_Yltl() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            else {
+                if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
+                    return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
+                }
+                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_YL_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            }
+        }
+
+        //鏂板鎶ュ簾閫�鏂欑敵璇峰崟
+        function set_AddNew_Bftl() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            else {
+                if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
+                    return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
+                }
+                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_BF_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            }
+        }
+
+        //涓嬫煡
+        function getXc() {
+            var CheckStatus = table.checkStatus("mainTable");
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }
+            else {
+                var HSouceInterID = CheckStatus.data[0].HSouceInterID;
+                var HSourceEntryID = CheckStatus.data[0].HSourceEntryID;
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鍙枡鎷f枡淇℃伅鏌ヨ'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID 
+                })
+            }
+        }
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html"
new file mode 100644
index 0000000..94288e3
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html"
@@ -0,0 +1,234 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鍙枡鎷f枡淇℃伅鏌ヨ</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                    </div>
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>-->
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        HSouceInterID = 0;
+        HSourceEntryID = 0;
+        var HMaker = sessionStorage["HUserName"];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) != "undefined") {
+            sWhere = {
+                HSouceInterID: params[params[0]],
+                HSourceEntryID: params[params[1]],
+                user: HMaker
+            }
+            sWhere = JSON.stringify(sWhere);
+        }
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        })
+
+        //鏂板鍙枡鍗�
+        form.on('submit(Jl)', function () {
+            set_AddNew_Jl();
+        })
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill()
+        {
+            set_InitGrid();
+            get_Display(sWhere);
+        }
+
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 350
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
+                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 170 }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
+                    , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                    , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
+                    , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160}
+                    , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
+                    , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text'}
+                    , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
+                    , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
+                    , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+                    , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+                    , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
+                    , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
+                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
+                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
+                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+                ]]
+            };
+        }
+
+        //鏌ヨ鍔犺浇鏁版嵁
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ComplementGoodBill/HlpBillList',
+                type: "GET",
+                data: { "sWhere": sWhere},
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //琛屽唴鍒犻櫎蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == "Warehouse") {
+                        //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "浠撳簱鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "璋冨嚭浠撳簱": checkStatus.data[0].HName
+                                    , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
+                                })
+                                console.log(checkStatus.data[0].HItemID)
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                }
+            })
+        }
+
+        //鑾峰彇浼犻�掓暟鎹�
+        function get_UrlVars() {
+            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;
+        }
+
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
new file mode 100644
index 0000000..730698f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
@@ -0,0 +1,444 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>閫�鏂欑敵璇峰崟鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" 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="HBillNo" id="HBillNo" 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" style="margin-left: 4%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ユ</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="ProcMul" lay-verify="ProcMul" id="ProcMul" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnProcMul" id="btnProcMul" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </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="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on("toolbar(mainTable)", function (obj) {
+                switch (obj.event) {
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //閫夋嫨鐗╂枡
+            form.on('submit(btnMaterial)', function (data) {
+                btnMaterial();
+            })
+
+            //閫夋嫨鐢熶骇杞﹂棿
+            form.on('submit(btnHDept)', function (data) {
+                btnHDept();
+            })
+
+            //閫夋嫨宸ユ
+            form.on('submit(btnProcMul)', function (data) {
+                btnProcMul();
+            })
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //鏃ユ湡鍒濆鍖�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 570
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
+                        , { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
+                        , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 200, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 170 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 170 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 170 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 170 }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 170 }
+                        , { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 170 }
+                        , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 170 }
+                        , { field: '閫�鏂欎汉浠g爜', title: '閫�鏂欎汉浠g爜', width: 170 }
+                        , { field: '閫�鏂欎汉', title: '閫�鏂欎汉', width: 170 }
+                        , { field: '鎼繍浜轰唬鐮�', title: '鎼繍浜轰唬鐮�', width: 170 }
+                        , { field: '鎼繍浜�', title: '鎼繍浜�', width: 170 }
+                        , { field: '楠屾敹浜轰唬鐮�', title: '楠屾敹浜轰唬鐮�', width: 170 }
+                        , { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 170 }
+                        , { field: '閫�鏂欐ā寮�', title: '鍙枡妯″紡', width: 170 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 170 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 170 }
+                        , { field: '璐d换閮ㄩ棬浠g爜', title: '璐d换閮ㄩ棬浠g爜', width: 170 }
+                        , { field: '璐d换閮ㄩ棬鍚嶇О', title: '璐d换閮ㄩ棬鍚嶇О', width: 170 }
+                        , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 170 }
+                        , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 215 }
+                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 215 }
+                        , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 215 }
+                        , { field: '閫�鍥炴暟閲�', title: '閫�鍥炴暟閲�', width: 170 }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 170 }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
+                        , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 170 }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 170 }
+                        , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�', width: 170 }
+                    ]]
+                };
+            }
+
+            //閫夋嫨鐗╂枡
+            function btnMaterial() {
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#MaterialName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                        $("#MaterialModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                        $("#MaterialNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //閫夋嫨鐢熶骇杞﹂棿
+            function btnHDept() {
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HDeptName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //閫夋嫨宸ユ  鏆傛棤
+            function btnProcMul() {
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ユ鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    //, content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#ProcMul").val(checkStatus.data[0].HName);//宸ユ鍚嶇О
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鎶ュ簾鎹彿
+                $("#MaterialCode").val("");//鐗╂枡浠g爜
+                $("#MaterialName").val("");//鐗╂枡鍚嶇О
+                $("#MaterialModel").val("");//瑙勬牸鍨嬪彿
+                $("#HDeptName").val("");//鐢熶骇杞﹂棿
+                $("#ProcMul").val("");//宸ユ
+
+                $("#btnSearch").click();//鍒锋柊
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate =   $("#HBeginDate").val();//寮�濮嬫椂闂�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
+                var HBillNo = $("#HBillNo").val();//閿�鍞鍗曞彿
+                var MaterialNumber = $("#MaterialNumber").val();//鐗╂枡浠g爜
+                var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+                var MaterialModel = $("#MaterialModel").val();//瑙勬牸鍨嬪彿
+                var HDeptName = $("#HDeptName").val();//鐢熶骇杞﹂棿
+                var ProcMul = $("#ProcMul").val();//宸ユ
+                var Hmaker = sessionStorage["HUserName"] ;//褰撳墠鐢ㄦ埛
+                var HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+
+                sWhere = {
+                    HBeginDate: HBeginDate,
+                    HEndDate: HEndDate,
+                    HBillNo: HBillNo,
+                    MaterialNumber: MaterialNumber,
+                    MaterialName: MaterialName,
+                    MaterialModel: MaterialModel,
+                    HDeptName: HDeptName,
+                    ProcMul: ProcMul,
+                    Hmaker: Hmaker,
+                    HOrgID: HOrgID
+                }
+
+                get_Display(JSON.stringify(sWhere));
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var CheckStatus = table.checkStatus("mainTable");
+
+                if (CheckStatus.data.length != 1) {
+                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+                } else {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , btn1: function () {
+                            var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                            var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                            $.ajax({
+                                url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/DelCallGoodsBackRequestBill'
+                                , type: "GET"
+                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                                , success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            ////閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    })
+                }
+            }
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1