From 62b345640ccf2b1ef0ef85e7709ab104c4f53357 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 09 五月 2024 17:07:35 +0800
Subject: [PATCH] 1

---
 WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html |  115 +
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                  |   32 
 WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html  |    9 
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html     |   99 
 WebTM/views/index_Mobile.html                              |    6 
 WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html     | 1818 +++++++++++++++++++++------
 WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html            |  706 ++++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PreventErrMould.html   |  279 ++++
 WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA_old.html |  522 ++++++++
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html                |   51 
 WebTM/views/Baseset/基础资料/Gy_DepartmentList.html            |   42 
 WebTM/views/采购管理/应付单/Cg_PayableBill.html                   |   82 
 WebTM/layuiadmin/Scripts/webConfig.js                      |    4 
 WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html                 |    2 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html   |   83 +
 WebTM/WebTM.csproj                                         |    5 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html              |    2 
 17 files changed, 3,264 insertions(+), 593 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b323a7e..f3b8d3a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -321,11 +321,14 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
@@ -1385,7 +1388,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
-    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7078c95..78cc31c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     /*var WEBURL = "http://localhost:8083/API/";  //闄堥洴闈欐湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
+    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
    /* var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�*/
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index c7f3304..a08197c 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -34,12 +34,18 @@
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
         layui.use(['table', 'form', 'layer'], function () {
             var table = layui.table
                 , form = layui.form
                 , layer = layui.layer
                 , $ = layui.$;
+            var params = get_UrlVars();
+            var Type = params[params[0]];
+            if (Type == undefined || Type == '') {
+                Type = "HDept1";
+            }
 
             form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
                 //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -53,26 +59,36 @@
                 }
             });
 
-            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
-                //var sMainStr = JSON.stringify(table.cache['mainTable']);
-                var checkStatus = table.checkStatus('mainTable')
-                 , data = checkStatus.data;
-                parent.GetHDeptNameValue(data);
+            form.on('submit(FH)', function () {//閫夋嫨閮ㄩ棬
                 var index = parent.layer.getFrameIndex(window.name);
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 0) {
+                    parent.layer.close(index);
+                    return;
+                }
+                switch (Type) {
+                    case "HDept1":
+                        parent.GetHDeptNameValue(data);
+                        break;
+                    case "HDept2":
+                        parent.GetHDeptName2Value(data);
+                        break;
+                }
                 parent.layer.close(index);
             });
             RoadQuery($('#Value').val());
             table.render({
                 elem: '#mainTable'
                 // , url: '/demo/table/user/'
-               , data: []
-              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-              , cols: [[
-                  { type: 'checkbox' }
-                , { field: 'HItemID', title: '閮ㄩ棬ID', hide: true }
-                , { field: 'HNumber', title: '閮ㄩ棬浠g爜' }
-                , { field: 'HName', title: '閮ㄩ棬鍚嶇О', sort: true }
-              ]]
+                , data: []
+                , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+                , cols: [[
+                    { type: 'checkbox' }
+                    , { field: 'HItemID', title: '閮ㄩ棬ID', hide: true }
+                    , { field: 'HNumber', title: '閮ㄩ棬浠g爜' }
+                    , { field: 'HName', title: '閮ㄩ棬鍚嶇О', sort: true }
+                ]]
                 , page: true
                 , limits: [50, 500, 5000, 50000],
                 limit: 50
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index e03e0cb..293938b 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -276,6 +276,12 @@
                           </a>
                       </dd>
                       <dd>
+                          <a href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_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="妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鍣ㄥ叿鐐规璁板綍鍗�
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_PreventErrMould.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_PreventErrMould.html"
new file mode 100644
index 0000000..1736546
--- /dev/null
+++ "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_PreventErrMould.html"
@@ -0,0 +1,279 @@
+锘�<!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="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-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">
+                                            <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 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">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </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">
+                                                </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 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            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"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_PreventErrMouldList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+           
+            //鐩戝惉鎻愪氦
+            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);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_PreventErrMouldDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_PreventErrMould[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.闃查敊瑁呯疆浠g爜);//浠g爜
+                            $("#HName").val(data.闃查敊瑁呯疆鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
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_PreventErrMould.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_PreventErrMould.html"
new file mode 100644
index 0000000..442bbff
--- /dev/null
+++ "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_PreventErrMould.html"
@@ -0,0 +1,706 @@
+锘�<!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/PubCustom.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="" 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">
+                                                <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" 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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', '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 HModName = "Gy_PreventErrMould";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#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 '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;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_PreventErrMould";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery( );
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            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 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetPreventErrMouldValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                 btnrowDouble(obj);
+            });
+           
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+               //杩斿洖鏂规硶
+                parent.GetProjectMoneyValue(data);
+                parent.layer.close(index);
+            }
+             //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            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_PreventErrMouldList',
+                    type: "GET",
+                    async:false,
+                    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
+                            }
+                            ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_PreventErrMould";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            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 get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_PreventErrMould_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏂板
+            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_PreventErrMould.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            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_PreventErrMould.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            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_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            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_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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
+
+          
+            //#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
+
+            //#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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                          
+                            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 (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);
+                        }
+                    }, 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
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 8784302..3f00294 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
@@ -14,509 +14,1501 @@
     <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/zgqCustom/zgqCustom.js"></script>
-    <!--鑷畾涔夋牱寮�-->
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <style>
-        .maintitle {
-            background-color: #1492ff;
-            color: #fff;
-            padding: 5px 10px;
-            border: none;
-            border-radius: 4px;
-        }
-
-        .title {
-            border-left: 4px solid #1492ff;
-            padding-left: 6px;
-            margin: 20px 10px 4px;
-            font-size: 16px;
-            color: #333;
-        }
-
-        .buttom_box_little {
-            width: 60px;
-            height: 36px;
-            color: #fff;
-            background-color: #1492ff;
-            border-radius: 4px;
-            border: none;
-            margin: 10px;
-        }
-
-        .layui-input {
-            width: 93%;
-        }
-        .layui-inline, img {
-            display: block;
-            vertical-align: middle
-        }
-        .layui-input, .layui-textarea {
-            display: inline-block;
-            width: 100%;
-            padding-left: 10px;
-        }
-       
-        .laydate-time-list ol {
-            overflow-x: hidden !important;
-            overflow-y: auto !important;
-        }
-        .layui-form-label {
-            padding: 9px 5px;
-        }
-        .layui-input-block {
-            margin-left: 85px;
-            min-height: 36px;
+        .layui-col-xs8 {
+            width: 55.666667%;
         }
     </style>
 </head>
-
 <body>
-    <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
-            <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">鍣ㄥ叿鐢熶骇棰嗙敤鍗�</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>妯″叿棰嗙敤鍑哄簱鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
-                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs7">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_MouldProdOutBill_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-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>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                                    <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">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
+                                    <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">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HKeeperName" id="HKeeperName" lay-verify="HKeeperName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HKeeperID-BT" class="layui-btn" id="HKeeperID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <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">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HSecManagerName" id="HSecManagerName" lay-verify="HSecManagerName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSecManagerID-BT" class="layui-btn" id="HSecManagerID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <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">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HDeptID-BT" class="layui-btn" id="HDeptID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <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">
+                                                <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID">
+                                                    <option value="1">渚涘簲鍟�</option>
+                                                    <option value="2">瀹㈡埛</option>
+                                                    <option value="3">閮ㄩ棬</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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="HStockOrgName" id="HStockOrgName" lay-verify="HStockOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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 name="HDate" id="HDate" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                <!--妯″叿淇℃伅-->
+                                <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>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMouldBarCode" id="HMouldBarCode" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+                                    <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>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMouldName" id="HMouldName" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+                                    <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="HMouldModel" id="HMouldModel" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 10px; margin: 0px">
+                                        <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="wl-table" lay-filter="wl-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">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
                     </div>
-               
-                   
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
-                    <!--闅愯棌瀛楁-->
-                    <input type="hidden" name="lngBillKey" id="lngBillKey">
-                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
 
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+                    <!--澶辫触鎻愮ず闊�-->
+                    <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 () {
+
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
-                ,laydate = layui.laydate
+                , laydate = layui.laydate
                 , element = layui.element;
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var HBillType = '3802'
+            var HRedBlueFlag = false
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var HSourceFlag = false     //鏄惁宸叉壂鐮佹爣蹇�
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var listOption = [];
+            var columns = "";
+            var HModName = "Sc_MouldProdOutBill_PDA";
+            var ModRightName = "CE_MouldProdOut";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HInterID_Temp = params[params[1]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+            var HBillNo_Temp = params[params[2]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //#endregion
 
-            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
-            $("#HBarCode").focus();
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login_pda.html"; });
+            }
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡           
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
-            $("#HManagerName").val(sessionStorage["HUserName"]);     //鎿嶄綔鍛�
-            $("#HManagerID").val(sessionStorage["Czybm"]);     //鎿嶄綔鍛業D
-            $("#HDeptName").val(sessionStorage["HDept"]);     //閮ㄩ棬
-            $("#HDeptID").val(sessionStorage["HDeptID"]);     //閮ㄩ棬ID
-            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
-            var HProcExchBillNoFlag = false;
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 
-            //鑾峰彇鏈�澶у崟鎹彿
-            $.ajax({
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '3796' },
-                success: function (d) {
-                    console.log(d.data);
-                    $("#HInterID").val(d.data[0].HInterID);
-                    $("#HBillNo").val(d.data[0].HBillNo);
-                }
-            });
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin)', function (data) {
-                GetMeesageByBarCode();
-            });
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
 
-           
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
-                });
-            })
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {
-                if (!$("#HBarCode").val()) {
-                    layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HWHID").val()) {
-                    layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
-                    data.field.HSPID = "0";//搴撲綅
-                }
-                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
-                var sMainSub = JSON.stringify(data.field);
-                //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
-                var index = layer.load();
+            function CheckModRight() {
+                layer.load(3);
                 $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldProdOutBill/MouldProdOutBill_Save",
-                    async: true,
-                    data: { "sMainSub": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            layer.close(index);
-                            layer.msg(data.Message);
-                            $('#Saver').removeClass("buttom_box_little");
-                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
                         }
                         else {
-                            layer.close(index);
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                         }
                     },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 });
-            });
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-            })
-            //閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '閮ㄩ棬鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+                layer.closeAll("loading");
+            }
+            //#endregion
 
-            //璐熻矗浜哄脊绐�
-            form.on('submit(HManager)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '璐熻矗浜哄垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+            //鎴愬姛鎻愮ず闊�
+            function playSound_OK() {
+                console.log("playSound_OK");
+                var audio = document.getElementById("cs2");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
 
+            //#region 鍒濆鍖栫晫闈�
 
-            //浠撳簱
-            form.on('submit(Warehouse)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+            set_ClearBill();
 
-            //閫夋嫨浠撲綅
-            form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
-                var HWHID = $("#HWHID").val();
-                if (HWHID == "") {
-                    layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
-                    return;
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀鏂欍�佸彂鏂欍�佺粍缁囩瓑锛� new
+                $("#HWHID").val(sessionStorage["HWHID"]);
+                $("#HWHName").val(sessionStorage["HWHName"]);
+                $("#HDeptID").val(sessionStorage["HDeptID"]);
+                $("#HDeptName").val(sessionStorage["HDept"]);
+                $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+                $("#HSecManagerName").val(sessionStorage["HSecManager"]);
+                $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+                $("#HKeeperName").val(sessionStorage["HKeeper"]);
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOrgName").val(sessionStorage["Organization"]);
+                $("#HBillType").val("3802");
+                $("#HRedBlueFlag").val("false");
+                if (sessionStorage["HWhSPFlag"]) {
+                    $("#HStockPlaceID").val("0");
+                    $("#HStockPlaceName").val("");
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                 }
+                else {
+                    $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+                    $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                set_InitDate();         //鍒濆鍖栬〃鍗曟椂闂�
+                set_InitGrid();         //鍒濆鍖栬〃鏍�
+
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鍣ㄥ叿鏉$爜', title: '鍣ㄥ叿鏉$爜', width: 100 }
+                    , { field: '鍣ㄥ叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 100 }
+                    , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+                    , { field: '鍣ㄥ叿鍙�', title: '鍣ㄥ叿鍙�', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+                var pFocus = $("#HBarCode");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+            function set_InitDate() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 50
+                };
+            }
+
+            //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+            if (HInterID != 0) {
+                HSourceFlag = true;
+            }
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            else if (OperationType == 2) {
+                $("#HInterID").val(HInterID_Temp);
+                $("#HBillNo").val(HBillNo_Temp);
+                HInterID = $('#HInterID').val()
+                HBillNo = $('#HBillNo').val()
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                HSourceFlag = true;
+                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '2');
+            }
+            else {
+                //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+                        }
+                        else {
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                HSourceFlag = false;
+            }
+
+            //#endregion
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵弿浠撳簱鏉$爜
+            $('#HWHName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HWHName = $('#HWHName').val()
+                    if (HWHName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                if (result.data[0].HSPFlag == 0) {
+                                    $("#HStockPlaceName").attr("disabled", "disabled");
+                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                }
+                                else {
+                                    $("#HStockPlaceName").removeAttr("disabled");
+                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                }
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceName").removeAttr("disabled");
+                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撳簱鎸夐挳
+            form.on('submit(HWHID-BT)', function () {
                 layer.open({
                     type: 2
-                    , area: ['80%', '80%']
-                    , title: '浠撲綅鍒楄〃'
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
 
-            //浠ヤ笂涓簂ayui妯″潡
-        });
+            //#endregion
 
-        //杩斿洖閮ㄩ棬
-        function GetHDeptNameValue(obj) {  
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        //杩斿洖璐熻矗浜�
-        function GetHWorkerValue(obj) {
-            $("#HManagerName").val(obj[0].HName);
-            $("#HManagerID").val(obj[0].HItemID);
-        }
-        //浠撳簱 
-        function GetHWHValue(obj) {
-            $("#HWHName").val(obj[0].HName);
-            $("#HWHID").val(obj[0].HItemID);
-        }
-        //杩斿洖浠撲綅
-        function GetHSpValue(obj) {  //杩斿洖浠撲綅
-            if (obj.length == 0) {
-                layer.msg("璇峰厛閫夋嫨浠撲綅", { index: 0 });
-            } else {
-                $("#HSPName").val(obj[0].HName);
-                $("#HSPID").val(obj[0].HItemID);
-            }
-        }
-        //鎵潯鐮�
-        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
-            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
-            if (!HBarCode) {
-                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                return;
-            }
-            var index = layer.load();
-            $.ajax({
-                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                type: "GET",
-                data: { "HBarCode": HBarCode },
-                success: function (result) {
-                    if (result.data.length == 1) {
-                        var data = result.data[0];
-                        $("#HMouldID").val(data.hinterid);
-                        $("#HBarName").val(data.HName);
-                        $("#HBarSpec").val(data.HModel);
-                        $("#HBarModel").val(data.HModel2);
-                        $("#HLeaveLife").val(data.HLeaveLife);
-                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                        $("#HBarCode").css("background-color", "#efefef4d");
+            //#region 浠撲綅
+            //鎵弿浠撲綅鏉$爜
+            $('#HStockPlaceName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                    if ($("#HWHName").val() == '') {
+                        $("#HWHID").val("0");
+                    }
+                    var sHWHID = $("#HWHID").val()
+                    var HStockPlaceName = $('#HStockPlaceName').val()
+                    if (HStockPlaceName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
+                        return;
+                    }
 
-                        HProcExchBillNoFlag = true;
-                        layer.close(index);
-                    }
-                    else {
-                        layer.close(index);
-                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                },
-                error: function (err) {
-                    layer.close(index);
-                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HWhName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
                 }
             });
+
+            //浠撲綅鎸夐挳
+            form.on('submit(HSpID-BT)', function () {
+                //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 鍙戞枡鍛�
+            //鎵弿鍙戞枡鍛樻潯鐮�
+            $('#HKeeperName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HKeeperName = $('#HKeeperName').val()
+                    if (HKeeperName == '') {
+                        playSound();
+                        $("#HKeeperID").val("0");
+                        $("#HKeeperName").val("");
+                        layer.msg("鍙戞枡鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HKeeperName").select();
+                            $("#HKeeperName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HKeeperName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HKeeperID").val(result.data[0].HItemID);
+                                $("#HKeeperName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HKeeperID").val("0");
+                                $("#HKeeperName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HKeeperName").select();
+                                    $("#HKeeperName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //鍙戞枡鍛樻寜閽�
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 棰嗘枡鍛�
+            //鎵弿棰嗘枡鍛樻潯鐮�
+            $('#HSecManagerName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HSecManagerName = $('#HSecManagerName').val()
+                    if (HSecManagerName == '') {
+                        playSound();
+                        $("#HSecManagerID").val("0");
+                        $("#HSecManagerName").val("");
+                        layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HSecManagerName").select();
+                            $("#HSecManagerName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HSecManagerName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSecManagerID").val(result.data[0].HItemID);
+                                $("#HSecManagerName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HSecManagerID").val("0");
+                                $("#HSecManagerName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HSecManagerName").select();
+                                    $("#HSecManagerName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //棰嗘枡鍛樻寜閽�
+            form.on('submit(HSecManagerID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 閮ㄩ棬
+            //鎵弿閮ㄩ棬鏉$爜
+            $('#HDeptName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HDeptName = $('#HDeptName').val()
+                    if (HDeptName == '') {
+                        playSound();
+                        $("#HDeptID").val("0");
+                        $("#HDeptName").val("");
+                        layer.msg("閮ㄩ棬鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HDeptName").select();
+                            $("#HDeptName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HDeptName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HDeptID").val(result.data[0].HItemID);
+                                $("#HDeptName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HDeptID").val("0");
+                                $("#HDeptName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HDeptName").select();
+                                    $("#HDeptName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 寰�鏉ュ崟浣�
+            //鎵弿寰�鏉ュ崟浣嶆潯鐮�
+            $('#HSupName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HSupName = $('#HSupName').val()
+                    if (HSupName == '') {
+                        playSound();
+                        $("#HSupID").val("0");
+                        $("#HSupName").val("");
+                        layer.msg("寰�鏉ュ崟浣嶆潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HSupName").select();
+                            $("#HSupName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    if ($("#HSupTypeID").val() == '1') {    //渚涘簲鍟�
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetSupplier_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName, "HStockOrgID": HStockOrgID },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                    else if ($("#HSupTypeID").val() == '2') {   //瀹㈡埛
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetCustomer_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName, "HStockOrgID": HStockOrgID },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                    else {  //閮ㄩ棬
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                }
+            });
+
+            //寰�鏉ュ崟浣嶆寜閽�
+            form.on('submit(HSupID-BT)', function () {
+                var url = "";
+                var HSourceTitle = "";
+                if ($("#HSupTypeID").val() == '1') {
+                    url = '../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierListNew.html?HStockOrgID=' + HStockOrgID + '';
+                    HSourceTitle = "渚涘簲鍟�";
+                }
+                else if ($("#HSupTypeID").val() == '2') {
+                    url = '../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerListNew.html?HStockOrgID=' + HStockOrgID + '';
+                    HSourceTitle = "瀹㈡埛";
+                }
+                else {
+                    url = "../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDept2";
+                    HSourceTitle = "閮ㄩ棬";
+                }
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: [url, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 寰�鏉ョ被鍨嬮�夋嫨
+            form.on('select(HSupTypeID)', function (data) {
+                $("#HSupID").val("0");
+                $("#HSupName").val("");
+                $("#HSupName").select();
+                $("#HSupName").focus();
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(cmdSaver)', function (data) {
+                //浠撳簱銆佷粨浣嶃�佸彂鏂欍�侀鏂欍�侀儴闂ㄣ�佸線鏉ュ崟浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                    data.field.HWHID = $('#HWHID').val()
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                    data.field.HStockPlaceID = $('#HStockPlaceID').val()
+                }
+                if ($("#HKeeperName").val() == '') {
+                    $("#HKeeperID").val("0");
+                    data.field.HKeeperID = $('#HKeeperID').val()
+                }
+                if ($("#HSecManagerName").val() == '') {
+                    $("#HSecManagerID").val("0");
+                    data.field.HSecManagerID = $('#HSecManagerID').val()
+                }
+                if ($("#HDeptName").val() == '') {
+                    $("#HDeptID").val("0");
+                    data.field.HDeptID = $('#HDeptID').val()
+                }
+                if ($("#HSupName").val() == '') {
+                    $("#HSupID").val("0");
+                    data.field.HSupID = $('#HSupID').val()
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MouldController/set_SaveMouldProdOutBill_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+                                        btn2: function () {
+                                            if (OperationType == 2) {
+                                                parent.location.href = "../../妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html";
+                                            }
+                                            else {
+                                                parent.location.href = "../../../views/index_Mobile.html";
+                                            }
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Sc_MouldProdOutBill_PDA.html?OperationType=1&HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                    return;
+                }
+            });
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var HBarCode = data[0].鍣ㄥ叿鏉$爜
+
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/MouldController/set_DelMouldStockBillMain_Temp_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": HBarCode },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) {
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            //鏄剧ず琛ㄤ綋鏄庣粏
+                                            DisBillEntryList();
+                                        });
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                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(cmdCancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../views/index_Mobile.html";
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎵弿鍣ㄥ叿鏉$爜
+
+            //鎵弿鏉$爜
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                    $("#HBarCode").select();
+                    $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                }
+            });
+
+            //鏉$爜鎸夐挳
+            form.on('submit(HBarCode-BT)', function (data) {
+                GetMeesageByBarCode();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                }
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo =""
+                var sSourceBillType ="-1"
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/MouldController/set_DelMouldStockBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        });
+                    layer.closeAll("loading");
+                }
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/MouldController/Get_CheckTypeByMouldBarCode_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWhID": 0, "HSCSPID": 0, "HRedBlueFlag": HRedBlueFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                playSound_OK();
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '2');
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            playSound();
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
+                        }
+                    });
+                    layer.closeAll("loading");
+                }
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鍣ㄥ叿鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/MouldController/GetMouldBillEntryTmpList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
+                    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', totalRowText: '鍚堣' });
+                            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: 200 });
+                                            break;
+                                        default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 70, totalRow: true });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200 });
+                                        }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HMouldBarCode").val(result.data[0].HBarCode);
+                            if ($("#HMouldBarCode").val() == '') {
+                                $("#HMouldName").val("");
+                                $("#HMouldModel").val("");
+                            }
+                            else {
+                                $("#HMouldName").val(result.data[0].HMouldName);
+                                $("#HMouldModel").val(result.data[0].HMouldNo);
+                            }
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鍣ㄥ叿鏉$爜', title: '鍣ㄥ叿鏉$爜', width: 100 }
+                                , { field: '鍣ㄥ叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 100 }
+                                , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+                                , { field: '鍣ㄥ叿鍙�', title: '鍣ㄥ叿鍙�', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HMouldBarCode").val("");
+                            $("#HMouldName").val("");
+                            $("#HMouldModel").val("");
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撳簱淇℃伅
+        function GetHWHValue(obj)
+        {
+            if (obj.length > 0) {
+                $("#HWHName").val(obj[0].HName);
+                $("#HWHID").val(obj[0].HItemID);
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceID").val("0");
+                if (obj[0].HSPFlag == 0) {
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                }
+                else {
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撲綅淇℃伅
+        function GetHSpValue(obj) {
+            if (obj.length > 0) {
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+                $("#HWHName").val(obj[0].HWhName);
+                $("#HWHID").val(obj[0].HWHID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖鍙戞枡淇℃伅
+        function GetHKeeperValue(obj) {
+            if (obj.length > 0) {
+                $("#HKeeperName").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖棰嗘枡淇℃伅
+        function GetHSecManagerValue(obj) {
+            if (obj.length > 0) {
+                $("#HSecManagerName").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖閮ㄩ棬淇℃伅
+        function GetHDeptNameValue(obj) {
+            if (obj.length > 0) {
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖寰�鏉ュ崟浣嶄俊鎭�
+        function GetHSupValue(obj) {
+            if (obj.length > 0) {
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖寰�鏉ュ崟浣嶄俊鎭�
+        function GetHDeptName2Value(obj) {
+            if (obj.length > 0) {
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (HInterID == 0) {
+                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (HBillNo == '') {
+                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeperID").val() == "undefined" || $("#HKeeperID").val() == '0') {
+                layer.msg("鍙戞枡鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HSecManagerID").val() == "undefined" || $("#HSecManagerID").val() == '0') {
+                layer.msg("棰嗘枡鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鍒ゆ柇鏄惁宸叉壂鎻忓櫒鍏锋潯鐮�
+            if (!typeof (sSubStr) == "undefined") {
+                for (var i = 0; i <= sSubStr.length - 1; i++) { 
+                    if (parseFloat(sSubStr[i].HQty) > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
         }
     </script>
+
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html"
new file mode 100644
index 0000000..8784302
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html"
@@ -0,0 +1,522 @@
+锘�<!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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .maintitle {
+            background-color: #1492ff;
+            color: #fff;
+            padding: 5px 10px;
+            border: none;
+            border-radius: 4px;
+        }
+
+        .title {
+            border-left: 4px solid #1492ff;
+            padding-left: 6px;
+            margin: 20px 10px 4px;
+            font-size: 16px;
+            color: #333;
+        }
+
+        .buttom_box_little {
+            width: 60px;
+            height: 36px;
+            color: #fff;
+            background-color: #1492ff;
+            border-radius: 4px;
+            border: none;
+            margin: 10px;
+        }
+
+        .layui-input {
+            width: 93%;
+        }
+        .layui-inline, img {
+            display: block;
+            vertical-align: middle
+        }
+        .layui-input, .layui-textarea {
+            display: inline-block;
+            width: 100%;
+            padding-left: 10px;
+        }
+       
+        .laydate-time-list ol {
+            overflow-x: hidden !important;
+            overflow-y: auto !important;
+        }
+        .layui-form-label {
+            padding: 9px 5px;
+        }
+        .layui-input-block {
+            margin-left: 85px;
+            min-height: 36px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div class="maintitle">鍣ㄥ叿鐢熶骇棰嗙敤鍗�</div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
+                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+                                <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+               
+                   
+                    <div class="layer-footer" style="text-align: center;">
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
+                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+                </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
+                ,laydate = layui.laydate
+                , element = layui.element;
+
+            //鏃ユ湡鏃堕棿閫夋嫨鍣�
+            laydate.render({
+                elem: '#HDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HMakeDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HUpDateDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HCheckDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDeleteDate'
+                , type: 'datetime'
+            });
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡           
+            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            $("#HManagerName").val(sessionStorage["HUserName"]);     //鎿嶄綔鍛�
+            $("#HManagerID").val(sessionStorage["Czybm"]);     //鎿嶄綔鍛業D
+            $("#HDeptName").val(sessionStorage["HDept"]);     //閮ㄩ棬
+            $("#HDeptID").val(sessionStorage["HDeptID"]);     //閮ㄩ棬ID
+            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3796' },
+                success: function (d) {
+                    console.log(d.data);
+                    $("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+           
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {
+                if (!$("#HBarCode").val()) {
+                    layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HWHID").val()) {
+                    layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+                    data.field.HSPID = "0";//搴撲綅
+                }
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainSub = JSON.stringify(data.field);
+                //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MouldProdOutBill/MouldProdOutBill_Save",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg(data.Message);
+                            $('#Saver').removeClass("buttom_box_little");
+                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+            //鏂板
+            form.on('submit(Add)', function () {
+                window.location.reload();
+            })
+            //閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+            //璐熻矗浜哄脊绐�
+            form.on('submit(HManager)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐熻矗浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+
+            //浠撳簱
+            form.on('submit(Warehouse)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+            //閫夋嫨浠撲綅
+            form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
+                var HWHID = $("#HWHID").val();
+                if (HWHID == "") {
+                    layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
+                    return;
+                }
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //杩斿洖閮ㄩ棬
+        function GetHDeptNameValue(obj) {  
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        //杩斿洖璐熻矗浜�
+        function GetHWorkerValue(obj) {
+            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
+        //浠撳簱 
+        function GetHWHValue(obj) {
+            $("#HWHName").val(obj[0].HName);
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        //杩斿洖浠撲綅
+        function GetHSpValue(obj) {  //杩斿洖浠撲綅
+            if (obj.length == 0) {
+                layer.msg("璇峰厛閫夋嫨浠撲綅", { index: 0 });
+            } else {
+                $("#HSPName").val(obj[0].HName);
+                $("#HSPID").val(obj[0].HItemID);
+            }
+        }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
+
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index de75887..f3e55b1 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -1453,7 +1453,7 @@
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                                       //
-                                , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环     
+                                , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环 
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': dataArray[i].绋庨                                                             //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -1530,7 +1530,7 @@
                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                 , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                                , "HTaxPrice": dataArray[i].鍚◣鍗曚环
+                                , "HTaxPrice": dataArray[i].鍚◣鍗曚环 
                                 , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                               //
                                 , 'HRelTaxPrice': "0"
                                 , "HTaxRate": dataArray[i].绋庣巼
@@ -1643,14 +1643,33 @@
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
                     return false;
                 }
-                if ($("#HSupID").val() == "0") {
-                    layer.msg("渚涘簲鍟嗘湭閫夋嫨!");
-                    return false;
+                if ($("#HCurID").val() == 0) {
+                    layer.msg("璇烽�夋嫨甯佸埆锛�");
+                    return;
                 }
-
-                if ($("#HCurID").val() == "0") {
-                    layer.msg("甯佸埆鏈�夋嫨!");
-                    return false;
+                if ($("#HExRate").val() == 0) {
+                    layer.msg("璇疯緭鍏ユ眹鐜囷紒");
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
+                    return;
+                }
+                if ($("#HDeptID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
+                    return;
+                }
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒");
+                    return;
+                }
+                if ($("#HPSStyleID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�");
+                    return;
+                }
+                if ($("#HSSID").val() == 0) {
+                    layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�");
+                    return;
                 }
 
                 temp = $("#HExRate").val() + "";
@@ -1665,6 +1684,9 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -1729,12 +1751,6 @@
                         return false;
                     } else if (!ref.test(temp)) {
                         layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
-                    }
-
-                    //鍙戣揣浠撳簱闈炵┖楠岃瘉
-                    if (option.data[i]["HWHID"] == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
                         return false;
                     }
                 }
@@ -2242,6 +2258,7 @@
                             , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                             , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
                             , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                             , 'HDiscountRate': "0"                                                     //
                             , 'HRelTaxPrice': "0"
                             , "HTaxRate": dataArray[i].绋庣巼
@@ -2353,40 +2370,7 @@
             }
             //#endregion
 
-            //#region 淇濆瓨鏂规硶鏍¢獙
-            function AllowLoadData(data) {
-                if ($("#HCurID").val() == 0) {
-                    layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HExRate").val() == 0) {
-                    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HEmpID").val() == 0) {
-                    layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HDeptID").val() == 0) {
-                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSupID").val() == 0) {
-                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HPSStyleID").val() == 0) {
-                    layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSSID").val() == 0) {
-                    layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                return true;
-            }
-
-            //endregion
+            
 
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index e5c77e0..c55b9cc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1196,6 +1196,11 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -1787,8 +1792,8 @@
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
                                     "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
                                     "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�, "HWHID": checkStatus.data[j].HWHID,
-                                    "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+                                    "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+                                    "HWHID": checkStatus.data[j].HWHIDSub,"鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                 })
                                 j++;
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 7891a13..761cb10 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -393,7 +393,7 @@
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
-            window.OptionData = {};
+            window.OptionData = [];
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1402";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -704,7 +704,8 @@
                                 ,"HWHID": "0"
                                 , "鍙戣揣浠撳簱": ""
                                 , "HQty": checkStatus.data[i].鏁伴噺,
-                                "HPrice": "0", "HMoney": "0", "HRemark": ""
+                                "HPrice": checkStatus.data[i].鍗曚环,
+                                "HMoney": checkStatus.data[i].閲戦, "HRemark": ""
                             
                                 , "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
                                 , "HSourceBillType": checkStatus.data[i].HBillType
@@ -814,8 +815,8 @@
                                 , "HEmpName": data.涓氬姟鍛�
                                 , "HCusID": data.HCusID
                                 , "HCusName": data.瀹㈡埛
-                                , "HWHID": data.HWHID
-                                , "HWHName": data.鍙戣揣浠撳簱
+                                , "HWHID": data.涓讳粨搴揑D
+                                , "HWHName": data.涓诲彂璐т粨搴�
                                 , "HAddress": data.浜よ揣鍦板潃
                                 , "HDeptName": data.閮ㄩ棬
                                 , "HDeptID": data.HDeptID
@@ -1061,6 +1062,20 @@
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
                             })
                         }
                         //璁¢噺鍗曚綅
@@ -1073,7 +1088,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1089,6 +1104,16 @@
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HUnitID": OptionData.HItemID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1121,10 +1146,13 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1160,7 +1188,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓氬姟鍛樺垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1282,7 +1310,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓荤鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1300,7 +1328,7 @@
 
             //椤圭洰浠g爜
             function get_checkSearchHProNumber() {
-                var HOrgID = $("#HOrgID").val();
+                var HOrgID = sessionStorage["OrganizationID"];
                 //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
                 layer.open({
                     type: 2
@@ -1373,29 +1401,29 @@
             //浠ヤ笂鏄痩ayui妯″潡
         });
         // 鍩虹璧勬枡杩斿洖鏁版嵁
-        //function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
-        //{
-        //    $("#HEmpName").val(obj[0].HName);
-        //    $("#HEmpID").val(obj[0].HItemID);
-        //}
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
 
-        //function GetHSupValue(obj)  //杩斿洖瀹㈡埛
-        //{
-        //    $("#HCusName").val(obj[0].HName);
-        //    $("#HCusID").val(obj[0].HItemID);
-        //}
+        function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+        {
+            $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+            $("#HCusID").val(obj[0].HItemID);
+        }
 
-        //function GetHManagerValue(obj)  //杩斿洖涓荤
-        //{
-        //    $("#HManagerName").val(obj[0].HName);
-        //    $("#HManagerID").val(obj[0].HItemID);
-        //}
+        function GetHManagerValue(obj)  //杩斿洖涓荤
+        {
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
 
-        //function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
-        //{
-        //    $("#HDeptName").val(obj[0].HName);
-        //    $("#HDeptID").val(obj[0].HItemID);
-        //}
+        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
 
         //椤圭洰浠g爜
         function GetProjectBillValue(obj) {
@@ -1407,11 +1435,6 @@
             } else {
                 layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
             }
-        }
-
-        //鍙屽嚮杩斿洖浠撳簱
-        function GetHWHSubValue(data) {
-            OptionData = data[0]
         }
 
         function GetHWHValue(obj)  //杩斿洖浠撳簱
@@ -1428,6 +1451,24 @@
             }
             layui.table.render(option);
         }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            OptionData = data[0]
+        }
+
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
+        {
+            OptionData = obj;
+        }
+
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
+
+
+        
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 66e5a06..eff8284 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -169,7 +169,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,7 +346,7 @@
 
             var allVal;
             var HModName = "Xs_ReceivableBill";
-
+            window.OptionData = [];
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
 
@@ -1758,7 +1758,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1772,13 +1772,27 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "鐗╂枡浠g爜": checkStatus.data[0].HNumber
-                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
-                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                        , "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
                                         , "HUnitID": checkStatus.data[0].HUnitID
-                                        , "璁¢噺鍗曚綅": checkStatus.data[0].HUnitName
+                                        , "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1792,7 +1806,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1804,10 +1818,20 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HUnitID": OptionData.HItemID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -2425,6 +2449,15 @@
             $("#HSSName").val(obj[0].HName);
             $("#HSSID").val(obj[0].HItemID);
         }
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
+        {
+            OptionData = obj;
+        }
+
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
 
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 7a6d65a..e37911a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -91,7 +91,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞憳</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -245,7 +245,7 @@
                                             <label class="layui-form-label">浠撳簱</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -1243,7 +1243,7 @@
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
                         , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
                         , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
                         , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
@@ -1943,6 +1943,7 @@
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 var RowCount = 0;
                 for (var i = 0; i < option.data.length; i++) {
+
                     if (option.data[i]["HMaterID"] == "0") {
                         continue;
                     }
@@ -2552,10 +2553,6 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    //if (checkStatus.data.length != 1) {
-                                    //    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    //}
-
                                     var rowIndex = $(obj.tr).attr("data-index") * 1;
                                     for (var i = 0; i < checkStatus.data.length; i++) {
                                         if (rowIndex + i >= option.data.length) {
@@ -2650,7 +2647,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -2708,10 +2705,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HWHID": HDataEmp.HItemID
+                                            , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
 
@@ -3471,7 +3472,7 @@
 
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
         }
 
@@ -3493,12 +3494,12 @@
             $("#HSellSID").val(obj[0].HItemID);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataEmp = obj[0];
+            HDataEmp = obj;
         }
 
-        function GetUnitValue(obj)           //璁¢噺鍗曚綅
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataEmp = obj[0];
         }
@@ -3507,6 +3508,39 @@
         {
             HDataEmp = obj[0];
         }
+
+        //椤圭洰浠g爜
+        function GetProjectBillValue(obj) {
+            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+                $("#HProjectID").val(obj[0].HInterID);
+                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+
+            } else {
+                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+            }
+        }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            HDataEmp = data[0]
+        }
+
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+                        option.data[i]["HWHID"] = obj[0].HItemID;
+                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
+        }
+
 
         //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
         function getCustomerByCusID(HCusID) {
@@ -3626,38 +3660,7 @@
         }
         //#endregion
 
-        //椤圭洰浠g爜
-        function GetProjectBillValue(obj) {
-            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
-                $("#HProjectID").val(obj[0].HInterID);
-                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
-                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
-
-            } else {
-                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
-            }
-        }
-
-        //鍙屽嚮杩斿洖浠撳簱
-        function GetHWHSubValue(data) {
-            OptionData = data[0]
-        }
-
-        function GetHWHValue(obj)  //杩斿洖浠撳簱
-        {
-            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
-            $("#HWHID").val(obj[0].HItemID);
-            if (option.data.length > 0) {
-                for (var i = 0; i < option.data.length; i++) {
-                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
-                        option.data[i]["HWHID"] = obj[0].HItemID;
-                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
-                    }
-                }
-            }
-            layui.table.render(option);
-        }
-
+       
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
             //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
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_WorkTaskBill.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_WorkTaskBill.html"
index 4dbb87c..c568122 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_WorkTaskBill.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_WorkTaskBill.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/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 74d119e..4f99838 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -517,6 +517,9 @@
             //鍒濆鍖栧瓙琛�
             set_InitGrid();
 
+            //鍔ㄦ�佽幏鍙栨簮鍗�
+            HBillType();
+
             //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
             if (OperationType == 1) {                                                   //鏃犳簮鍗曟柊澧�
                /* $("#HItemID").val(0);*/
@@ -558,9 +561,6 @@
 
             //鍒濆鍖栫粍缁�
             Organ();
-
-            //鍔ㄦ�佽幏鍙栨簮鍗�
-            HBillType();
 
             //#region 椤甸潰鍒濆鍖栧悗锛屾牴鎹鎴疯幏鍙栧鎴蜂綑棰�
             getCustomerBalance($("#HSupID").val());
@@ -1817,7 +1817,7 @@
                             });
 
                             HOrgIDBar = data.HSTOCKORGID == null ? 0 : data.HSTOCKORGID;
-
+                            $("#BillType").val(data.HMainSourceBillType);
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
                             for (let i = 0; i < result.data.length; i++) {
@@ -2119,6 +2119,11 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -2327,10 +2332,13 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (HDataTemp.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HWHID": HDataTemp.HItemID
+                                            , "鍙戣揣浠撳簱": HDataTemp.浠撳簱鍚嶇О
+                                        })
+                                        HDataTemp = {};
+                                    }
                                 }
                             })
                         }
@@ -3183,17 +3191,17 @@
             layui.table.render(option);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataTemp = obj[0];
+            HDataTemp = obj;
         }
 
         function GetUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataTemp = obj[0];
         }
-
-        function GetHSubWHValue(obj)  //瀛愯〃鍙戣揣浠撳簱
+        
+        function GetHWHSubValue(obj)  //瀛愯〃鍙戣揣浠撳簱
         {
             HDataTemp = obj[0];
         }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 506de7f..f0bd441 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -405,7 +405,7 @@
                         , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
                         , { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
                         , { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
-                        //, { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
+                        , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
                         , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
                         , { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
                         , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index e8dd74f..f57a262 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -880,7 +880,7 @@
                                 , "HSupName": data.渚涘簲鍟�
                                 , "HEmpID": data.HEmpID
                                 , "HEmpName": data.涓氬姟鍛�
-                                , "HWHID": data.HWHID
+                                , "HWHID": data.涓昏〃浠撳簱ID
                                 , "HWHName": data.涓昏〃浠撳簱
                                 , "HSecManagerID": data.HSecManagerID
                                 , "HSecManagerName": data.楠屾敹鍛�
@@ -1839,10 +1839,9 @@
                             for (var i = 0; i < checkStatus.data.length; i++) {
                                 option.data.push({
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,"HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
-                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,
-                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,"HMoney": checkStatus.data[j].閲戦,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                     "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": checkStatus.data[j].浠风◣鍚堣
                                 })
@@ -2028,6 +2027,10 @@
 
             //#region 淇濆瓨鏂规硶鏍¢獙
             function AllowLoadData(data) {
+
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
                 if ($("#HWHID").val() == 0) {
                     layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -2064,6 +2067,76 @@
                     layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    if (option.data[i]["HUnitID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璁¢噺鍗曚綅鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍚◣鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //绋庣巼鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxRate"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //閲戦鏍煎紡鏍¢獙
+                    temp = option.data[i]["HMoney"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                    //鏀舵枡浠撳簱闈炵┖楠岃瘉
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏀舵枡浠撳簱鏈�夋嫨锛�");
+                        return false;
+                    }
+                }
+                //#endregion
                 return true;
             }
 

--
Gitblit v1.9.1