From 4bf6647c4f3f96611489c4d183a180830b11325b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 03 一月 2024 12:56:28 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html        |  348 +
 WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBillList_PDA.html       |  499 ++
 WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBillList_PDA.html      |  498 ++
 WebTM/views/index_Mobile.html                                 |  391 +
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html        |  371 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectBasis.html         |   48 
 WebTM/views/基础资料/公用基础资料/Gy_InspectMethod.html                 |   64 
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBackBillList_PDA.html      |  498 ++
 WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBackBillList_PDA.html   |  498 ++
 WebTM/views/基础资料/生产基础资料/Gy_BadResult.html                     |   62 
 WebTM/views/系统管理/用户管理/Gy_UserEmployee.html                    |   21 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html           |  436 +
 WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBackBillList_PDA.html     |  498 ++
 WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBackBillList_PDA.html    |  498 ++
 WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBillList_PDA.html       |  499 ++
 WebTM/views/基础资料/公用基础资料/Gy_InspectValue.html                  |   63 
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_PDA.html          |  499 ++
 WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html          |  499 ++
 WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBillList_PDA.html    |  498 ++
 WebTM/WebTM.csproj                                            |   23 
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBillList_PDA.html |  499 ++
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBillList_PDA.html  |  498 ++
 WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html             |   62 
 WebTM/views/IpadIndex.html                                    |    6 
 WebTM/views/系统管理/用户管理/Gy_UserProcess_Excel.html               |   29 
 WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBackBillList_PDA.html      |  498 ++
 WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html        |  499 ++
 WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBillList_PDA.html          |  499 ++
 WebTM/views/质量管理/基础建模/Gy_ErrType.html                         |  715 +++
 WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBillList_PDA.html        |  499 ++
 WebTM/views/基础资料/公用基础资料/Gy_InspectBasis.html                  |   62 
 WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html                |   52 
 WebTM/views/index.html                                        |    1 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadType.html              |    2 
 WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html         |  499 ++
 WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html                  |   27 
 WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBillList_PDA.html        |  499 ++
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html        |  499 ++
 WebTM/views/indexMenu.html                                    |    7 
 WebTM/views/基础资料/生产基础资料/Gy_BadType.html                       |   21 
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html              |  140 
 WebTM/views/grf/异常类型.grf                                      |  146 
 WebTM/views/基础资料/公用基础资料/Gy_QualityStd.html                    |   63 
 WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBackBillList_PDA.html    |  498 ++
 WebTM/views/系统管理/用户管理/Xt_UserSuplies_Excel.html               |    6 
 WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrType.html                |  334 +
 WebTM/views/系统管理/用户管理/Gy_UserProcess.html                     |   23 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                     |   59 
 WebTM/views/系统管理/用户管理/Gy_UserEmployee_Excel.html              |   28 
 49 files changed, 13,155 insertions(+), 426 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 60001b2..bdc3906 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -219,13 +219,33 @@
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBackBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鏉$爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鍒犳墭鍗昞Sc_DeletePackUnionBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_QiaoYi_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
     <Content Include="views\浜轰簨绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
@@ -359,6 +379,8 @@
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipMaintainBillReport.html" />
     <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Add_Edit_Gy_ErrType.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrType.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateReport.html" />
@@ -583,6 +605,7 @@
     <Content Include="views\grf\閿�鍞鍗�2.grf" />
     <Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
     <Content Include="views\grf\涓嶈壇绫诲瀷.grf" />
+    <Content Include="views\grf\寮傚父绫诲瀷.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 8eff9a3..74a5b5d 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1042,7 +1042,7 @@
                         <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
                                 <div class="cnt bottomright">
-                                    <span class="layui-icon layui-icon-pause imgicon"></span>
+                                    <span class="layui-icon layui-icon-play imgicon"></span>
                                     <span class="imgtitle">寮�宸�</span>
                                 </div>
                             </div>
@@ -1071,7 +1071,7 @@
                         <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
                                 <div class="cnt bottomright">
-                                    <span class="layui-icon layui-icon-pause imgicon"></span>
+                                    <span class="layui-icon layui-icon-read imgicon"></span>
                                     <span class="imgtitle">浣滀笟鎸囧涔�</span>
                                 </div>
                             </div>
@@ -1117,7 +1117,7 @@
                         <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
                                 <div class="cnt bottomright">
-                                    <span class="layui-icon layui-icon-play imgicon"></span>
+                                    <span class="layui-icon layui-icon-pause imgicon"></span>
                                     <span class="imgtitle">鍋滃伐</span>
                                 </div>
                             </div>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html"
new file mode 100644
index 0000000..972a0fe
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍏ュ簱鍗曪紙绾㈠瓧锛夌紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1248'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_OtherInBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_OtherInBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍏朵粬鍏ュ簱鍗曪紙绾㈠瓧锛�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_OtherInBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
new file mode 100644
index 0000000..e1050a8
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1203'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_OtherInBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_OtherInBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍏朵粬鍏ュ簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_OtherInBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html"
new file mode 100644
index 0000000..febcb1f
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍑哄簱鍗曪紙绾㈠瓧锛夌紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherOutBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1249'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_OtherOutBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_OtherOutBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍏朵粬鍑哄簱鍗曪紙绾㈠瓧锛�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_OtherOutBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
new file mode 100644
index 0000000..a311e60
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍑哄簱鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherOutBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1206'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_OtherOutBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_OtherOutBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍏朵粬鍑哄簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_OtherOutBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html"
new file mode 100644
index 0000000..96b4036
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿閫�搴撳崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_EntrustInBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1246'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_EntrustInBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_EntrustInBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '濮斿閫�搴撳崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_EntrustInBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
new file mode 100644
index 0000000..b5dbde2
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿鍏ュ簱鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_EntrustInBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1210'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_EntrustInBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_EntrustInBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '濮斿鍏ュ簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_EntrustInBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html"
new file mode 100644
index 0000000..2dfd85e
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿閫�鏂欏崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_EntrustOutBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1238'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_EntrustOutBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_EntrustOutBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '濮斿閫�鏂欏崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_EntrustOutBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
new file mode 100644
index 0000000..f9f8e8f
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>濮斿棰嗘枡鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_EntrustOutBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1211'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_EntrustOutBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_EntrustOutBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '濮斿棰嗘枡鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_EntrustOutBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html"
new file mode 100644
index 0000000..cc4022a
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇閫�搴撳崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_ProductInBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1245'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_ProductInBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_ProductInBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐢熶骇閫�搴撳崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_ProductInBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
new file mode 100644
index 0000000..a54cd01
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇鍏ュ簱鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_ProductInBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1202'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_ProductInBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_ProductInBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐢熶骇鍏ュ簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_ProductInBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html"
new file mode 100644
index 0000000..5436b2a
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Sc_ICMOReportBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '3711'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Sc_ICMOReportBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Sc_ICMOReportBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐢熶骇姹囨姤鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鐢熶骇姹囨姤/Sc_ICMOReportBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Sc_ICMOReportBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
new file mode 100644
index 0000000..95600e7
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐩存帴璋冩嫧鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MoveStockBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1207'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_MoveStockBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_MoveStockBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐩存帴璋冩嫧鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID + '&HSourceBillType=' + data[0].HSourceBillType, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_MoveStockBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html"
new file mode 100644
index 0000000..422f6e4
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍒嗘寮忚皟鍏ュ崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MoveStockStepInBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1251'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_MoveStockStepInBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_MoveStockStepInBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍒嗘寮忚皟鍏ュ崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockStepInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_MoveStockStepInBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html"
new file mode 100644
index 0000000..da84dab
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍒嗘寮忚皟鍑哄崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MoveStockStepOutBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1250'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_MoveStockStepOutBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_MoveStockStepOutBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鍒嗘寮忚皟鍑哄崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockStepOutBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_MoveStockStepOutBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html"
new file mode 100644
index 0000000..c1d28a1
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇閫�鏂欏崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MateOutBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1244'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_MateOutBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_MateOutBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐢熶骇閫�鏂欏崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/鐢熶骇棰嗘枡/Kf_MateOutBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_MateOutBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
new file mode 100644
index 0000000..1dba467
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_MateOutBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1204'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_MateOutBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_MateOutBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鐢熶骇棰嗘枡鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/鐢熶骇棰嗘枡/Kf_MateOutBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_MateOutBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html"
new file mode 100644
index 0000000..eb599a1
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_POStockInBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1239'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_POStockInBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_POStockInBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閲囪喘閫�鏂欏崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_POStockInBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html"
new file mode 100644
index 0000000..a427acc
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閲囪喘鍏ュ簱鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_POStockInBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1201'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_POStockInBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_POStockInBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閲囪喘鍏ュ簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_POStockInBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html"
new file mode 100644
index 0000000..57eb5c9
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html"
@@ -0,0 +1,498 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閿�鍞��璐у崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_SellOutBackBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1247'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_SellOutBackBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_SellOutBackBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閿�鍞��璐у崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_SellOutBackBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html"
new file mode 100644
index 0000000..bbd9d53
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html"
@@ -0,0 +1,499 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閿�鍞嚭搴撳崟缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_SellOutBillList_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--宸蹭笂浼犲垪琛�-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs2">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+                                        </div>
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+                                        <div class="layui-col-xs6">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+                                        </div>
+                                        <div class="layui-col-xs4">
+                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        var HBillType = '1205'
+        var HMaker = sessionStorage["HUserName"]
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var HBillNo = $('#HBillNo').val()
+        var HSourceBillNo = $('#HSourceBillNo').val()
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var Uploadedoption = [];   //宸蹭笂浼犲垪琛�
+        var columns = "";
+        var Uploadedcolumns = "";
+        var HModName = "Kf_SellOutBillList_PDA";
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+        }
+
+        //#region 鍒濆鍖栫晫闈�
+
+        set_ClearBill();
+
+        function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
+            element.tabChange('tab-Kf_SellOutBillList_PDA', '1');
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 50
+            };
+
+            //宸蹭笂浼犲垪琛�
+            Uploadedoption = {
+                elem: '#Uploaded-table'
+                //, toolbar: '#toolbarDemo'
+                //, totalRow: true
+                , height: 'full-280'
+                , page: true //寮�鍚垎椤�
+                , cellMinWidth: 90
+                , limit: 20
+            };
+        }
+
+        //#endregion
+
+
+        //#region 缂栬緫鍔熻兘鎺т欢
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閿�鍞嚭搴撳崟'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                //, content: ['../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
+                                    });
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒锋柊鍔熻兘鎺т欢
+
+        form.on('submit(cmdRefresh)', function () {
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
+        });
+
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+                                        break;
+                                    default:
+
+                                    if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                    }
+                                }
+                            }
+                        }
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+
+        //#endregion
+
+
+        //#region 閫�鍑哄姛鑳芥帶浠�
+
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html";
+            });
+        })
+
+        //#endregion
+
+
+        //#region 鏌ヨ鍔熻兘鎺т欢
+
+        form.on('submit(cmdQuery)', function () {
+            HBillNo = $("#HBillNo").val();
+            HSourceBillNo = $("#HSourceBillNo").val();
+            //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+            DisUploadedList();
+        });
+
+        //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+        function DisUploadedList() {
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (result) {
+                    var data = [];
+                    var col = [];
+                    if (result.count == 1) { 
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                UploadedtitleData[key] = result.list[key].ColmCols;
+                            }
+                        }
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'radio', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+                                        }
+                                }
+                            }
+                        }
+                        Uploadedcolumns = col;
+                        Uploadedoption.cols = [Uploadedcolumns];
+                        Uploadedoption.data = result.data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                    }
+                    else {
+                        Uploadedoption.cols = [[
+                            { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                            , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                            , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                            , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                            , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        Uploadedoption.data = data;
+                        //Uploadedoption.totalRow = true;
+                        table.render(Uploadedoption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            });
+        }
+
+        //#endregion
+
+
+        //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('Uploaded-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    element.tabChange('tab-Kf_SellOutBillList_PDA', '1');
+                                    //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                    DisTempEntryList();
+                                    //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+                                    DisUploadedList();
+                                });
+                            }
+                            else {
+                                playSound();
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                layer.closeAll("loading");
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+            }
+        });
+
+        //#endregion
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/grf/\345\274\202\345\270\270\347\261\273\345\236\213.grf" "b/WebTM/views/grf/\345\274\202\345\270\270\347\261\273\345\236\213.grf"
new file mode 100644
index 0000000..74df9dc
--- /dev/null
+++ "b/WebTM/views/grf/\345\274\202\345\270\270\347\261\273\345\236\213.grf"
@@ -0,0 +1,146 @@
+锘縶
+	"Version":"6.5.0.0",
+	"Title":"1a.绠�鍗曡〃鏍�",
+	"Author":"閿愭氮鎶ヨ〃杞欢",
+	"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":90000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":1,
+		"TopMargin":1,
+		"RightMargin":1,
+		"BottomMargin":1
+	},
+	"DetailGrid":{
+		"FixCols":20,
+		"AppendBlankRow":true,
+		"AppendBlankRowAtLast":true,
+		"AppendBlankCol":true,
+		"AppendBlankColWidth":40,
+		"GrowToBottom":true,
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鏉$爜缂栧彿"
+				},
+				{
+					"Name":"寮傚父绫诲瀷浠g爜"
+				},
+				{
+					"Name":"寮傚父绫诲瀷"
+				},
+				{
+					"Name":"澶囨敞"
+				},
+				{
+					"Name":"鏉$爜"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column1",
+				"Width":3.175
+			},
+			{
+				"Name":"Column2",
+				"Width":3.59833
+			},
+			{
+				"Name":"Column3",
+				"Width":5.00063
+			},
+			{
+				"Name":"Column4",
+				"Width":3.38667
+			}
+		],
+		"ColumnContent":{
+			"Height":0.608542,
+			"ColumnContentCell":[
+				{
+					"Column":"Column1",
+					"TextAlign":"MiddleCenter",
+					"DataField":"寮傚父绫诲瀷浠g爜"
+				},
+				{
+					"Column":"Column2",
+					"TextAlign":"MiddleCenter",
+					"DataField":"寮傚父绫诲瀷"
+				},
+				{
+					"Column":"Column3",
+					"TextAlign":"MiddleRight",
+					"DataField":"澶囨敞"
+				},
+				{
+					"Column":"Column4",
+					"TextAlign":"MiddleRight",
+					"DataField":"鏉$爜"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0.608542,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column1",
+					"TextAlign":"TopCenter",
+					"Text":"浠g爜\r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column2",
+					"TextAlign":"TopCenter",
+					"Text":"鍚嶇О\r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"TextAlign":"TopCenter",
+					"Text":"澶囨敞"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column4",
+					"TextAlign":"TopCenter",
+					"Text":"鏉$爜"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader2",
+			"Height":2.01083,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox1",
+					"Left":7.99042,
+					"Top":0.396875,
+					"Width":2.80458,
+					"Height":0.608542,
+					"Font":{
+						"Name":"瀹嬩綋",
+						"Size":157500,
+						"Weight":400,
+						"Charset":134
+					},
+					"Text":"寮傚父绫诲瀷"
+				}
+			]
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":1.5875
+		}
+	]
+}
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index ba29d8a..343f8bc 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -629,6 +629,7 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">妫�楠屾柟妗�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堢淮鎶�</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_ErrType.html">寮傚父绫诲瀷鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 30c7c5a..bb8fc77 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -82,7 +82,7 @@
                             <i class="layui-icon layui-icon-screen-full"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item" lay-unselect>
+                    <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
                         <a href="javascript:;">
                             <cite>
                                 <label name="UserName" id="UserName"></label>
@@ -91,14 +91,13 @@
                         <dl class="layui-nav-child">
                             <dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
                             <dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
-                            <hr>
                             <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
                         </dl>
                     </li>
 
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                         <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
                     </li>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index d648b06..39ade8d 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -85,83 +85,83 @@
                   </a>
                   <dl class="layui-nav-child">
                       <!--<dd>
-        <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭杩涚珯鎺ユ敹鍗�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_OLD.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭鍑虹珯姹囨姤鍗�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
-        </a>
-    </dd>-->
+                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭杩涚珯鎺ユ敹鍗�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_OLD.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭鍑虹珯姹囨姤鍗�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
+                </a>
+            </dd>-->
                       <!--<dd>
-        <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭濮斿鍙戝嚭鍗�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭濮斿鍙戝嚭鍗曟壒閲�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭濮斿鎺ユ敹鍗�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul_PDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭濮斿鎺ユ敹鍗曟壒閲�
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭姹囨姤鍏ュ簱鍒楄〃
-        </a>
-    </dd>
-    <dd>
-        <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            浜х嚎鍏抽敭浠剁粦瀹�
-        </a>
-    </dd>-->
+                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭濮斿鍙戝嚭鍗�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭濮斿鍙戝嚭鍗曟壒閲�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭濮斿鎺ユ敹鍗�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭濮斿鎺ユ敹鍗曟壒閲�
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭姹囨姤鍏ュ簱鍒楄〃
+                </a>
+            </dd>
+            <dd>
+                <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    浜х嚎鍏抽敭浠剁粦瀹�
+                </a>
+            </dd>-->
                       <!--<dd>
-        <a lay-href="" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            宸ュ簭姹囨姤鍗昻ull
-        </a>
-    </dd>-->
+                <a lay-href="" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    宸ュ簭姹囨姤鍗昻ull
+                </a>
+            </dd>-->
                       <!--<dd>
-        <a lay-href="" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿宸ュ簭璁″垝杞嚭鍗昻ull
-        </a>
-    </dd>-->
+                <a lay-href="" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    濮斿宸ュ簭璁″垝杞嚭鍗昻ull
+                </a>
+            </dd>-->
                       <!--<dd>
-        <a lay-href="" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
-        </a>
-    </dd>-->
+                <a lay-href="" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
+                </a>
+            </dd>-->
                       <dd>
                           <a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_QiaoYi.html?type=jzd" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -548,89 +548,89 @@
                   </a>
                   <dl class="layui-nav-child">
                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipDotCheckBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EquipDotCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鐐规璁板綍鍗�
                           </a>
                       </dd>
-                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鐐规璁板綍鍗曞垪琛�
                           </a>
                       </dd>
                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipMaintainBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EquipMaintainBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧淇濆吇璁板綍鍗�
                           </a>
                       </dd>
-                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧淇濆吇璁板綍鍗曞垪琛�
                           </a>
                       </dd>
                       <dd>
-                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧缁翠慨璁板綍鍗�
                           </a>
                       </dd>
                       <dd>
-                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧缁翠慨璁板綍鍗曞垪琛�
                           </a>
                       </dd>
-                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipConkBookBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipConkBookBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鏁呴殰鐧昏鍗�
                           </a>
                       </dd>
                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipConkBookBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EquipConkBookBillList_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鏁呴殰鐧昏鍗曞垪琛�
                           </a>
                       </dd>
-                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧缁翠慨楠屾敹鍗�
                           </a>
                       </dd>
-                       <dd>
-                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBillList_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧缁翠慨楠屾敹鍗曞垪琛�
                           </a>
                       </dd>
                       <!--<dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA_OLD.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧鐐规璁板綍鍗昈LD
-                          </a>
-                      </dd>-->
+                <a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA_OLD.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    璁惧鐐规璁板綍鍗昈LD
+                </a>
+            </dd>-->
                       <!--<dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧淇濆吇璁板綍鍗昈LD
-                          </a>
-                      </dd>-->
+                <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    璁惧淇濆吇璁板綍鍗昈LD
+                </a>
+            </dd>-->
                       <!--<dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_Mul.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧淇濆吇璁板綍鍗昣Mul
-                          </a>
-                      </dd>-->
+                <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_Mul.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    璁惧淇濆吇璁板綍鍗昣Mul
+                </a>
+            </dd>-->
                       <!--<dd>
-                          <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA_OLD.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧缁翠慨璁板綍鍗昈LD
-                          </a>
-                      </dd>-->
+                <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA_OLD.html" style="color: aqua;">
+                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                    璁惧缁翠慨璁板綍鍗昈LD
+                </a>
+            </dd>-->
                   </dl>
               </li>
               <!-- 璐ㄩ噺绠$悊 -->
@@ -662,57 +662,150 @@
                   </a>
                   <dl class="layui-nav-child">
                       <dd>
-                          <a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇姹囨姤/Sc_ICMOReportBillList_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              閲囪喘鍏ュ簱缂撳瓨鍒楄〃
+                              鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html" style="color: aqua;">
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBillList_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鐢熶骇棰嗘枡缂撳瓨鍒楄〃
+                              鐢熶骇鍏ュ簱鍗曠紦瀛樺垪琛�
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html" style="color: aqua;">
+                          <a lay-href="WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBillList_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鐢熶骇鍏ュ簱缂撳瓨鍒楄〃
+                              閲囪喘鍏ュ簱鍗曠紦瀛樺垪琛�
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html" style="color: aqua;">
+                          <a lay-href="WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBillList_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              閿�鍞嚭搴撶紦瀛樺垪琛�
+                              濮斿鍏ュ簱鍗曠紦瀛樺垪琛�
                           </a>
                       </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇棰嗘枡/Kf_MateOutBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              閿�鍞嚭搴撳崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              濮斿棰嗘枡鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍏朵粬鍑哄簱鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐩存帴璋冩嫧鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockStepOutBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍒嗘寮忚皟鍑哄崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockStepInBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍒嗘寮忚皟鍏ュ崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇閫�搴撳崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              濮斿閫�搴撳崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍏朵粬鍏ュ簱鍗曪紙绾㈠瓧锛夌紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇棰嗘枡/Kf_MateOutBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇閫�鏂欏崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              閿�鍞��璐у崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              濮斿閫�鏂欏崟缂撳瓨鍒楄〃
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBackBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鍏朵粬鍑哄簱鍗曪紙绾㈠瓧锛夌紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBillList_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇缁勬墭鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇璋冩嫧/璋冩嫧鎹㈡墭/Kf_MoveStockBillList_HuanTuo_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鎹㈡墭璋冩嫧鍗曠紦瀛樺垪琛�
+                          </a>
+                      </dd>
+                  </dl>
+              </li>
+              <!-- 鏍¢獙鍗曟嵁缂撳瓨鍒楄〃 -->
+              <li data-name="set" class="layui-nav-item">
+                  <a style="padding-left:20px;">
+                      <img src="../layuiadmin/myicon/杞﹂棿绠$悊.svg" alt="杞﹂棿绠$悊" style="width:25px;height:25px;margin-right: 5px;" />
+                      <cite>鏍¢獙鍗曟嵁缂撳瓨鍒楄〃</cite>
+                  </a>
+                  <dl class="layui-nav-child">
                       <dd>
                           <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鍏朵粬鍏ュ簱缂撳瓨鍒楄〃
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鍏朵粬鍑哄簱缂撳瓨鍒楄〃
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              濮斿鍏ュ簱缂撳瓨鍒楄〃
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              濮斿棰嗘枡缂撳瓨鍒楄〃
                           </a>
                       </dd>
                       <dd>
@@ -731,24 +824,6 @@
                           <a lay-href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               濮斿琛ユ枡鏍¢獙缂撳瓨鍒楄〃
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鐩存帴璋冩嫧缂撳瓨鍒楄〃
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBillList_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鐢熶骇缁勬墭鍗曠紦瀛樺垪琛�
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="WMS鎵爜妯″潡/鐢熶骇璋冩嫧/璋冩嫧鎹㈡墭/Kf_MoveStockBillList_HuanTuo_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鎹㈡墭璋冩嫧鍗曠紦瀛樺垪琛�
                           </a>
                       </dd>
                   </dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
index 7ff00a9..1999b57 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
@@ -149,32 +149,30 @@
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_InspectBasisList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_InspectBasisList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
index ad2e8ab..31a0819 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
@@ -9,6 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -76,14 +78,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -140,6 +145,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -158,6 +169,11 @@
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_InspectBasis";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -261,7 +277,10 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
-
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_InspectBasis";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -320,6 +339,25 @@
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
             //閲嶇疆蹇�熸煡璇�
             function set_ClearQuery() {
                 $("#HNumber").val("");
@@ -331,6 +369,10 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -501,7 +543,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
index 249fe04..37ecdb6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
@@ -9,6 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -76,14 +78,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -140,6 +145,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -159,6 +170,11 @@
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
                         break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_BadResult";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                 };
             });
             //鏌ヨ鎸夐挳
@@ -170,7 +186,25 @@
                 set_ClearQuery();
             });
             //#endregion
-
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
@@ -261,6 +295,10 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_BadResult";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -331,6 +369,10 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -501,7 +543,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
index 2bd379c..ce32e30 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
@@ -9,6 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -76,14 +78,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -119,7 +124,25 @@
             var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
 
             //#endregion
-
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栫晫闈�
@@ -140,6 +163,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -159,7 +188,13 @@
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
                         break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_InspectMethod";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                 };
+
             });
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
@@ -262,6 +297,11 @@
                             }
                             table.render(option);
 
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_InspectMethod";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -331,6 +371,10 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -501,7 +545,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
index e8b753f..24427e2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
@@ -9,6 +9,9 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
 
 </head>
 <body>
@@ -76,14 +79,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -120,6 +126,26 @@
 
             //#endregion
 
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栫晫闈�
@@ -140,6 +166,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -158,6 +190,11 @@
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_InspectValue";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -261,6 +298,10 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_InspectValue";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -331,6 +372,10 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -501,7 +546,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
index aeb62de..384d8ef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
@@ -9,6 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -76,14 +78,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -140,6 +145,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -159,7 +170,13 @@
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
                         break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_QualityStd";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                 };
+
             });
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
@@ -170,7 +187,25 @@
                 set_ClearQuery();
             });
             //#endregion
-
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
@@ -261,6 +296,10 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_QualityStd";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -331,6 +370,10 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -501,7 +544,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html"
index 8f43c6d..fbdc01a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫涓嶈壇鍘熷洜</title>
+    <title>鏂板/缂栬緫涓嶈壇绫诲瀷</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html"
index ecb731f..eefc671 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html"
@@ -9,6 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -76,14 +78,17 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"  id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -140,6 +145,12 @@
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
                         set_CheckBill(0);
@@ -159,6 +170,11 @@
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
                         break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_BadResult";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                 };
             });
             //鏌ヨ鎸夐挳
@@ -171,6 +187,25 @@
             });
             //#endregion
 
+            //琛岀偣鍑�
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
@@ -260,6 +295,10 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_BadResult";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -330,6 +369,11 @@
                 form.render('select');
 
                 sWhere = "";
+            }
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
             }
             //鏂板
             function set_AddNew() {
@@ -500,7 +544,7 @@
                 }
                 var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
                 var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 3; i++) {
+                for (var i = 0; i < urlLen.length - 4; i++) {
                     contentUrl += "../";
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
index 9e0906b..9e5a566 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
@@ -190,6 +190,26 @@
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
             });
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+
             //#endregion
 
 
@@ -604,6 +624,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                     type: "GET",
+                    async: false,
                     data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.data.length != 0) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 877e967..874c79d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -230,7 +230,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
@@ -239,6 +239,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>宸ヨ壓璺嚎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>宸ュ巶鏃ュ巻</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo2">
@@ -370,10 +372,10 @@
             obj.tr.find(':checkbox').prop('checked', flag);
             if (flag) {
                 obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
-                //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
             } else {
                 obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
-                //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
             }
             //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
             layui.each(table.cache.mainTable, function (i, l) {
@@ -489,8 +491,14 @@
                 case 'set_Souce':
                     set_Souce(data);
                     break;
-
-
+                //鏌ョ湅宸ヨ壓璺嚎
+                case 'set_Routing':
+                    set_Routing();
+                    break;
+                //宸ュ巶鏃ュ巻
+                case 'set_Calendar':
+                    set_Calendar();
+                    break;
             }
         });
 
@@ -526,7 +534,29 @@
             } else if (table.cache["mainTable"].length == 0) {
                 return layer.msg("鏃犳暟鎹�,鏃犳硶淇濆瓨!");
             } else {
-                set_AddNew();
+                var HYxjQty = 0;
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                   if (table.cache["mainTable"][i] != "") {                       
+                      if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
+                          HYxjQty++
+                      }                       
+                   }
+                }
+                if (HYxjQty > 0) {
+                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['纭', '鍙栨秷']
+                    }, function (index, layero) {
+                        //纭
+                        set_AddNew();
+                    }, function (index) {
+                        //鍙栨秷
+                        return
+                    });
+                } else {
+                    set_AddNew();
+                }                
             }
         });
 
@@ -722,7 +752,6 @@
             columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
             columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
             columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
-            columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
             columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
 
             columns.push({
@@ -881,6 +910,7 @@
             columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
             columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
             columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+            columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
             columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
             option_columns = columns;
             option = {
@@ -2376,7 +2406,7 @@
         function set_AddNew() {
 
             //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
-            var num = [];
+            var num = [];            
             for (var i = 0; i < table.cache["mainTable"].length; i++) {
                 if (table.cache["mainTable"][i] != "") {
                     if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
@@ -2388,7 +2418,7 @@
                     table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                     num.push(table.cache["mainTable"][i])
                 }
-            }
+            }           
 
             //var sMainStr = JSON.stringify(data.field);
             var sSubStr = JSON.stringify(num);
@@ -2626,6 +2656,98 @@
             });
         }
 
+        //鏌ョ湅宸ヨ壓璺嚎
+        function set_Routing() {
+            var checkStatus = table.checkStatus('mainTable');
+            var ajaxLoad = layer.load();
+            if (checkStatus.data.length != 1) {
+                layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            } else {
+                var TabData = checkStatus.data;
+                var HMaterID = TabData[0].HMaterID;
+                var HMaterNumber = TabData[0].鐗╂枡浠g爜;
+                var HMaterName = TabData[0].鐗╂枡鍚嶇О;
+                var HMaterModel = TabData[0].瑙勬牸鍨嬪彿;
+                var HRoutingInterID = 0;//宸ヨ壓璺嚎涓诲唴鐮�
+                var HStandardQty = 0; //鐗╂枡榛樿宸ヨ壓璺嚎鏁伴噺
+                //鏍规嵁鐗╂枡ID 鏌ヨ褰撳墠鐗╂枡鏄惁瀛樺湪 榛樿鐨勫伐鑹鸿矾绾�
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetRoutingListByMater',
+                    type: "GET",
+                    data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = data1.data
+                            //鑾峰彇褰撳墠閫夋嫨鐗╂枡鐨勯粯璁ゅ伐鑹鸿矾绾� 涓诲唴鐮�
+                            for (let i = 0; i < data.length; i++) {
+                                if (data[i].HStandard == 1) {
+                                    HRoutingInterID = data[i].HInterID;
+                                    HStandardQty++;
+                                }
+                            }
+                            if (HStandardQty > 1) {
+                                layer.alert("褰撳墠鐗╂枡瀛樺湪澶氫釜榛樿宸ヨ壓璺嚎锛岃杩涜璋冩暣");
+                            } else if (HStandardQty == 0) {
+                                layer.alert("褰撳墠鐗╂枡娌℃湁璁剧疆榛樿宸ヨ壓璺嚎锛岃鍓嶅線宸ヨ壓璺嚎缁存姢椤甸潰璁剧疆榛樿宸ヨ壓璺嚎");
+                            } else if (HStandardQty == 1) {
+                                layer.open({
+                                    type: 2
+                                    , area: ['100%', '100%']
+                                    , title: '宸ヨ壓璺嚎-缂栬緫'
+                                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                                    , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
+                                    , end: function () {
+                                        //鍒锋柊椤甸潰,
+                                        location.reload();
+                                    }
+                                })
+                            }
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+
+                            //褰撳墠鐢ㄦ埛鏈夋柊澧為〉闈�
+                            if (data1.IsHavingPermissions == 1) {
+                                layer.confirm('褰撳墠鐗╂枡娌℃湁璁剧疆宸ヨ壓璺嚎,鏄惁璺宠浆鑷冲伐鑹鸿矾绾挎柊澧為〉闈紵', function (index) {
+                                    layer.open({
+                                        type: 2
+                                        , area: ['100%', '100%']
+                                        , title: '宸ヨ壓璺嚎-缂栬緫'
+                                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                                        , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+                                        , end: function () {
+                                            //鍒锋柊椤甸潰,
+                                            location.reload();
+                                        }
+                                    })
+                                });
+                            } else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+        }
+
+        //璁剧疆宸ュ巶鏃ュ巻
+        function set_Calendar() {
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '宸ュ巶鏃ュ巻'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../../鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html?OperationType=3'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
         //鎺掍骇鍔熻兘
         function set_Arrangement() {
             var checkStatus = table.checkStatus('mainTable_ICMO')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index 6af9766..f98bced 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -56,6 +56,7 @@
                                 <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="btn_Exit" id="btn_Exit" style="padding:0 5px">閫�鍑�</button>
                                 <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
                             </div>
                         </div>
@@ -105,6 +106,10 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+
             var TagId = "";
             var option1 = [];
             var option2 = [];
@@ -234,7 +239,15 @@
                 get_Display_Tree(sWhere);
                 get_Display("");
             });
-
+            
+            //閫�鍑�
+            form.on('submit(btn_Exit)', function (data) {
+                if (OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2); 
+                }               
+            });
             //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -571,7 +584,17 @@
             }
             //#endregion
      
-
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
           
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee.html"
index bbe964f..169a097 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee.html"
@@ -40,6 +40,7 @@
                             <div class="layui-btn-group">
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel瀵煎叆</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -198,6 +199,26 @@
             });
         });
 
+        //瀵煎叆
+        form.on('submit(set_Excel)', function () {
+            set_Excel();
+        });
+        //瀵煎叆
+        function set_Excel() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鐢ㄦ埛鍏宠仈鑱屽憳鍒楄〃-瀵煎叆'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鐢ㄦ埛绠$悊/Gy_UserEmployee_Excel.html'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    set_InitGrid();
+                }
+            })
+        }
+
         //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
         function set_GridCellCheck(obj) {
             $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html"
index 1462944..67e33e0 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鐢ㄦ埛鍏宠仈鑱屽憳淇℃伅瀵煎叆</title>
+    <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>
@@ -85,7 +85,7 @@
         //鏂囦欢涓婁紶
         upload.render({
             elem: '#UpLoad',
-            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
+            url: GetWEBURL() + '/Xt_User/UserEmployeeBill_Excel',
             contentType: 'application/json',
             exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
             //data: {
@@ -164,24 +164,10 @@
                 , loading: false
                 , cols: [[
                     { type: 'checkbox', fixed: 'left' }
-                    , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜', width: 120 }
-                    , { field: '缁勭粐', title: '缁勭粐', width: 120 }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
-                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被', width: 120 }
-                    , {field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: '鎷夊姩瀹夊叏搴撳瓨閲�', width: 120 }
-                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: '鐗╂枡闇�姹備緵璐у懆鏈�', width: 120 }
-                    , { field: 'JIT鎻愯揣缁忔祹鎵归噺', title: 'JIT鎻愯揣缁忔祹鎵归噺', width: 120 }
-                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', width: 120 }
-                    , { field: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', width: 120 }
-                    , { field: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', width: 120 }
-                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟', width: 120 }
-                    , { field: 'JIT鏈�灏忚捣閫侀噺', title: 'JIT鏈�灏忚捣閫侀噺', width: 120 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { field: '鐢ㄦ埛浠g爜', title: '鐢ㄦ埛浠g爜', width: 120 }
+                    , { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О', width: 120 }
+                    , { field: '鑱屽憳浠g爜', title: '鑱屽憳浠g爜', width: 120 }
+                    , { field: '鑱屽憳鍚嶇О', title: '鑱屽憳鍚嶇О', width: 120 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
@@ -228,7 +214,7 @@
 
             $.ajax({
                 type: "POST",
-                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                url: GetWEBURL() + "/Xt_User/UserEmployeeBill_btnSave",
                 async: true,
                 data: { "sMainSub": sMainSub },
                 dataType: "json",
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess.html"
index c67c9d1..558443e 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess.html"
@@ -44,6 +44,7 @@
                             <div class="layui-btn-group">
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel瀵煎叆</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -158,6 +159,12 @@
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
+
+            //瀵煎叆
+            form.on('submit(set_Excel)', function () {
+                set_Excel();
+            });
+
             //鐢ㄦ埛淇℃伅寮圭獥
             form.on('submit(UserList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -213,6 +220,22 @@
                 });
             });
 
+            //瀵煎叆
+            function set_Excel() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢ㄦ埛鍏宠仈渚涘簲鍟嗗垪琛�-瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢ㄦ埛绠$悊/Gy_UserProcess_Excel.html'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        set_InitGrid();
+                    }
+                })
+            }
+
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html"
index 5b20bb8..ffff37c 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鐢ㄦ埛鍏宠仈宸ュ簭淇℃伅瀵煎叆</title>
+    <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>
@@ -85,7 +85,7 @@
         //鏂囦欢涓婁紶
         upload.render({
             elem: '#UpLoad',
-            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
+            url: GetWEBURL() + '/Xt_User/UserProcessBill_Excel',
             contentType: 'application/json',
             exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
             //data: {
@@ -164,24 +164,11 @@
                 , loading: false
                 , cols: [[
                     { type: 'checkbox', fixed: 'left' }
-                    , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜', width: 120 }
-                    , { field: '缁勭粐', title: '缁勭粐', width: 120 }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
-                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被', width: 120 }
-                    , {field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: '鎷夊姩瀹夊叏搴撳瓨閲�', width: 120 }
-                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: '鐗╂枡闇�姹備緵璐у懆鏈�', width: 120 }
-                    , { field: 'JIT鎻愯揣缁忔祹鎵归噺', title: 'JIT鎻愯揣缁忔祹鎵归噺', width: 120 }
-                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', width: 120 }
-                    , { field: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', width: 120 }
-                    , { field: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', width: 120 }
-                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟', width: 120 }
-                    , { field: 'JIT鏈�灏忚捣閫侀噺', title: 'JIT鏈�灏忚捣閫侀噺', width: 120 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { field: '鐢ㄦ埛浠g爜', title: '鐢ㄦ埛浠g爜', width: 120 }
+                    , { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О', width: 120 }
+                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 120 }
+                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
+                  
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
@@ -228,7 +215,7 @@
 
             $.ajax({
                 type: "POST",
-                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                url: GetWEBURL() + "/Xt_User/UserProcessBill_btnSave",
                 async: true,
                 data: { "sMainSub": sMainSub },
                 dataType: "json",
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html"
index 025aa7b..ae5dc19 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鐢ㄦ埛鍏宠仈渚涘簲鍟嗕俊鎭鍏�</title>
+    <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>
@@ -153,7 +153,7 @@
                     , { field: '鐢ㄦ埛浠g爜', title: '鐢ㄦ埛浠g爜', width: 120 }
                     , { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О', width: 120 }
                     , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�', width: 120 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
@@ -200,7 +200,7 @@
 
             $.ajax({
                 type: "POST",
-                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                url: GetWEBURL() + "/Xt_User/UserSupperBill_btnSave",
                 async: true,
                 data: { "sMainSub": sMainSub },
                 dataType: "json",
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 309bd7b..a9c2f57 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -509,7 +509,7 @@
                     { type: 'checkbox', totalRowText: '鍚堣琛�' }
                     , { type: 'numbers', title: '搴忓彿', totalRow: true }
                     , { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
-                      // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+                    // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
                     , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
                     , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "CheckHCenterID" }//涓嶅~
                     // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
@@ -543,7 +543,7 @@
                     //, { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
                     //, { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
                     //, { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
-                   
+
                     //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
                     //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
                     ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -625,6 +625,30 @@
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var HBillSubType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
             //var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+            var IsHavingPermissions = 0; //鎺掍骇椤甸潰璺宠浆杩囨潵鏃跺垽鏂敤鎴锋槸鍚︽湁宸ヨ壓璺嚎缂栬緫鏉冮檺,0浠g爜娌℃湁鏉冮檺锛�1浠h〃鏈夋潈闄�
+            //鎺掍骇椤甸潰璺宠浆缂栬緫鏌ョ湅宸ヨ壓璺嚎
+            if (HBillSubType == 4610 && OperationType == 3) {
+                HBillSubType = 3301
+                IsHavingPermissions = params[params[3]];
+                if (IsHavingPermissions == 0) {
+                    //娌℃湁宸ヨ壓璺嚎鐨勭紪杈戞潈闄愶紝绂佺敤鎸夐挳
+                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+                    $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+                    $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+                    $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+                }
+            }
+            //鎺掍骇椤甸潰璺宠浆鏂板宸ヨ壓璺嚎
+            if (HBillSubType == 4610 && OperationType == 1) {
+                HBillSubType = 3301
+
+                $("#HMaterID").val(params[params[3]]);//鐗╂枡ID
+
+                $("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠g爜
+                $("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
+                $("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
+            }
 
             if (HBillSubType == "SUB") {
                 //鏄剧ず宸ュ簭
@@ -923,19 +947,19 @@
                     //鍒楄缃�
                     case 'set_HideColumn':
                         get_HideColumn();
-                        break; 
+                        break;
                     //涓婁竴琛�
                     case 'btn_up':
                         btn_up(data);
-                        break; 
+                        break;
                     //涓嬩竴琛�
                     case 'btn_under':
                         btn_under(data);
-                        break; 
+                        break;
                     //鍒锋柊娴佹按鍙�
                     case 'btn_Refresh':
                         btn_Refresh(data);
-                        break; 
+                        break;
                 }
             });
 
@@ -1391,7 +1415,7 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    if (checkStatus.data.length ==0) {
+                                    if (checkStatus.data.length == 0) {
                                         return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                                     }
 
@@ -1408,7 +1432,7 @@
                                             NowNum = i + 1;
                                         }
                                     }
-                                 
+
                                     //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
                                     var WorkCente = [];
                                     var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
@@ -1483,7 +1507,7 @@
                                     //var HCenterID = 0;
                                     //var HCenterNUmber = "";
                                     //var HCenterName = "";
-                                   
+
 
                                     ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     //obj.update({
@@ -1673,7 +1697,7 @@
                                         , "HQCSchemeNumber_Fst": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
                                         , "HQCSchemeName_Fst": checkStatus.data[0].鏂规鍚嶇О
                                     })
-                                    
+
                                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) { }
@@ -1761,7 +1785,7 @@
                             $("input[name='checkboxHStandard']").prop("checked", false);
                         }
 
-                      
+
                         //涓昏〃
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                             "HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
@@ -2076,7 +2100,7 @@
             function btn_under(data) {
                 if (data.length != 1) {
                     layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
-                } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
+                } else if (option.data[option.data.length - 1]["HProcNo"] == data[0]["HProcNo"]) {
                     layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
                 } else {
                     var tables = [];
@@ -2183,6 +2207,17 @@
                 })
             }
             //#endregion
+            //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+            function getParams(key) {
+                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+                //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�    
+                var r = encodeURI(window.location.search).substr(1).match(reg);
+                if (r != null) {
+                    //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+                    return decodeURI(unescape(r[2]));
+                }
+                return null;
+            };
 
         });
     </script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
new file mode 100644
index 0000000..dfa04f5
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
@@ -0,0 +1,334 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫寮傚父绫诲瀷</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>寮傚父绫诲瀷</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鏉″舰鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                    <input type="hidden" class="layui-input" name="HOrgID" id="HOrgID" autocomplete="off">
+                                                    <input type="hidden" class="layui-input" name="HMakeEmp" id="HMakeEmp" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            $("#HOrgID").val(sessionStorage["OrganizationID"]);
+            $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            set_ClearBill();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: false,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            //閫夋嫨榛樿鐝粍
+            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐝粍鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠g爜);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    }
+                })
+            });
+       
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                $("#HUSEORGID").attr("disabled", true);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_ErrTypeDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_ErrTypeList[0];
+                            $("#HNumber").val(data.寮傚父绫诲瀷浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.寮傚父绫诲瀷);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄浠g爜);//鍔╄浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("#HUSEORGID").val(data.HUSEORGID);//缁勭粐
+                            $("#HUseFlag").val(data.浣跨敤鏍囪);//浣跨敤鏍囪
+                            $("#HBarCode").val(data.鏉″舰鐮�);//鏉″舰鐮�
+                            $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪==" "?false:true));//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                return true;
+            }
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
new file mode 100644
index 0000000..d1bfca0
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
@@ -0,0 +1,715 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>寮傚父绫诲瀷璁剧疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">寮傚父绫诲瀷浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">寮傚父绫诲瀷鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display: none;" 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="display: none; padding: 0 5px ;">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        var OptionData = [];
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var ins;
+            var HModName = "Gy_ErrType";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID"];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, "Gy_ErrType", HModName, sessionStorage["HUserName"]);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': get_Export();
+                        break;
+                    //鎵撳嵃
+                    case 'btn-print': get_PrintReport();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_BadReason/Gy_ErrTypeList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option);
+                            ins = table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (HNumber) {
+                    sWhere += " and 寮傚父绫诲瀷浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 寮傚父绫诲瀷 like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板寮傚父绫诲瀷',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍩虹寤烘ā/Add_Edit_Gy_ErrType.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫寮傚父绫诲瀷'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹寤烘ā/Add_Edit_Gy_ErrType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/StopGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+
+            //瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //鎵撳嵃
+            function get_PrintReport() {
+
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length != 0) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Gy_ErrType', 'yes']
+                        , resize: false
+                        , end: function () {
+                            if (OptionData.length > 0) {
+                                var GrfName = OptionData[0].HName;
+
+                                var dataPrint = [];
+                                for (var i = 0; i < data.length; i++) {
+                                    dataPrint.push(data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "preview",
+                                    //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
+                                    data: Customer
+                                };
+
+                                webapp_ws_ajax_run(args);
+                                OptionData = [];
+                            }
+
+                        }
+                    })
+                } else {
+                    layer.msg("璇烽�夋嫨鏁版嵁杩涜鎵撳嵃!");
+                }
+
+            }
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, "Gy_ErrType", HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鍙屽嚮杩斿洖鐢熶骇璧勬簮
+        function ReportPrint(data) {
+            OptionData = data
+        }
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index 9886fc1..2d224e5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -30,29 +30,127 @@
                         <form class="layui-form" action="" lay-filter="component-form-group">
                             <div class="layui-collapse">
                                 <div class="layui-colla-item">
+                                    <div class="layui-colla-title layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鏇村</span>
+                                        </div>
+                                    </div>
+                                    <!--绗竴灞傝繃婊�-->
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block" style="width:120px">
                                             <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="width:120px">
                                             <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block" style="width:120px">
                                             <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                         </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+                                                <option value=""></option>
+                                                <option value="鍚堟牸">鍚堟牸</option>
+                                                <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                            </select>
+                                        </div>
+
                                     </div>
                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                     </button>
                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+                                    <!--绗簩鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HModel" id="HModel">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">璐ㄦ鍛�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName1" id="HName1">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--绗笁鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">妫�楠岄」鐩�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName2" id="HName2">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName3" id="HName3">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鑷畾涔夎繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline" style="width:120px">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline" style="width:120px">
+                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -63,6 +161,14 @@
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                     <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 </div>
                             </script>
                         </form>
@@ -187,8 +293,8 @@
                     , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 160, sort: true }
                     , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 160, sort: true }
                     , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true, width: 160, sort: true }
-                    , { field: '浣滃簾鏃ユ湡 ', title: '浣滃簾鏃ユ湡', width: 215, sort: true }
-                    , { field: '鍗曟嵁绫诲瀷 ', title: '鍗曟嵁绫诲瀷 ', width: 115, sort: true }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 215, sort: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 115, sort: true }
                 ]]
                 //, skin: 'row' //琛ㄦ牸椋庢牸
                 // , even: true
@@ -284,9 +390,42 @@
                         var HBillType = "7506";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
                 };
             });
-
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadHBillNo(sqlWhere) {
                 var ajaxLoad = layer.load();
@@ -311,6 +450,11 @@
                                 }
                             });
                             layer.close(ajaxLoad);
+                            //杩囨护
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "7506";
@@ -331,11 +475,60 @@
             form.on('submit(btnSearch)', function (data) {//鏌ヨ
                 var sqlWhere = " and 1=1 ";
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HNumber = $("#HNumber").val();//鐗╂枡缂栫爜
+                var HName = $("#HName").val();//鐗╂枡鍚嶇О
+                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
                 var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
-                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡 
+                var HLastResult = $("#HLastResult").val();//鍒ゅ畾缁撹
+                var HName1 = $("#HName1").val();//璐ㄦ鍛樺悕绉�
+                var HName2 = $("#HName2").val();//妫�楠岄」鐩�
+                var HName3 = $("#HName3").val();//鐢熶骇璧勬簮鍚嶇О
+                var HProcExchBillNo = $("#HProcExchBillNo").val();//宸ュ簭娴佽浆鍗�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
 
                 if (HBillNo)
                     sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                if (HNumber)
+                    sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+                if (HName)
+                    sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+                if (HModel)
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+                if (HLastResult)
+                    sqlWhere += " and 鍒ゅ畾缁撹 like '" + HLastResult + "%'";
+                if (HName1)
+                    sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
+                if (HName2)
+                    sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+                if (HName3)
+                    sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
+                if (HProcExchBillNo)
+                    sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
 
                 if (HDate1) {
                     sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
@@ -417,6 +610,112 @@
                 var type = $(this).data('type');
                 active[type] ? active[type].call(this) : '';
             });
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_Management/QC_PatrolProcCheckBillMainValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_Management/CloseQC_PatrolProcCheckBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_Management/DropQC_PatrolProcCheckBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
 
             //鏂板
             function set_AddNew() {
@@ -565,6 +864,33 @@
                 })
             }
 
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+
+            //閫�鍑�
+            function Pub_Close(closeType) {
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+            }
+            
+
         });
     </script>
 </body>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index 712ca66..c28bac9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -16,6 +16,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
     <!--<style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -24,56 +25,175 @@
 </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-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="HBillNo" id="HBillNo">
+        <div class="layui-row layui-col-space15">
+            <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" style="width:120px">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+                                                <option value=""></option>
+                                                <option value="鍚堟牸">鍚堟牸</option>
+                                                <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                            </select>
+                                        </div>
+
+                                    </div>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                    <!--绗簩鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HModel" id="HModel">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">璐ㄦ鍛�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName1" id="HName1">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--绗笁鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">妫�楠岄」鐩�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName2" id="HName2">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName3" id="HName3">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鑷畾涔夎繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline" style="width:120px">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline" style="width:120px">
+                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
                                     </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>
-                        </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" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideButton" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                            </div>
-                        </script>
-                        <!--<div style="padding: 10px;">
+                            <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" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideButton" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                </div>
+                            </script>
+                            <!--<div style="padding: 10px;">
                             <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                             <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>-->
-                        <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
-                        <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
+                            <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
                             <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
                             <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
 
                         </div>-->
 
-                    </form>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-    <!--<script src="../../../layuiadmin/layui/layui.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>
+        <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -101,7 +221,12 @@
             //#endregion
 
             //#region 澶村伐鍏锋爮浜嬩欢
-
+            laydate.render({
+                elem: '#HDate1'
+            });
+            laydate.render({
+                elem: '#HDate2'
+            });
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
                     //鏂板
@@ -115,6 +240,33 @@
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
@@ -140,9 +292,79 @@
 
             //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery();
+                var sqlWhere = " ";
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HNumber = $("#HNumber").val();//鐗╂枡缂栫爜
+                var HName = $("#HName").val();//鐗╂枡鍚嶇О
+                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+                var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
+                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+                var HLastResult = $("#HLastResult").val();//鍒ゅ畾缁撹
+                var HName1 = $("#HName1").val();//璐ㄦ鍛樺悕绉�
+                var HName2 = $("#HName2").val();//妫�楠岄」鐩�
+                var HName3 = $("#HName3").val();//鐢熶骇璧勬簮鍚嶇О
+                var HProcExchBillNo = $("#HProcExchBillNo").val();//宸ュ簭娴佽浆鍗�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+
+                if (HBillNo)
+                    sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                if (HNumber)
+                    sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+                if (HName)
+                    sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+                if (HModel)
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+                if (HLastResult)
+                    sqlWhere += " and 鍒ゅ畾缁撹 like '" + HLastResult + "%'";
+                if (HName1)
+                    sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
+                if (HName2)
+                    sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+                if (HName3)
+                    sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
+                if (HProcExchBillNo)
+                    sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+
+                if (HDate1) {
+                    sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+                }
+                if (HDate2) {
+                    sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
+                }
+
+
+                get_FastQuery(sqlWhere);
             });
             //#endregion
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
@@ -285,9 +507,9 @@
                             DisPlay_HideColumn();
                             table.render(option);
 
-                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                            //    ColFilter();
-                            //}
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
 
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -327,8 +549,8 @@
             //    }
             //});
             //#region 蹇�熻繃婊�
-            function get_FastQuery() {
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            function get_FastQuery(sWhere) {
+                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
 
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -341,6 +563,113 @@
                 sWhere = "";
             }
             //#endregion
+
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillMainValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ProcessCheckBill/CloseQC_ProcessCheckBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ProcessCheckBill/DropQC_ProcessCheckBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
 
             //#region 鏂板
             function set_AddNew() {
@@ -630,6 +959,31 @@
                 })
             }
 
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+
+            //閫�鍑�
+            function Pub_Close(closeType) {
+                if (closeType == 1) {
+                    //鍏抽棴寮圭獥
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (closeType == 2) {
+                    //鍏抽棴椤电
+                    parent.layui.admin.events.closeThisTabs();
+                }
+            }
+
             ////鏌ヨ鎸夐挳
             //form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
             //    //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
@@ -700,7 +1054,7 @@
 
 
 
-    </script>
+        </script>
 
 </body>
 </html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index c30721f..f7b81b6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -29,32 +29,133 @@
 
                     <div class="layui-card-body">
                         <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
-                        <form class="layui-form" action="">
-                            <div class="layui-form-item">
-                                <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">
+                        <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" style="width:120px">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" >
+                                        <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+                                                <option value=""></option>
+                                                <option value="鍚堟牸">鍚堟牸</option>
+                                                <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                            </select>
+                                        </div>
+                                        
+                                    </div>
+                                    <div class="layui-inline">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query" id="f_Query">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <!--绗簩鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px" >
+                                                    <input type="text" class="layui-input" name="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HModel" id="HModel">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">璐ㄦ鍛�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName1" id="HName1">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--绗笁鎺掕繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">妫�楠岄」鐩�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName2" id="HName2">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇鍚嶇О</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HName3" id="HName3">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鑷畾涔夎繃婊�-->
+                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block" style="width:120px">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline" style="width:120px">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div> 
+                                            <div class="layui-inline" style="width:120px">
+                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                </div>
+                              
                             </div>
 
                         </form>
@@ -79,6 +180,14 @@
                             <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
                             <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                         </div>
                     </script>
                 </div>
@@ -306,8 +415,147 @@
                         var HBillType = "7505";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
                 };
             });
+            //鍒锋柊
+            function get_Refresh() {
+                $("#f_Query").trigger('click');
+            }
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ValueTable/QC_FirstPieceCheckValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                   $("#f_Query").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ValueTable/CloseQC_FirstPieceCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#f_Query").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_ValueTable/DropQC_FirstPieceCheckBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#f_Query").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
 
             ///鍔犺浇鏄剧ず鏁版嵁
             //function RoadHBillNo(sqlWhere) {
@@ -397,9 +645,9 @@
                             DisPlay_HideColumn();
                             table.render(option);
 
-                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                            //    ColFilter();
-                            //}
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "7505";
@@ -505,24 +753,61 @@
                 //if ($("#HStatus").val() != "")
                 //    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                var HNumber = $("#HNumber").val();//鐗╂枡浠g爜
+                var HNumber = $("#HNumber").val();//鐗╂枡缂栫爜
                 var HName = $("#HName").val();//鐗╂枡鍚嶇О
                 var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
                 var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
-                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡 
+                var HLastResult = $("#HLastResult").val();//鍒ゅ畾缁撹
+                var HName1 = $("#HName1").val();//璐ㄦ鍛樺悕绉�
+                var HName2 = $("#HName2").val();//妫�楠岄」鐩�
+                var HName3 = $("#HName3").val();//鐢熶骇璧勬簮鍚嶇О
+                var HProcExchBillNo = $("#HProcExchBillNo").val();//宸ュ簭娴佽浆鍗�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
 
                 if (HBillNo)
                     sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
                 if (HNumber)
-                    sqlWhere += " and 鐗╂枡浠g爜 like '%" + HNumber + "%'";
+                    sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
                 if (HName)
                     sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
                 if (HModel)
                     sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
-                //if ($("#HClStatus").val() != "")
-                //    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
-                //if ($("#HPURCHASEORGID").val() != "")
-                //    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+                if (HLastResult)
+                    sqlWhere += " and 鍒ゅ畾缁撹 like '" + HLastResult + "%'";
+                if (HName1)
+                    sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
+                if (HName2)
+                    sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+                if (HName3)
+                    sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
+                if (HProcExchBillNo)
+                    sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+
                 if (HDate1) {
                     sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
                 }
@@ -538,7 +823,10 @@
                 //        sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
                 //    }
                 //}
-
+                //if ($("#HClStatus").val() != "")
+                //    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+                //if ($("#HPURCHASEORGID").val() != "")
+                //    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
 
                 var Time = $("#Time").val();
                 var dd = new Date();
@@ -778,6 +1066,19 @@
                     }
                 })
             }
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
         });
     </script>
 </body>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index 33e5f8d..b668fba 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -796,6 +796,7 @@
                 if (data.length != 0) {
                     //layer.confirm("纭瑕佷笅鎺ㄥ悧?", function (index) {
                     var dataArray = [];
+                    var sHBillStatus = "";  //鍗曟嵁鐘舵��
                     for (var i = 0; i < data.length; i++) {
                         var temp = {
                             "HProjectID": data[i].HProjectID
@@ -811,28 +812,35 @@
                             , "HSourceBillType": data[i].鍗曟嵁绫诲瀷
                         }
                         dataArray.push(temp);
-                    }
-
-                    var datajson = {
-                        "data": dataArray
-                    };
-
-                    var url = encodeURI('../../椤圭洰绠$悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=4&res=' + JSON.stringify(datajson));
-
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '宸ヤ綔浠诲姟鍒楄〃-澶氳涓嬫帹'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: url
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        end: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            $("#btnSearch").trigger('click');
+                        if (data[i].HBillStatus != 2) {
+                            sHBillStatus = "1";
                         }
-                    })
-                    //})
+                    }
+                    //鍒ゆ柇鎵�閫夎涓槸鍚﹀瓨鍦ㄥ崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵�佺殑鏁版嵁
+                    if (sHBillStatus == "1") {
+                        layer.msg('鎵�閫夋嫨宸ヤ綔浠诲姟瀛樺湪鍗曟嵁鐘舵�佷笉涓哄凡瀹℃牳鐨勮锛屼笉鍏佽涓嬫帹锛�');
+                    }
+                    else {
+                        var datajson = {
+                            "data": dataArray
+                        };
+
+                        var url = encodeURI('../../椤圭洰绠$悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=4&res=' + JSON.stringify(datajson));
+
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '宸ヤ綔浠诲姟鍒楄〃-澶氳涓嬫帹'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: url
+                            , btn: ['纭畾'],
+                            // 鎸夐挳1 鐨勫洖璋�
+                            end: function (index, layero, that) {
+                                //鍒锋柊椤甸潰
+                                $("#btnSearch").trigger('click');
+                            }
+                        })
+                    }
                 } else {
                     layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
                 }
@@ -990,7 +998,7 @@
                 var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
                 var HOrgID = params[params[1]];
                 if (openType == 2) {
-                    sWhere += " and HBillStatus<3 and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+                    sWhere += " and HBillStatus=2 ";
                     $("#HOrgID").val(HOrgID);
                     form.render("select");
                     return true;

--
Gitblit v1.9.1