From 06b71d0f430810d1c24b2bfa0861f7534e8292ff Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 29 九月 2021 17:35:26 +0800
Subject: [PATCH] 增加工种模块+增加工资类型模块

---
 WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html       |  410 +++++++++
 /dev/null                                           |  268 -----
 WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBill.html    |  992 ++++++++++++++++++++++
 WebTM/layuiadmin/Scripts/webConfig.js               |    4 
 WebTM/views/index.html                              |   10 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html |    4 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html  |    4 
 WebTM/WebTM.csproj                                  |    6 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBill.html   |  991 ++++++++++++++++++++++
 9 files changed, 2,411 insertions(+), 278 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ca05538..0024f8f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -523,6 +523,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
@@ -558,8 +559,8 @@
     <Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillList.html" />
     <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
     <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
-    <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Kf_BarCodeEditDlg.html" />
-    <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Kf_BarCodeEditDlg.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBill.html" />
     <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Kf_BarCodeEditDlg.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
@@ -826,6 +827,7 @@
   <ItemGroup>
     <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
     <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+    <Folder Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index b6681e6..65518cb 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,12 @@
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
     //var WEBURL = "http://192.168.1.253:8080/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
-    //var WEBURL = "http://localhost/API/";
+    var WEBURL = "http://localhost/API/";
     return WEBURL
 }
 
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 8c46b36..7d0add3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -603,8 +603,8 @@
                                 <dd>
                                     <a>宸ヨ祫缁撶畻鍗�(鍏朵粬)</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
-                                        <dd><a lay-href="">宸ヨ祫缁撶畻鍗�(鍏朵粬)缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBill.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillList.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -749,6 +749,12 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>宸ヨ祫鍩虹璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <!-- 绯荤粺绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
new file mode 100644
index 0000000..153289a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -0,0 +1,410 @@
+锘�<!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/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <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;">宸ュ簭宸ヤ环浠ｇ爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="宸ュ簭宸ヤ环浠ｇ爜" id="宸ュ簭宸ヤ环浠ｇ爜">
+                                    </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="宸ュ簭浠ｇ爜" id="宸ュ簭浠ｇ爜">
+                                    </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="宸ュ簭鍚嶇О" id="宸ュ簭鍚嶇О">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
+                                        </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="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
+                                        </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="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="鐗╂枡鍚嶇О" id="鐗╂枡鍚嶇О">
+                                        </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="璧勬簮鍚嶇О" id="璧勬簮鍚嶇О">
+                                        </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="閮ㄩ棬鍚嶇О" id="閮ㄩ棬鍚嶇О">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+                , util = layui.util
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HMaterID', title: 'HMaterID', sort: true, hide: true }
+                        , { field: 'HProcID', title: 'HProcID', sort: true, hide: true }
+                        , { field: 'HSourceID', title: 'HSourceID', sort: true, hide: true }
+                        , { field: 'Hdeptid', title: 'Hdeptid', sort: true, hide: true }
+                        , { field: '宸ュ簭宸ヤ环璧勬枡浠ｇ爜', title: '宸ュ簭宸ヤ环璧勬枡浠ｇ爜' }
+                        , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        , { field: '鍗曚环', title: '鍗曚环' }
+                        , { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
+                        , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
+                        , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О' }
+                        , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_ProcPrice/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var 宸ュ簭宸ヤ环浠ｇ爜 = $("#宸ュ簭宸ヤ环浠ｇ爜").val();
+                var 宸ュ簭浠ｇ爜 = $("#宸ュ簭浠ｇ爜").val();
+                var 宸ュ簭鍚嶇О = $("#宸ュ簭鍚嶇О").val();
+                var 鐗╂枡浠ｇ爜 = $("#鐗╂枡浠ｇ爜").val();
+                var 璧勬簮浠ｇ爜 = $("#璧勬簮浠ｇ爜").val();
+                var 閮ㄩ棬浠ｇ爜 = $("#閮ㄩ棬浠ｇ爜").val();
+                var 鐗╂枡鍚嶇О = $("#鐗╂枡鍚嶇О").val();
+                var 璧勬簮鍚嶇О = $("#璧勬簮鍚嶇О").val();
+                var 閮ㄩ棬鍚嶇О = $("#閮ㄩ棬鍚嶇О").val();
+                if (宸ュ簭宸ヤ环浠ｇ爜) {
+                    sWhere += " and 宸ュ簭宸ヤ环璧勬枡浠ｇ爜 like '%" + 宸ュ簭宸ヤ环浠ｇ爜 + "%'";
+                }
+                if (宸ュ簭浠ｇ爜) {
+                    sWhere += " and 宸ュ簭浠ｇ爜 like '%" + 宸ュ簭浠ｇ爜 + "%'";
+                }
+                if (宸ュ簭鍚嶇О) {
+                    sWhere += " and 宸ュ簭鍚嶇О like '%" + 宸ュ簭鍚嶇О + "%'";
+                }
+                if (鐗╂枡浠ｇ爜) {
+                    sWhere += " and 鐗╂枡浠ｇ爜 like '%" + 鐗╂枡浠ｇ爜 + "%'";
+                }
+                if (璧勬簮浠ｇ爜) {
+                    sWhere += " and 璧勬簮浠ｇ爜 like '%" + 璧勬簮浠ｇ爜 + "%'";
+                }
+                if (閮ㄩ棬浠ｇ爜) {
+                    sWhere += " and 閮ㄩ棬浠ｇ爜 like '%" + 閮ㄩ棬浠ｇ爜 + "%'";
+                }
+                if (鐗╂枡鍚嶇О) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + 鐗╂枡鍚嶇О + "%'";
+                }
+                if (璧勬簮鍚嶇О) {
+                    sWhere += " and 璧勬簮鍚嶇О like '%" + 璧勬簮鍚嶇О + "%'";
+                }
+                if (閮ㄩ棬鍚嶇О) {
+                    sWhere += " and 閮ㄩ棬鍚嶇О like '%" + 閮ㄩ棬鍚嶇О + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#宸ュ簭宸ヤ环浠ｇ爜").val("");
+                $("#宸ュ簭浠ｇ爜").val("");
+                $("#宸ュ簭鍚嶇О").val("");
+                $("#鐗╂枡浠ｇ爜").val("");
+                $("#璧勬簮浠ｇ爜").val("");
+                $("#閮ㄩ棬浠ｇ爜").val("");
+                $("#鐗╂枡鍚嶇О").val("");
+                $("#璧勬簮鍚嶇О").val("");
+                $("#閮ㄩ棬鍚嶇О").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璧勬簮-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鐢熶骇鐝粍-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Gy_Group/EditBill',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
new file mode 100644
index 0000000..5149c3d
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
@@ -0,0 +1,991 @@
+锘�<!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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align:center;"><b>宸ヨ祫缁撶畻鍗�(涓汉)</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" 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 class="layui-col-xs4 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;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" 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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+                                                    <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
+                                                    <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
+                                                    <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
+                                                    <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+                                                    <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
+                                                    <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
+                                                    <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">閫夊崟鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                    <input id="HItemID" name="HItemID" type="hidden" />
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+    <script type="text/html" id="isEntrust">
+        <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+            <option value="false">鍚�</option>
+            <option value="true">鏄�</option>
+        </select>
+    </script>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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;
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = 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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '2205' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '2205' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+                GetICMOBillValue(linterid)
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
+                "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+                "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
+                "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
+                "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
+                "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+            }];
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , height: 'full-50'
+                , cellMinWidth: 110
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
+                    , { field: 'HProcName', title: '宸ュ簭鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '璧勬簮浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '璧勬簮鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '鑱屽憳浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '宸ユ椂', title: '宸ユ椂', edit: 'text', width: 100 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '宸ヤ环', title: '宸ヤ环', edit: 'text', width: 100 }
+                    , { field: '瀹氶娴姩姣旂巼', title: '瀹氶娴姩姣旂巼', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创鏁伴噺', title: '琛ヨ创鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创閲戦', title: '琛ヨ创閲戦', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创鍚堣', title: '琛ヨ创鍚堣', edit: 'text', width: 100 }
+                    , { field: '鎵ｆ灏忚', title: '鎵ｆ灏忚', edit: 'text', width: 100 }
+                    , { field: '鍖呰鏁伴噺', title: '鍖呰鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '鍖呰鍗曚环', title: '鍖呰鍗曚环', edit: 'text', width: 100 }
+                    , { field: '鍖呰閲戦', title: '鍖呰閲戦', edit: 'text', width: 100 }
+                    , { field: '鍖呰绫诲瀷', title: '鍖呰绫诲瀷', edit: 'text', width: 100 }
+                    , { field: '閲戦', title: '閲戦', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '鐢熶骇浠诲姟鍗旾D', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鐢熶骇浠诲姟鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '宸ュ簭姹囨姤鍗旾D', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '宸ュ簭姹囨姤鍗曞瓙ID', edit: 'text', width: 100 }
+                    , { field: 'HMaterName', title: '宸ュ簭璁″垝鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟绫诲瀷', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏宠仈鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏宠仈閲戦', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '琛屽叧闂汉', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏抽棴鏃堕棿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鎵嬪伐鍏抽棴', edit: 'text', width: 100 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+                , done: function (res, curr, count) {
+                    option.data = res.data;
+                    //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                    $('.layui-form-select').find('input').unbind("blur");
+                    //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                    $('tr').each(function (e) {
+                        var $cr = $(this);
+                        var dataIndex = $cr.attr("data-index");
+                        $.each(option.data, function (index, value) {
+                            if (value.LAY_TNDEX == dataIndex) {
+                                $cr.find('input').val(value.isEntrust);
+                            }
+                        });
+                    });
+                }
+                , text: {
+                    none: '鏃犳暟鎹紒'
+                }
+            };
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //鏄惁榛樿宸ヨ壓
+            form.on('checkbox(checkboxHBLFlag)', function (data) {
+                $("#HBLFlag").val(data.elem.checked);
+            });
+            //鏄惁鍚敤
+            form.on('checkbox(checkboxHUseFlag)', function (data) {
+                $("#HUseFlag").val(data.elem.checked);
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
+                    "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+                    "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
+                    "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
+                    "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
+                    "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HProcCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ュ簭鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HProcName: checkStatus.data[0].宸ュ簭
+                                        , HProcID: checkStatus.data[0].HItemID
+                                        , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HWorkCenterCheck') {//宸ヤ綔涓績
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鍔犲伐涓績鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績
+                                        , HCenterID: checkStatus.data[0].HItemID
+                                        , 宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HSupCheck') {//渚涘簲鍟�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        渚涘簲鍟�: checkStatus.data[0].HName
+                                        , HSupID: checkStatus.data[0].HItemID
+                                        , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].HNumber
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+                //鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
+                if (obj.event === 'isEditCheck') {
+                    var flag = obj.data.isEdit;
+                    var flagValue = obj.data.isEditValue;
+                    if (flagValue === "false") {
+                        flagValue = "true";
+                        flag = "鏄�";
+                    }
+                    else if (flagValue === "true") {
+                        flagValue = "false";
+                        flag = "鍚�";
+                    }
+                    else {
+                        flagValue = "false";
+                        flag = "鍚�";
+                    }
+                    obj.update({
+                        isEdit: flag
+                        , isEditValue: flagValue
+                    });
+                }
+            });
+
+            $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
+                if (event.keyCode == 118) {
+                    layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
+                }
+            });
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if ($("#HICMOInterID").val() == 0) {
+                    layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
+                    layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanBeginDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanEndDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sSubTable = table.cache['mainTable'];
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HProcNo) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (sSubTable[i].HProcNo == 0) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HProcID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HCenterID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (sSubTable[i].isEntrust == "true") {
+                        if (!sSubTable[i].HSupID) {
+                            var indexRow = i + 1;
+                            layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return;
+                        }
+                    }
+                }
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    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 () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#set_SaveBill').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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+
+            //#region 琛ㄥご淇℃伅鐝粍寮圭獥
+            form.on('submit(HGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Employee)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '涓荤鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+           
+         
+
+         
+
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(Cancel)', function () {
+                if (OperationType == 1) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    Pub_Close(1);
+                }
+            })
+
+
+            //杩斿洖鐢熶骇浠诲姟鍗�
+            function GetICMOBillValue(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[result.data.length - 1];
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                            $("#HMaterID").val(data.hmaterid);
+                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterID2").val(data.hmaterid);
+                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
+                            $("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
+                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                            $("#HBatchNo").val(data.鎵瑰彿);
+                            $("#HUnitID").val(data.hunitid);
+                            $("#HUnitName").val(data.璁￠噺鍗曚綅鍚嶇О);
+                            $("#HUnitNumber").val(data.璁￠噺鍗曚綅浠ｇ爜);
+                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                            $("#HWorkShopID").val(data.hdeptid);
+                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                            $("#HProdMaterCode").val(data.浜у搧CODE);
+                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                            $("#HImportNote").val(data.閲嶈鎻愮ず);
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+                //txtHBillNo.Text = sBillNo;
+                GetICMOBillDetail(hmainid);
+            }
+
+            function GetICMOBillDetail(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+            }
+
+            //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+            form.on('select(isEntrust)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.isEntrust = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+
+        //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
+        var subProcName, subProcNumber, subProcID,
+            subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
+            subSupName, subSupNumber, subSupID,
+            HReasonName, ReasonID, EmpName,
+            ZRProcName, QRName;
+
+
+        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
+        {
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
+        }
+
+        //杩斿洖浜у搧
+        function GetHMaterNameValue(obj) {
+            $("#HMaterName2").val(obj[0].HName);
+            $("#HMaterID2").val(obj[0].HItemID);
+            $("#HMaterNumber2").val(obj[0].HNumber);
+            $("#HMaterHModel2").val(obj[0].HModel);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖璐ｄ换浜�
+            EmpName = obj[0].HName;
+            // $("#HEmpName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        function GetHProcValue(obj) {
+            subProcName = obj[0].宸ュ簭;
+            subProcID = obj[0].HItemID;
+            subProcNumber = obj[0].HProcNumber;
+        }
+        function GetHSupValue(obj) {
+            subSupName = obj[0].HName;
+            subSupID = obj[0].HItemID;
+            subSupNumber = obj[0].HNumber;
+        }
+        function GetWorkCenterValue(obj) {
+            subWorkCenterName = obj[0].宸ヤ綔涓績;
+            subWorkCenterID = obj[0].HItemID;
+            subWorkCenterNumber = obj[0].宸ヤ綔涓績浠ｇ爜;
+        }
+        function GetHZRValue(obj) {   //杩斿洖璐ｄ换宸ュ簭
+            ZRProcName = obj[0].宸ュ簭;
+            //$("#HZRProcName").val(obj[0].宸ュ簭);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        //HWorker
+        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+            QRName = obj[0].HName;
+            //$("#HQRName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Kf_BarCodeEditDlg.html"
deleted file mode 100644
index 4bdb342..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Kf_BarCodeEditDlg.html"
+++ /dev/null
@@ -1,268 +0,0 @@
-锘�<!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.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 class="layui-fluid">
-        <div class="layui-card" style="padding: 1%">
-            <div class="layui-card-body" style="padding: 15px;">
-                <form class="layui-form" action="" lay-filter="component-form-group">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">鏁伴噺</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" style="width:100%" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-tab">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">鏉＄爜鏄庣粏</li>
-                            <li lay-id="2">鏉＄爜妗ｆ</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
-                                <div class="layui-card-header"></div>
-                                <div class="layui-form-item">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdChange">璋冩暣</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDel">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
-                                </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HBarcode" id="HBarcode" lay-verify="HBarcode" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡妗ｆ</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HM" id="HM" lay-verify="HM" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ュ崟浣�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input">
-                                    </div>
-         
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撳簱</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撲綅</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSCWID" id="HSCWID" lay-verify="HSCWID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="margin-bottom: 20px;">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="button1">杩斿洖</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-        <script src="../../../layuiadmin/layui/layui.js"></script>
-        <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
-        <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script>
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        //鑾峰彇椤甸潰璺宠浆鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-        } else {
-            var HInterID = params[params[0]];//鍗曟嵁ID
-            var HMaterID = params[params[1]];//鐗╂枡ID
-            var HAuxPropID = params[params[2]];//杈呭姪灞炴��
-            var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
-            var HWhID = params[params[4]];//浠撳簱ID
-            var HSPID = params[params[5]];//浠撲綅ID
-            var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
-            var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
-            var HBatchNo = params[params[8]];//鎵规
-            var HSourceInterID = params[params[9]];//婧愬崟涓籌D
-            var HSourceEntryID = params[params[10]];//婧愬崟瀛怚D
-            var HBillType = params[params[11]];//鍗曟嵁绫诲瀷
-            var HBarCode = params[params[12]];//鏉＄爜
-        }
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'table'], function () {
-            var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form;
-
-
-            table.render({
-            elem: '#mx-table'
-                //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                 ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                , where: {
-                    "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                    , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                },
-             cols: [[
-             { type: 'radio' }
-           , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-           , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-           , { field: 'HQty', title: '鏁伴噺', width: 100 }
-           , { field: 'HBatchNo', title: '鎵规', width: 150 }
-           , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-         ]]
-            // , data: [linterid]
-            });
-
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HBarCode = data[0].HBarCode.toString();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
-                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-
-            //缂栬緫
-            form.on('submit(cmdChange)', function () {//缂栬緫
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                var sQty = data[0].HQty.toString();
-                var iQty = $('#HQty').val()
-                    $.ajax(
-                        {
-                            type: "Get",
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
-                            async: true,
-                            data: {
-                                "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
-                                , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
-                                , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
-                                , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
-                            },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    table.render({
-                                        elem: '#mx-table'
-                                        //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                                        , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                                        , where: {
-                                            "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                                            , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                                        },
-                                        cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-                                            , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-                                        ]]
-                                        // , data: [linterid]
-                                    });
-                                    alert("缂栬緫鎴愬姛锛�");
-                                }
-                                else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            },
-                            error: function (err) {
-                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鏄庣粏鍒楄〃'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType=  ' + HBillType + '&HBarCode=  ' + HBarCode + ''
-                            , 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            })
-
-
-    });
-    </script>
-</body>
-</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
new file mode 100644
index 0000000..ea65215
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
@@ -0,0 +1,992 @@
+锘�<!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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align:center;"><b>宸ヨ祫缁撶畻鍗�(鍏朵粬)</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" 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 class="layui-col-xs4 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;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" 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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+                                                    <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
+                                                    <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
+                                                    <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
+                                                    <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+                                                    <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
+                                                    <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
+                                                    <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">閫夊崟鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                    <input id="HItemID" name="HItemID" type="hidden" />
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+    <script type="text/html" id="isEntrust">
+        <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+            <option value="false">鍚�</option>
+            <option value="true">鏄�</option>
+        </select>
+    </script>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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;
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = 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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '2206' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '2206' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+                GetICMOBillValue(linterid)
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
+                "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+                "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
+                "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
+                "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
+                "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+            }];
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , height: 'full-50'
+                , cellMinWidth: 110
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
+                    , { field: 'HProcName', title: '宸ュ簭鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '璧勬簮浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '璧勬簮鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '鑱屽憳浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '宸ユ椂', title: '宸ユ椂', edit: 'text', width: 100 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '宸ヤ环', title: '宸ヤ环', edit: 'text', width: 100 }
+                    , { field: '瀹氶娴姩姣旂巼', title: '瀹氶娴姩姣旂巼', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创鏁伴噺', title: '琛ヨ创鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创閲戦', title: '琛ヨ创閲戦', edit: 'text', width: 100 }
+                    , { field: '琛ヨ创鍚堣', title: '琛ヨ创鍚堣', edit: 'text', width: 100 }
+                    , { field: '鎵ｆ灏忚', title: '鎵ｆ灏忚', edit: 'text', width: 100 }
+                    , { field: '鍖呰鏁伴噺', title: '鍖呰鏁伴噺', edit: 'text', width: 100 }
+                    , { field: '鍖呰鍗曚环', title: '鍖呰鍗曚环', edit: 'text', width: 100 }
+                    , { field: '鍖呰閲戦', title: '鍖呰閲戦', edit: 'text', width: 100 }
+                    , { field: '鍖呰绫诲瀷', title: '鍖呰绫诲瀷', edit: 'text', width: 100 }
+                    , { field: '閲戦', title: '閲戦', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '鐢熶骇浠诲姟鍗旾D', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鐢熶骇浠诲姟鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '宸ュ簭姹囨姤鍗旾D', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '宸ュ簭姹囨姤鍗曞瓙ID', edit: 'text', width: 100 }
+                    , { field: 'HMaterName', title: '宸ュ簭璁″垝鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟鍗曞彿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '婧愬崟绫诲瀷', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏宠仈鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏宠仈閲戦', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '琛屽叧闂汉', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鍏抽棴鏃堕棿', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '鎵嬪伐鍏抽棴', edit: 'text', width: 100 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+                , done: function (res, curr, count) {
+                    option.data = res.data;
+                    //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                    $('.layui-form-select').find('input').unbind("blur");
+                    //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                    $('tr').each(function (e) {
+                        var $cr = $(this);
+                        var dataIndex = $cr.attr("data-index");
+                        $.each(option.data, function (index, value) {
+                            if (value.LAY_TNDEX == dataIndex) {
+                                $cr.find('input').val(value.isEntrust);
+                            }
+                        });
+                    });
+                }
+                , text: {
+                    none: '鏃犳暟鎹紒'
+                }
+            };
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //鏄惁榛樿宸ヨ壓
+            form.on('checkbox(checkboxHBLFlag)', function (data) {
+                $("#HBLFlag").val(data.elem.checked);
+            });
+            //鏄惁鍚敤
+            form.on('checkbox(checkboxHUseFlag)', function (data) {
+                $("#HUseFlag").val(data.elem.checked);
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
+                    "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+                    "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
+                    "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
+                    "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
+                    "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HProcCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ュ簭鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HProcName: checkStatus.data[0].宸ュ簭
+                                        , HProcID: checkStatus.data[0].HItemID
+                                        , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HWorkCenterCheck') {//宸ヤ綔涓績
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鍔犲伐涓績鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績
+                                        , HCenterID: checkStatus.data[0].HItemID
+                                        , 宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HSupCheck') {//渚涘簲鍟�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        渚涘簲鍟�: checkStatus.data[0].HName
+                                        , HSupID: checkStatus.data[0].HItemID
+                                        , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].HNumber
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+                //鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
+                if (obj.event === 'isEditCheck') {
+                    var flag = obj.data.isEdit;
+                    var flagValue = obj.data.isEditValue;
+                    if (flagValue === "false") {
+                        flagValue = "true";
+                        flag = "鏄�";
+                    }
+                    else if (flagValue === "true") {
+                        flagValue = "false";
+                        flag = "鍚�";
+                    }
+                    else {
+                        flagValue = "false";
+                        flag = "鍚�";
+                    }
+                    obj.update({
+                        isEdit: flag
+                        , isEditValue: flagValue
+                    });
+                }
+            });
+
+            $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
+                if (event.keyCode == 118) {
+                    layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
+                }
+            });
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if ($("#HICMOInterID").val() == 0) {
+                    layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
+                    layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanBeginDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HPlanEndDate").val()) {
+                    layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sSubTable = table.cache['mainTable'];
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HProcNo) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (sSubTable[i].HProcNo == 0) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HProcID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HCenterID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (sSubTable[i].isEntrust == "true") {
+                        if (!sSubTable[i].HSupID) {
+                            var indexRow = i + 1;
+                            layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return;
+                        }
+                    }
+                }
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    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 () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#set_SaveBill').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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+
+            //#region 琛ㄥご淇℃伅鐝粍寮圭獥
+            form.on('submit(HGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Employee)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '涓荤鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+           
+         
+
+         
+
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(Cancel)', function () {
+                if (OperationType == 1) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    Pub_Close(1);
+                }
+            })
+
+
+            //杩斿洖鐢熶骇浠诲姟鍗�
+            function GetICMOBillValue(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[result.data.length - 1];
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                            $("#HMaterID").val(data.hmaterid);
+                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterID2").val(data.hmaterid);
+                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
+                            $("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
+                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                            $("#HBatchNo").val(data.鎵瑰彿);
+                            $("#HUnitID").val(data.hunitid);
+                            $("#HUnitName").val(data.璁￠噺鍗曚綅鍚嶇О);
+                            $("#HUnitNumber").val(data.璁￠噺鍗曚綅浠ｇ爜);
+                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                            $("#HWorkShopID").val(data.hdeptid);
+                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                            $("#HProdMaterCode").val(data.浜у搧CODE);
+                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                            $("#HImportNote").val(data.閲嶈鎻愮ず);
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+                //txtHBillNo.Text = sBillNo;
+                GetICMOBillDetail(hmainid);
+            }
+
+            function GetICMOBillDetail(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+            }
+
+            //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+            form.on('select(isEntrust)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.isEntrust = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+
+        //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
+        var subProcName, subProcNumber, subProcID,
+            subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
+            subSupName, subSupNumber, subSupID,
+            HReasonName, ReasonID, EmpName,
+            ZRProcName, QRName;
+
+
+        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
+        {
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
+        }
+
+        //杩斿洖浜у搧
+        function GetHMaterNameValue(obj) {
+            $("#HMaterName2").val(obj[0].HName);
+            $("#HMaterID2").val(obj[0].HItemID);
+            $("#HMaterNumber2").val(obj[0].HNumber);
+            $("#HMaterHModel2").val(obj[0].HModel);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖璐ｄ换浜�
+            EmpName = obj[0].HName;
+            // $("#HEmpName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        function GetHProcValue(obj) {
+            subProcName = obj[0].宸ュ簭;
+            subProcID = obj[0].HItemID;
+            subProcNumber = obj[0].HProcNumber;
+        }
+        function GetHSupValue(obj) {
+            subSupName = obj[0].HName;
+            subSupID = obj[0].HItemID;
+            subSupNumber = obj[0].HNumber;
+        }
+        function GetWorkCenterValue(obj) {
+            subWorkCenterName = obj[0].宸ヤ綔涓績;
+            subWorkCenterID = obj[0].HItemID;
+            subWorkCenterNumber = obj[0].宸ヤ綔涓績浠ｇ爜;
+        }
+        function GetHZRValue(obj) {   //杩斿洖璐ｄ换宸ュ簭
+            ZRProcName = obj[0].宸ュ簭;
+            //$("#HZRProcName").val(obj[0].宸ュ簭);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+        //HWorker
+        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+            QRName = obj[0].HName;
+            //$("#HQRName").val(obj[0].HName);
+            //$("#HItemID").val(obj[0].HItemID);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Kf_BarCodeEditDlg.html"
deleted file mode 100644
index 4bdb342..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Kf_BarCodeEditDlg.html"
+++ /dev/null
@@ -1,268 +0,0 @@
-锘�<!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.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 class="layui-fluid">
-        <div class="layui-card" style="padding: 1%">
-            <div class="layui-card-body" style="padding: 15px;">
-                <form class="layui-form" action="" lay-filter="component-form-group">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">鏁伴噺</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" style="width:100%" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-tab">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">鏉＄爜鏄庣粏</li>
-                            <li lay-id="2">鏉＄爜妗ｆ</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
-                                <div class="layui-card-header"></div>
-                                <div class="layui-form-item">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdChange">璋冩暣</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDel">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
-                                </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HBarcode" id="HBarcode" lay-verify="HBarcode" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡妗ｆ</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HM" id="HM" lay-verify="HM" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ュ崟浣�</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input">
-                                    </div>
-         
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撳簱</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撲綅</label>
-                                    <div class="layui-input-inline mobile">
-                                        <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
-                                        <input type="hidden" name="HSCWID" id="HSCWID" lay-verify="HSCWID" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="margin-bottom: 20px;">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="button1">杩斿洖</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-        <script src="../../../layuiadmin/layui/layui.js"></script>
-        <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
-        <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script>
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        //鑾峰彇椤甸潰璺宠浆鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-        } else {
-            var HInterID = params[params[0]];//鍗曟嵁ID
-            var HMaterID = params[params[1]];//鐗╂枡ID
-            var HAuxPropID = params[params[2]];//杈呭姪灞炴��
-            var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
-            var HWhID = params[params[4]];//浠撳簱ID
-            var HSPID = params[params[5]];//浠撲綅ID
-            var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
-            var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
-            var HBatchNo = params[params[8]];//鎵规
-            var HSourceInterID = params[params[9]];//婧愬崟涓籌D
-            var HSourceEntryID = params[params[10]];//婧愬崟瀛怚D
-            var HBillType = params[params[11]];//鍗曟嵁绫诲瀷
-            var HBarCode = params[params[12]];//鏉＄爜
-        }
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'table'], function () {
-            var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form;
-
-
-            table.render({
-            elem: '#mx-table'
-                //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                 ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                , where: {
-                    "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                    , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                },
-             cols: [[
-             { type: 'radio' }
-           , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-           , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-           , { field: 'HQty', title: '鏁伴噺', width: 100 }
-           , { field: 'HBatchNo', title: '鎵规', width: 150 }
-           , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-         ]]
-            // , data: [linterid]
-            });
-
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HBarCode = data[0].HBarCode.toString();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
-                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-
-            //缂栬緫
-            form.on('submit(cmdChange)', function () {//缂栬緫
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                var sQty = data[0].HQty.toString();
-                var iQty = $('#HQty').val()
-                    $.ajax(
-                        {
-                            type: "Get",
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
-                            async: true,
-                            data: {
-                                "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
-                                , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
-                                , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
-                                , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
-                            },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    table.render({
-                                        elem: '#mx-table'
-                                        //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                                        , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                                        , where: {
-                                            "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                                            , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                                        },
-                                        cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-                                            , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-                                        ]]
-                                        // , data: [linterid]
-                                    });
-                                    alert("缂栬緫鎴愬姛锛�");
-                                }
-                                else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            },
-                            error: function (err) {
-                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鏄庣粏鍒楄〃'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType=  ' + HBillType + '&HBarCode=  ' + HBarCode + ''
-                            , 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            })
-
-
-    });
-    </script>
-</body>
-</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 87d5389..a7af088 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -198,7 +198,7 @@
                                 if (d.鍑虹珯鏃堕棿 == null) {
                                     return "";
                                 }
-                                return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+                                return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
                             }
                         }
                         , { field: 'HEmpID', title: 'HEmpID', hide: true }
@@ -211,7 +211,7 @@
                         , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
                         , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
                         , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
-                        , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+                        , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺' }
                     ]]
                     , text: {
                         none: '鏃犳暟鎹紒'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index dc79240..3057bc4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -300,7 +300,7 @@
                                 if (d.杩涚珯鏃堕棿 == null) {
                                     return "";
                                 }
-                                return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd");
+                                return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
                             }
                         }
                         , { field: 'HEmpID', title: 'HEmpID', hide: true }
@@ -314,7 +314,7 @@
                         , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
                         , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
                         , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
-                        , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+                        , { field: '鎺ユ敹鏁伴噺', title: '杩涚珯鎺ユ敹鏁伴噺' }
                     ]]
                     , text: {
                         none: '鏃犳暟鎹紒'

--
Gitblit v1.9.1