From 996f23c2244c0dff6445aa14f42bb9cb5daf8922 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期日, 07 九月 2025 20:17:44 +0800
Subject: [PATCH] 条码打印

---
 WebSRM/WebSRM.csproj.user                                               |    4 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html |  790 +++++++++++++++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html |  842 +++++++++++++++++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html     |  693 +++++++++++++++++
 WebSRM/WebSRM.csproj                                                    |    3 
 WebSRM/login.html                                                       |    2 
 WebSRM/Scripts/webConfig.js                                             |    3 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html                       |    7 
 8 files changed, 2,340 insertions(+), 4 deletions(-)

diff --git a/WebSRM/Scripts/webConfig.js b/WebSRM/Scripts/webConfig.js
index 224c97a..ca739de 100644
--- a/WebSRM/Scripts/webConfig.js
+++ b/WebSRM/Scripts/webConfig.js
@@ -7,7 +7,8 @@
     //var WEBURL = "http://localhost:8082/srmAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/srmAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/SRMAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8080/SRMAPI/";    //浣欐�濇澃鏈湴閰嶇疆
+    /*var WEBURL = "http://localhost:8080/SRMAPI/";    //浣欐�濇澃鏈湴閰嶇疆*/
+    var WEBURL = "http://localhost:83/hkAPI/";    //llj鏈湴閰嶇疆
    /* var WEBURL = "http://localhost:8082/SRMAPI/";*/
     
     return WEBURL
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 198dcd9..bf0af52 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -870,6 +870,9 @@
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_AskPriceBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill_XB.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill_Bak.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_MaterialBarCodeBill.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_MaterialHanding.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_MaterialHandingEdit.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBackBillList_XB.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBackBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_SupMaterPackBillEdit.html" />
diff --git a/WebSRM/WebSRM.csproj.user b/WebSRM/WebSRM.csproj.user
index c6dd6ec..80251cd 100644
--- a/WebSRM/WebSRM.csproj.user
+++ b/WebSRM/WebSRM.csproj.user
@@ -1,8 +1,8 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>D:\GitHub\SRM-LAYUI-HK\WebSRM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
new file mode 100644
index 0000000..a95613d
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -0,0 +1,790 @@
+锘�<!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">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
+
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form1" class="layui-form" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">鐢熸垚鏉$爜</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鏉$爜鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-form-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label">鏃ユ湡锛�</label>
+                                        <div class="layui-input-inline">
+                                            <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+                                        <div class="layui-input-inline">
+                                            <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+                                            <input id="HSupID" name="HSupID" type="hidden" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+                                        <div class="layui-input-inline">
+                                            <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+                                            <input id="HSupName" name="HSupName" type="hidden" />
+                                        </div>
+                                    </div>
+                            </div>
+
+                        </div>
+                        <div class="layui-tab layui-tab-brief" lay-filter="tabDemo">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this" lay-id="1">鏉$爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <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-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn"><i class="layui-icon layui-icon-addition"></i>鍒楄缃�</button>
+                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>
+                                        </div>
+                                    </script>
+                                    <!-- 鏉$爜绫诲瀷涓嬫媺妗嗘ā鏉� -->
+                                    <script type="text/html" id="barCodeTypeTpl">
+                                        <select class="barcode-type-select" lay-filter="barCodeTypeSelect">
+                                            <option value="鍞竴鏉$爜" {{ d.HSourceBillType == '鍞竴鏉$爜' ? 'selected' : '' }}>鍞竴鏉$爜</option>
+                                        </select>
+                                    </script>
+                                </div>
+                            </div>
+                        </div>
+                        <!--<blockquote class="layui-elem-quote">鏉$爜</blockquote>-->
+                    </form>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
+    <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 src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/general.js"></script>
+    <!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
+    <script>
+        var HModName = "Gy_BarCodeBill";
+        function f_alert(sMsg) {
+            layer.alert(sMsg, { icon: 5 });
+        }
+        //#region
+        //#endregion
+        ////#region 鍒楅厤缃紙鎵嬪姩閰嶇疆锛�
+        //var option = {
+        //    cols: [[
+        //        { type: 'checkbox', fixed: 'left' }
+        //        , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+        //        , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+        //        , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+        //        , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
+        //        , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }
+        //        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+        //        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+        //        , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
+        //        , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
+        //        , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
+        //        , { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
+        //        , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+        //        , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+        //        , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+        //        , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+        //        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100 }
+        //        , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+        //        , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+        //        , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+        //        , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+        //        , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+        //    ]]
+        //};
+        ////#endregion
+
+         //#region 鍙傛暟鑾峰彇function
+        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 = getUrlVars();
+        var linterid = params[params[0]];
+        var lentryid = params[params[1]];
+        var type = params[params[2]];
+        var mergeTags = params[params[3]];
+        mergeTags = 1;
+        //#endregion
+        //鍘熺敓鎴愭潯鐮佹柟娉�
+        var mainUrl = "GetSRMHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
+        var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
+        var saveBarCode = "GetBarcodeSaveBillBox";//鏉$爜鐢熸垚淇濆瓨鏂规硶ajax GetBarcodeSaveBillBox  GetBarcodeSaveBillOnlyInnerBox
+        var openTmpListType = "HBarCodePrint"; //鏉$爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'table', 'form', 'element', 'layer', 'laydate'], function () {
+            var table = layui.table
+                , $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+
+            var option;
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500
+                , height: 500
+                , totalRow: true
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+/*                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
+                    , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
+                   /* , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }*/
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
+                    , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
+                    , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 } 
+                    , { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+                    , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+                    , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+                    , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+                    , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100, templet: '#barCodeTypeTpl' }  
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100,event:"inputHKFPeriod" }//
+                    , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+                    , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+                    , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+                ]]
+            }
+            table.render(option);
+            //#region 涓嬫媺妗嗙粦瀹�
+            // 鐩戝惉鏉$爜绫诲瀷涓嬫媺妗嗛�夋嫨浜嬩欢
+            form.on('select(barCodeTypeSelect)', function (data) {
+                var elem = $(data.elem);
+                var tr = elem.closest('tr');
+                var index = tr.data('index');
+
+                // 鏇存柊琛ㄦ牸缂撳瓨涓殑鏁版嵁
+                var tableCache = table.cache['mainTable'];
+                if (tableCache[index]) {
+                    tableCache[index].HSourceBillType = data.value;
+                }
+            });
+            //#endregion
+            
+            //#region 鍒濇璧嬪��
+            //杩涘叆椤甸潰鏌ヨ琛ㄤ綋鐗╂枡淇℃伅
+            if (mergeTags != 1) {
+                layer.load(3)
+                table.render({
+                    elem: '#mainTable'
+                    , url: GetWEBURL() + subUrl
+                    , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    , defaultToolbar: ['filter', 'exports']
+                    , where: { sMsg: linterid, sMsg2: lentryid }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                        , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+                        , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+                        , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
+                        , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                        , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
+                        , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
+                        , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
+                        , { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
+                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+                        , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+                        , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+                        , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100 }
+                        , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+                        , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+                        , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+                        , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+                        , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+
+                    ]]
+                    , done: function (res, curr, count) {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            else {
+                //鍚堝苟鏁伴噺鐢熸垚鏉$爜
+                layer.load(3);
+                FetchSupInfo();
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/GetSRMHBarCodeShowBillMain",
+                    async: true,
+                    data: { HInterID: lentryid },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count != 0) {
+                            var data = data.data;
+                            var rowdata = [];
+
+                            for (var i = 0; i < data.length; i++) {
+                                rowdata.push({
+                                    "HMaterID": data[i].HItemID,
+                                    "HMaterNumber": data[i].鐗╂枡浠g爜,
+/*                                    "HOldMaterNumber": "",*/
+                                    "HMaterShortNumber": "",
+                                    /*"HSubjoin": "",*/
+                                    "HMaterName": data[i].鐗╂枡鍚嶇О,
+                                    "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+                                    "HMinQty": data[i].鏍囧噯鍖呰鏁�,
+                                    "HBQty": data[i].鏈�灏忓寘瑁呮暟,
+                                    "HSourceBillType": data[i].鏉$爜绫诲瀷,
+                                    "HBatchNo": data[i].鎵瑰彿,
+                                    "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
+                                    "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
+                                    "HKFDQDate": data[i].鏈夋晥鏈�,
+                                    "HKFDate": data[i].鐢熶骇鏃ユ湡,
+                                    "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
+                                    "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+                                    "HSupName": data[i].渚涘簲鍟嗗悕绉�,
+                                    "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
+                                    "HQty": 1, // 榛樿鐢熸垚鏉$爜鏁伴噺
+                                    "biaoqianzhangshu": 1 // 鏍囩寮犳暟
+                                });
+                            }
+
+                            option.data = rowdata;
+
+                            table.render(option);
+
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            f_alert(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        f_alert("閿欒:" + err);
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            //#endregion 
+            form.on('submit(Exit)', function (data) {//閫�鍑�
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
+            //#region 鐩戝惉浜嬩欢
+            //鐩戝惉琛屽伐鍏蜂簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event === 'chooseHKFDate') {
+                    var field = $(this).data('field');
+                    var HExpUnit = data.HEXPUNIT; //淇濊川鏈熷崟浣�
+                    var HKFPeriod = data.HKFPeriod; //淇濊川鏈�
+                    if (HExpUnit != 'Y' && HExpUnit != 'M' && HExpUnit != 'D') {
+                        layer.msg("姝ょ墿鏂欐病鏈夊惎鐢ㄤ繚璐ㄦ湡锛�");
+                        obj.update({
+                            HKFDate: '',
+                        });
+                        return;
+                    }
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
+                            if (parseInt(obj.data.HKFPeriod) >= 0) {
+                                var sKFDQDate = addDate(value, parseInt(obj.data.HKFPeriod), HExpUnit, HKFPeriod);
+                                obj.update({
+                                    HKFDQDate: sKFDQDate,
+                                });
+                            }
+                        }
+                    });
+                }
+                else if (obj.event == 'chooseHKFDQDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
+                            if (obj.data.HKFDQDate != "" && obj.data.HKFDate != "") {
+                                var days = DateDiff(obj.data.HKFDQDate, obj.data.HKFDate);
+                                obj.update({
+                                    HKFPeriod: days,
+                                });
+                            }
+                        }
+                    });
+                }
+                else if (obj.event == 'chooseHBeginDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
+
+                        }
+                    });
+                }
+                else if (obj.event == 'chooseHEndDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
+
+                        }
+                    });
+                }
+                else if (obj.event == 'inputHKFPeriod') {
+                    $(obj.tr).find(".layui-table-edit").keyup(function () {
+                        var $input = $(this), val = $input.val();
+                        if (!val) val = "1";
+                        $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                    });
+                }
+                else if (obj.event == 'inputHQty') {
+
+                    $(obj.tr).find(".layui-table-edit").keyup(function () {
+                        var $input = $(this), val = $input.val();
+                        if (!val) val = "0";
+                        $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                    });
+                   
+                    
+                }
+                else if (obj.event == 'inputHMinQty') {
+                    var oldHMinQty = data.HMinQty;
+
+                    $(obj.tr).find(".layui-table-edit").keyup(function () {
+                        var $input = $(this), val = $input.val();
+                        if (!val) val = "0";
+                        $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                    });  
+                }
+                //澶栫鍖呰鏁颁簨浠讹紝鏈〉闈㈡殏鏃剁敤涓嶅埌
+                //else if (obj.event == 'inputHWXQty') {
+
+                //    $(obj.tr).find(".layui-table-edit").keyup(function () {
+                //        var $input = $(this), val = $input.val();
+                //        if (!val) val = "0";
+                //        $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                //    });
+                //}
+            });
+
+
+
+        table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+            var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                , field = obj.field; //寰楀埌瀛楁
+
+            var HMinQty = 0;
+            var HWXQty = 0;
+            var HKFPeriod = 0;
+            var HWBQty = 0;
+            var HBQty = 0;
+            var biaoqianzhangshu = 0;
+            if (obj.data.HMinQty != undefined) {
+                HMinQty = parseFloat(obj.data.HMinQty);
+            }
+            if (obj.data.biaoqianzhangshu != undefined) {
+                biaoqianzhangshu = parseFloat(obj.data.biaoqianzhangshu);
+            }
+            if (obj.data.HWXQty != undefined) {
+                HWXQty = parseFloat(obj.data.HWXQty);
+            }
+            if (obj.data.HKFPeriod != undefined) {
+                HKFPeriod = parseFloat(obj.data.HKFPeriod);
+            }
+            if (obj.data.HWBQty != undefined) {
+                HWBQty = parseFloat(obj.data.HWBQty);
+            }
+            if (obj.data.HBQty != undefined) {
+                HBQty = parseFloat(obj.data.HBQty);
+            }
+            if (obj.data.HQty != undefined) {
+                HBQty = parseFloat(obj.data.HBQty);
+            }
+            //HMinQty 鍐呯鍖呰鏁帮紙鏍囧噯鍖呰鏁帮級
+            //HBQty 鍐呯鏁帮紙鏈�灏忓寘瑁呮暟锛�
+            //HWXQty 澶栫鍖呰鏁�
+            //HWBQty 澶栫鏁� HWBQty
+            //biaoqianzhangshu  鏍囩shu
+            //HQty 鏈鐢熸垚鏉$爜鏁�
+            switch (field) {
+                case "HQty":
+                    if (HMinQty == 0)
+                        f_alert("娉ㄦ剰锛氬寘瑁呮暟涓�0!");
+                    else {
+                        obj.update({
+                            biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.data.HMinQty)),
+                        });
+                    }
+                    
+                    break;
+                case "HMinQty": //鍖呰鏁�
+                    if (HMinQty < 0) {
+                        f_alert("鍖呰鏁颁笉鑳戒负璐熸暟!");
+                    }
+                    if (HMinQty < HBQty) {
+                        f_alert("鏍囧噯鍖呰鏁伴噺涓嶈兘灏忎簬鏈�灏忓寘瑁呮暟閲�!璇烽噸鏂拌緭鍏ワ紒")
+                        obj.update({
+                            HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+                        });
+                        return;
+                    }
+                    break;  
+            }
+
+
+        });
+                        //#endregion
+
+           //#region 淇濆瓨
+            form.on('submit(HBarcodeSaverBox)', function (data) {//淇濆瓨
+                var a = 0;
+                var newArray = [];
+                var index = -1;
+                //debugger;
+
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceALL("\"", "鈥�").replaceALL(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceALL("\"", "鈥�").replaceALL(";", "锛�")
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                var _sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < _sSubStr.length; i++) {
+                    if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HMinQty == 0 || _sSubStr[i].HWXQty == 0)) {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍖呰鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    //if (_sSubStr[i].HQty > _sSubStr[i].HNotBarcodeCount) {
+                    //    console.log("鏈:" + _sSubStr[i].HQty);
+                    //    console.log("鍓╀綑:" + _sSubStr[i].HNotBarcodeCount);
+                    //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉$爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return Result = false;
+                    //}
+                    if (_sSubStr[i].HQty > 0 && _sSubStr[i].HISKFPERIOD == 1 && (/*_sSubStr[i].HBatchNo == "" ||*/ _sSubStr[i].HKFDate == "")) {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if ((_sSubStr[i].HBatchManager == "鏄�" && _sSubStr[i].HBatchNo == "") || (_sSubStr[i].HBatchManager == true && _sSubStr[i].HBatchNo == "")) {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠$悊锛屾壒娆′负绌猴紝璇峰~鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    ////鑾峰彇涓嬫爣
+                    //index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
+                    //if (index === -1 || _sSubStr[i].HIsSplit == 0) {
+                    //    //濡傛灉鏁扮粍涓病鏈夊綋鍓嶆暟鎹紝鍒欏皢鏁版嵁娣诲姞杩涙暟缁勪腑
+                    //    newArray.push(_sSubStr[i]);
+
+                    //} else {
+                    //    if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
+                    //        //濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠g爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
+                    //        newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
+                    //    }
+                    //}
+                }
+
+                for (let i = 0; i < newArray.length; i++) {
+                    //if (newArray[i].HQty > newArray[i].HNotBarcodeCount) {
+                    if (newArray[i].HQty ) {
+                        //layer.msg("缂栫爜:" + newArray[i].HMaterNumber + " 瑙勬牸鍨嬪彿:" + newArray[i].HMaterModel + "<br>" + " 鏈鐢熸垚鏉$爜鎬绘暟閲忚秴鍑哄墿浣欏彲鐢熸垚鏉$爜鏁帮紒" + "<br>" + " 鏈鐢熸垚鎬绘暟閲�:" + newArray[i].HQty + " 鍙敓鎴愭潯鐮佹暟閲�:" + newArray[i].HNotBarcodeCount, { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("缂栫爜:" + newArray[i].HMaterNumber + " 瑙勬牸鍨嬪彿:" + newArray[i].HMaterModel + "<br>" + " 鏈鐢熸垚鏉$爜鎬绘暟閲忚秴鍑哄墿浣欏彲鐢熸垚鏉$爜鏁帮紒" + "<br>" + " 鏈鐢熸垚鎬绘暟閲�:" + newArray[i].HQty , { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
+                layer.load(3)
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/SRM_MaterialBarCodeBillController/GetBarcodeSaveBillBoxBycg", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                element.tabDelete('tabDemo', '2'); //鍒犻櫎
+                                element.tabDelete('tabDemo', '3'); //鍒犻櫎
+
+                                $('#HBarcodeSaverBox').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鏉$爜鎸夐挳绂佺敤
+
+                                element.tabAdd('tabDemo', {
+                                    title: '鎴愬姛鏉$爜'
+                                    , content: '<table class="layui-hide" id="subTable" lay-filter="subTable"></table>' //鏀寔浼犲叆(html浠g爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
+                                    , id: '2' //閫夐」鍗℃爣棰樼殑lay-id灞炴�у��
+                                });
+                                var option_Success;
+                                option_Success = {
+                                    elem: '#subTable'
+                                   // , url: GetWEBURL() + 'showHBarCodeBillDetail'  //h_v_Web_BarCodeBill_ForWeb1
+                                    , toolbar: '#toolbarDemo1'
+                                    , defaultToolbar: ['filter', 'exports']
+                                    , cols: [[
+                                        , { field: 'HBarCode', title: '鏉$爜', width: 100 }
+                                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+                                        /*                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
+                                        , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
+                                        /* , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }*/
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                                        , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135 }
+                                        , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100 }
+                                        , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
+                                        , { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
+                                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 100 }
+                                        , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+                                        , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, hide: true }
+                                        , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, hide: true }
+                                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100 }
+                                        , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDate"
+                                        , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+                                        , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDQDate"
+                                        , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+                                        , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+
+                                    ]]
+                                }
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "/showHBarCodeBillDetail",
+                                    async: true,
+                                    data: { sMsg: lentryid },
+                                    dataType: "json",
+                                    success: function (data_1) {
+                                        if (data_1.count != 0) {
+                                            var data = data_1.data;
+                                            var rowdata_1 = [];
+
+                                            for (var i = 0; i < data.length; i++) {
+                                                var totalQty = data[i].鐢熸垚鏉$爜鏁伴噺; // 鎬绘潯鐮佹暟
+                                                var standardQty = data[i].鏍囧噯鍖呰鏁�; // 鏍囧噯鍖呰鏁�
+                                                var labelCount = Math.ceil(totalQty / standardQty); // 璁$畻鏍囩鏁�
+
+                                                // 鐢熸垚鍓峮-1涓爣鍑嗘爣绛�
+                                                for (var j = 0; j < labelCount - 1; j++) {
+                                                    rowdata_1.push({
+                                                        "HMaterID": data[i].HItemID,
+                                                        "HBarCode": data[i].HBarCode,
+                                                        "HMaterNumber": data[i].鐗╂枡浠g爜,
+                                                        "HMaterShortNumber": "",
+                                                        "HMaterName": data[i].鐗╂枡鍚嶇О,
+                                                        "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+                                                        "HMinQty": standardQty,
+                                                        "HBQty": data[i].鏈�灏忓寘瑁呮暟,
+                                                        "HSourceBillType": data[i].鏉$爜绫诲瀷,
+                                                        "HBatchNo": data[i].鎵瑰彿,
+                                                        "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
+                                                        "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
+                                                        "HKFDQDate": data[i].鏈夋晥鏈�,
+                                                        "HKFDate": data[i].鐢熶骇鏃ユ湡,
+                                                        "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
+                                                        "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+                                                        "HSupName": data[i].渚涘簲鍟嗗悕绉�,
+                                                        "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
+                                                        "HQty": standardQty, // 鏍囧噯鍖呰鏁�
+                                                        "biaoqianzhangshu": 1
+                                                    });
+                                                }
+
+                                                // 鐢熸垚鏈�鍚庝竴涓爣绛撅紙浣欐暟锛�
+                                                var lastQty = totalQty % standardQty;
+                                                if (lastQty === 0) lastQty = standardQty; // 濡傛灉鏁撮櫎锛屾渶鍚庝竴涓篃鏄爣鍑嗗寘瑁呮暟
+
+                                                rowdata_1.push({
+                                                    "HMaterID": data[i].HItemID,
+                                                    "HBarCode": data[i].HBarCode,
+                                                    "HMaterNumber": data[i].鐗╂枡浠g爜,
+                                                    "HMaterShortNumber": "",
+                                                    "HMaterName": data[i].鐗╂枡鍚嶇О,
+                                                    "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+                                                    "HMinQty": standardQty,
+                                                    "HBQty": data[i].鏈�灏忓寘瑁呮暟,
+                                                    "HSourceBillType": data[i].鏉$爜绫诲瀷,
+                                                    "HBatchNo": data[i].鎵瑰彿,
+                                                    "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
+                                                    "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
+                                                    "HKFDQDate": data[i].鏈夋晥鏈�,
+                                                    "HKFDate": data[i].鐢熶骇鏃ユ湡,
+                                                    "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
+                                                    "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+                                                    "HSupName": data[i].渚涘簲鍟嗗悕绉�,
+                                                    "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
+                                                    "HQty": lastQty, // 鏈�鍚庝竴涓爣绛剧殑鏁伴噺
+                                                    "biaoqianzhangshu": 1
+                                                });
+                                            }
+
+                                            option_Success.data = rowdata_1;
+                                            table.render(option_Success);
+                                        
+                                        }
+                                        else {
+                                            // $("#verifycode").click();
+                                            f_alert(data.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    },
+                                    error: function (err) {
+                                        f_alert("閿欒:" + err);
+                                        layer.closeAll("loading");
+                                    }
+                                });
+
+                            }
+                           
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            f_alert("閿欒:" + err);
+                        }
+                    });
+                return false;
+            });
+           //#endregion
+
+            //#region 鎵撳嵃
+            //鍐呯鎵撳嵃
+            form.on('submit(Print)', function (data) {
+                var data2 = layui.table.cache["subTable"];//鍐呯鏉$爜
+
+                var rows = '';
+                var rows2 = '';
+                if (data2 == undefined) {
+                    layer.msg("璇峰厛鐢熸垚鏉$爜锛�")
+                    return;
+                }
+                for (var j = 0; j < data2.length; j++) {
+                    rows += data2[j].HMaterID.toString() + ',';
+                    rows2 += data2[j].HBarCode.toString() + ',';
+                }
+                rows = rows.substring(rows.length - 1, 0);
+                rows2 = rows2.substring(rows2.length - 1, 0);
+                if (rows == "") {
+                    layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+                    return;
+                }
+                else {
+                    var url = "linteridSession";
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+                        dataType: "json",
+                        success: function (data) {
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
+                        }
+                    });
+                    sessionStorage["linterid"] = rows.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+                        , resize: false
+                        //, cancel: function () {
+                        //    $(".layui-btn").removeClass("layui-btn-disabled");
+                        //}
+                    })
+                }
+            });
+            //#endregion
+
+            //鑾峰彇渚涘簲鍟咺D
+            function FetchSupInfo() {
+                var sWhere = "";
+                //var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Supplier/list",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
+                    success: function (result) {
+                        if (result.data.length > 0) {
+                            $("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
+                            $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+                        } else {
+                            layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
+                        }
+
+                    }
+                });
+            }
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
new file mode 100644
index 0000000..1c2839c
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
@@ -0,0 +1,693 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐗╂枡鍒楄〃</title>
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.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">鐗╂枡浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏄惁鍚敤</label>
+                                    <div class="layui-input-block">
+                                        <select id="HUseFlag" name="HUseFlag"  class=" ForFilteringSchemes" lay-verify="HUseFlag">
+                                            <option value="0" selected="selected">鍏ㄩ儴</option>
+                                            <option value="Y">鍚敤</option>
+                                            <option value=" ">鏈惎鐢�</option>
+                                            </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-logout"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_use"><i class="layui-icon layui-icon-logout"></i>鍚敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_createBarCode"><i class="layui-icon layui-icon-logout"></i>鐢熸垚鏉$爜</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+        var sWhere = "";
+        var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID","HUnitID"];
+        var option = [];
+        var HModName = "Gy_UserMaterRelation";
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                    break;
+                //鍚敤鎸夐挳
+                case 'get_use':
+                        get_use(0);
+                    break;
+                //鐢熸垚鏉$爜
+                case 'get_createBarCode':
+                    get_createBarCode();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumn();
+                    break;
+            };
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鏌ヨ
+            get_Display("");
+            //鍒濆鍖栬〃鏍�
+            //DisPlay_HideColumn();
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/MaterialHandingController/GetMaterialHandingList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    
+                    var check_1 = sWhere;
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(data1.list[key].ColmCols)) {
+                                titleData[key] = data1.list[key].ColmCols;
+                            }
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                }
+                            }
+                        
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , height: 'full-50'
+                            , page: true //寮�鍚垎椤�
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , cols: [col]
+                            , data: data1.data
+                            };
+
+                        //鍒濆鍖栬〃鏍�
+                       // DisPlay_HideColumn();
+                        table.render(option);
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    }  
+                        layer.close(ajaxLoad);
+                        /*layer.msg(data1.code + data1.Message, { icon: 5 });*/
+                    
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HModel = $("#HModel").val();
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var IsUse = $("#HUseFlag").val();
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+
+
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 = '" + HMaterNumber + "'";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "'";
+            }
+            if (HModel) {
+                sWhere += " and 瑙勬牸鍨嬪彿 = '" + HModel + "'";
+            }
+            if (IsUse!=0) {
+                sWhere += " and 鏄惁鍚敤 = '" + IsUse + "'";
+            }
+            //if (HBillNo) {
+            //    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            //}
+            //if (HProcType && HProcType != "") {
+            //    sWhere += " and 涓氬姟绫诲瀷 = '" + HProcType + "'";
+            //}
+            //if (HMaterNumber) {
+            //    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+            //}
+            //if (HMaterName) {
+            //    sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+            //}
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        // 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#HProcType").val("");//涓氬姟绫诲瀷
+            $("#HMaterNumber").val("");//鐗╂枡浠g爜
+            $("#HMaterName").val("");//鐗╂枡鍚嶇О
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            $("#btnSearch").click();
+            sWhere = "";
+        }
+
+        //鏂板 
+        function set_AddNew() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].HItemID;
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../SRM/SRM_MaterialHandingEdit.html?OperationType=3&linterid=' + linterid
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+            else {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../SRM/SRM_MaterialHandingEdit.html?OperationType=1&linterid='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+            
+        }
+
+        // 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].HItemID;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/MaterialHandingController/DelBill',
+                        type: "GET",
+                        data: { "HItemID": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }
+
+        // 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }
+
+        function Format(datetime, fmt) {
+            if (parseInt(datetime) == datetime) {
+                if (datetime.length == 10) {
+                    datetime = parseInt(datetime) * 1000;
+                } else if (datetime.length == 13) {
+                    datetime = parseInt(datetime);
+                }
+            }
+            datetime = new Date(datetime);
+            var o = {
+                "M+": datetime.getMonth() + 1,                 //鏈堜唤
+                "d+": datetime.getDate(),                    //鏃�
+                "h+": datetime.getHours(),                   //灏忔椂
+                "m+": datetime.getMinutes(),                 //鍒�
+                "s+": datetime.getSeconds(),                 //绉�
+                "q+": Math.floor((datetime.getMonth() + 3) / 3), //瀛e害
+                "S": datetime.getMilliseconds()             //姣
+            };
+            if (/(y+)/.test(fmt))
+                fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "").substr(4 - RegExp.$1.length));
+            for (var k in o)
+                if (new RegExp("(" + k + ")").test(fmt))
+                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+            return fmt;
+        }
+
+        function Pub_Close(closeType) {
+            if (closeType == 1) {
+                //鍏抽棴寮圭獥
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            } else if (closeType == 2) {
+                //鍏抽棴椤电
+                parent.layui.admin.events.closeThisTabs();
+            }
+        }
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID", "HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            if (dataCol[i]) {
+                                var dataCols = dataCol[i].split('|');
+                            }
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                switch (option.cols[0][i + 1]["field"]) {
+                                    case '鏃ユ湡':
+                                        option.cols[0][i + 1]["width"] = 110;
+                                        break;
+                                    case '鍗曟嵁鍙�':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '涓氬姟绫诲瀷':
+                                        option.cols[0][i + 1]["width"] = 105;
+                                        break;
+                                    case '閲囪喘鍛樹唬鐮�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閲囪喘鍛樺悕绉�':
+                                        option.cols[0][i + 1]["width"] = 135;
+                                        break;
+                                    case '閮ㄩ棬浠g爜':
+                                        option.cols[0][i + 1]["width"] = 140;
+                                        break;
+                                    case '閮ㄩ棬鍚嶇О':
+                                        option.cols[0][i + 1]["width"] = 160;
+                                        break;
+                                }
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //鍒楁槑鏄剧ず涓嬫媺妗�
+        function ColFilter() {
+            var Organization = '<option  value="0" selected="selected" ></option>';
+            for (var i = 1; i < option.cols[0].length; i++) {
+                if (option.cols[0][i].hide != true) {
+                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                }
+            }
+            $("#ColName").empty();
+            $("#ColName").append(Organization);
+            form.render('select');
+        }
+
+
+
+        //#region 鍚敤鏁版嵁
+        function get_use(num) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var InterID = data[0].HItemID.toString();
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/MaterialHandingController/OpenMaterial", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HInterID": InterID, "IsUse": num, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                //// 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                ////鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                $("#btnSearch").trigger('click');
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+            }
+        }
+
+        //#endregion
+
+        function get_createBarCode() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length) {
+                //var linterIDArray[0] = data[0].HItemID;
+                var linterIDArray = []; var BarCodeArr = data[0].HItemID+',';
+                for (var i = 1; i < checkStatus.data.length; i++) {
+                    //linterIDArray.push(data[i].HItemID); 
+                    linterIDArray[i] = data[i].HItemID;
+                    BarCodeArr = BarCodeArr + linterIDArray[i] + ',';
+                }
+                BarCodeArr = BarCodeArr.substring(0, BarCodeArr.length-1);
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../SRM/SRM_MaterialBarCodeBill.html?OperationType=3&linterid=' + BarCodeArr
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+            else {
+                layer.msg('鑷冲皯閫夋嫨涓�琛屾暟鎹紒');
+            }
+        }
+            
+
+        
+
+
+
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+</script>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
new file mode 100644
index 0000000..cdd6be6
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -0,0 +1,842 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>閫佽揣淇℃伅鏂板</title>
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/general.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="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>
+                            <button type="button" id="Saver_Edit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver_Edit">淇濆瓨</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">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" 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-inline">
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input id="HItemID" name="HItemID" value="0" type="hidden" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                        <div class="layui-col-xs4 layui-inline">
+
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;">
+                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;">
+                                            </div>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheck" id="btnCheck" style="width: 40px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;">鏍¢獙</i>
+                                            </button>
+                                        </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="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <!--<input type="hidden" name="HSupID" id="HSupID" value="0">-->
+
+                                            </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="HModel" id="HModel" 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" class="layui-input" name="HMinPackQty" id="HMinPackQty" style="">
+                                            </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="HInBoxPackQty" id="HInBoxPackQty" style="">
+                                                <input type="hidden" class="layui-input" name="HOutBoxPackQty" id="HOutBoxPackQty" style="" value="0">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浣跨敤缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </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="HSupID" id="HSupID" readonly>
+                                            </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="HSupName" id="HSupName" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏄惁鍚敤</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" lay-skin="primary" lay-filter="checkboxHUseFlag" value="false" title="">
+                                                <input type="hidden" value="0" name="HUseFlag" id="HUseFlag">
+                                            </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="HUpDater" id="HUpDater" 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="HCheckEmp" id="HCheckEmp" 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="HMakeTime" id="HMakeTime" 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="HCheckTime" id="HCheckTime" 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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                   
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    layui.config({
+        base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        var option;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+        var params = get_UrlVars();
+        set_ClearBill();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷//浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷   
+        }
+        //鍒ゆ柇鎿嶄綔绫诲瀷
+        if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+            $("#HItemID").val(0);
+            //$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+            linterid = 0;
+        }
+        else if (OperationType == 2) {//澶嶅埗
+            $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+        }
+        else if (OperationType == 3) {//缂栬緫
+            $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+            //$('#saver_Edit').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+        }
+        else if (OperationType == 4) {//娴忚
+            $("#HItemID").val(linterid);//
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+            //$('#saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+        }
+        else {
+            layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+        }
+        /*$('#btnSearchSup').addClass("layui-btn-disabled").attr("disabled", true);//渚涘簲鍟嗘寜閽鐢�*/
+        //$("#HSupName").val(sessionStorage["HUserName"]); //鑷姩鑾峰彇渚涘簲鍟嗕俊鎭�
+       
+
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(Saver)', function (data) {//鎻愪氦          
+                layer.confirm('[3791-2-009]鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', function (index) {
+                    location.replace('SRM_MaterialHandingEdit.html?OperationType=1&linterid=');
+                });
+        });
+        //淇濆瓨鎻愪氦
+        form.on('submit(Saver_Edit)', function (data) {//鎻愪氦
+            if (AllowLoadData(data)) {
+                if (OperationType == 1) {
+                    set_AddNew(data);
+                }
+                else
+                Edit_Save(data);
+                
+            }
+        });
+        ////淇濆瓨鎻愪氦
+        //form.on('submit(btnSave)', function (data) {//鎻愪氦
+        //    var sSubStr = table.cache['mainTable'];
+        //    if (AllowLoadData(sSubStr)) {
+        //        set_AddNew(data);
+        //    }
+        //});
+        //#endregion
+      
+ 
+        
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+                "HUnitName": "", "HQty": 0, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+                "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": "",
+                "HSourceInterID": 0, "HSourceEntryID": 0,"HSourceBillNo": ""
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+                    table.render(option);
+                    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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    }
+                    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) {
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        layer.close(index);
+                    }
+                });
+            }
+
+            var data = obj.data;
+            if (obj.event == 'HDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+
+            if (obj.event == 'inputHQty' || obj.event == 'inputHPrice' || obj.event == 'inputHMoney' || obj.event == 'inputHTaxPrice' || obj.event == 'inputHTaxRate' || obj.event == 'inputHTaxMoney' || obj.event == 'inputHlineTotal' || obj.event == 'inputHlineTotalBB') {
+                $(obj.tr).find(".layui-table-edit").keyup(function () {
+                    var $input = $(this), val = $input.val();
+                    if (!val) val = "0";
+                    $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                });
+            }
+
+            //#region [ 琛ㄤ綋F7浜嬩欢 ]
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == 'HMaterID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '浜у搧鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HMaterName: checkStatus.data[0].HName
+                                    , HMaterID: checkStatus.data[0].HItemID
+                                    , HMaterNumber: checkStatus.data[0].HNumber
+                                    , HMaterModel: checkStatus.data[0].HModel
+                                    , HUnitID: checkStatus.data[0].HUnitID
+                                    , HUnitNumber: checkStatus.data[0].HUnitNumber
+                                    , HUnitName: checkStatus.data[0].HUnitName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+                    if (obj.event == 'HUnitID') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '璁¢噺鍗曚綅鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HUnitID: checkStatus.data[0].HItemID
+                                    , HUnitNumber: checkStatus.data[0].HNumber
+                                    , HUnitName: checkStatus.data[0].HName
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+            //#endregion
+
+        });
+
+        table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+            var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                , field = obj.field; //寰楀埌瀛楁
+
+            if (obj.data.HQty != undefined) {
+                HQty = parseFloat(obj.data.HQty);
+            }
+            if (obj.data.HPrice != undefined) {
+                HPrice = parseFloat(obj.data.HPrice);
+            }
+            if (obj.data.HMoney != undefined) {
+                HMoney = parseFloat(obj.data.HMoney);
+            }
+
+            switch (field) {
+                case "HQty":
+                    console.log(obj.data.HMoney);
+                    obj.update({
+                        HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HPrice)),
+                    });
+                    console.log(obj.data.HMoney);
+                    obj.update({
+                        HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                    });
+                    break;
+                case "HPrice":
+                    obj.update({
+                        HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HQty)),
+                    });
+                    obj.update({
+                        HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                    });
+                    break;
+                case "HTaxRate":
+                     obj.update({
+                         HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+                     });
+                    break;
+            }
+        });
+
+
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function (data) {
+            if (OperationType != "") {
+                Pub_Close(1);
+            }
+        });
+
+        //鎵撳嵃
+        form.on('submit(btn_print)', function (data) {
+            get_print(data);
+        });
+
+        //鐗╂枡鏍¢獙
+        form.on('submit(btnCheck)', function (data) {
+            get_MaterialCheck(0);
+            return false;
+        });
+        //鏄惁绂佺敤鎸夐挳
+        form.on('checkbox(checkboxHUseFlag)', function (data) {
+            var checkUse=$("#HUseFlag").val(data.elem.checked);
+        });
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+
+            //$("#HSupID").val(sessionStorage["HUserName"]);
+            FetchSupInfo();
+            //$("#HCheckEmp").val(sessionStorage["HUserName"]);
+            //$("#HCheckTime").val(Format(new Date(), "yyyy-MM-dd"));
+            Organ();
+           
+        }
+
+
+        //#region 鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            $.ajax({
+                type: "get",
+                async: false,
+                url: GetWEBURL() + "GetOrganizations",
+                success: function (result) {
+                    var Organization = "";
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HUSEORGID").append(Organization);
+                        $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+        //闈炵┖楠岃瘉
+        function AllowLoadData(data) {
+            if ($("#HInBoxPackQty").val() < $("#HMinPackQty").val()) {
+                layer.alert("鏍囧噯鍖呰鏁颁笉鍏佽灏忎簬鏈�灏忓寘瑁呮暟");
+                return false;
+            }
+            else
+                return true;
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+
+            var HMinPackQty = $('#HMinPackQty').val();
+            var HInBoxPackQty = $('#HInBoxPackQty').val();
+            var HStopflag_check = $('#HStopflag').val();
+            if (HStopflag_check == "false") {
+                $('#HStopTime').val(" ");
+                console.log("1");
+            }
+            if (HMinPackQty.substring(HMinPackQty.length - 1, HMinPackQty.length) == ".") {
+                layer.msg("鍖呰鐨勭粨灏句笉鑳芥槸.锛�");
+                return;
+            } else {
+                var ref = /^[0-9]+\.?[0-9]*$/;
+                if (!ref.test(HMinPackQty)) {
+                    layer.msg("璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+                if (!ref.test(HInBoxPackQty)) {
+                    layer.msg("璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+                if (HInBoxPackQty == 0 || HInBoxPackQty == null || HInBoxPackQty == "0") {
+                    layer.msg("鏍囧噯鍖呰鏁拌涓嶈兘涓�0锛�");
+                    return;
+                }
+            }
+            var HMaterID = $('#HMaterNumber').val();
+            var sMainStr = JSON.stringify(data.field);
+            //var sMainSub = sMainStr + ";" +  HMaterID;
+            var itID = $('#HitemID').val();
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/MaterialHandingController/AddBill",
+                async: true,
+                data: { "msg": sMainStr },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#Saver_Edit').addClass("layui-btn-disabled").attr("disabled", true);
+                        //$('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                        linterid = data.data;
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        function Edit_Save(data) {
+
+            var HMinPackQty = $('#HMinPackQty').val();
+            var HInBoxPackQty = $('#HInBoxPackQty').val();
+            var HStopflag_check = $('#HStopflag').val();
+            if (HStopflag_check == "false") {
+                $('#HStopTime').val(" ");
+                console.log("1");
+            }
+            if (HMinPackQty.substring(HMinPackQty.length - 1, HMinPackQty.length) == ".") {
+                layer.msg("鍖呰鐨勭粨灏句笉鑳芥槸.锛�");
+                return;
+            } else {
+                var ref = /^[0-9]+\.?[0-9]*$/;
+                if (!ref.test(HMinPackQty)) {
+                    layer.msg("璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+                if (!ref.test(HInBoxPackQty)) {
+                    layer.msg("璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+                if (HInBoxPackQty == 0 || HInBoxPackQty == null || HInBoxPackQty == "0") {
+                    layer.msg("鏍囧噯鍖呰鏁拌涓嶈兘涓�0锛�");
+                    return;
+                }
+            }
+            var checkmate = $('#HUseFlag').val();
+            ////if ($('#HUseFlag').val() == 'Y') {
+            ////    var checkmate = $('#HUseFlag').val('1');
+            ////}
+            ////else
+            ////    $("#HUseFlag").val(0);
+            var HItemID = $('#HItemID').val();
+            var sMainStr = JSON.stringify(data.field);
+/*            var sMainSub = sMainStr + ";" + HItemID;*/
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/MaterialHandingController/EditSaveBill",
+                async: true,
+                data: { "msg": sMainStr },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#Saver_Edit').addClass("layui-btn-disabled").attr("disabled", true);
+                        linterid = data.data;
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+
+            $.ajax({
+                url: GetWEBURL() + "/MaterialHandingController/Edit_M",
+                type: "GET",
+                async: false,
+                data: { "HItemID": linterid, "user": sessionStorage["HUserName"] },
+                success: function (result) {               
+                    if (result.count > 0) {
+                        var data = result.data;
+                        
+                        //涓昏〃
+                        $("#HMaterNumber").val(data[0]["鐗╂枡浠g爜"]);
+                        $("#HMaterName").val(data[0]["鐗╂枡鍚嶇О"]);
+                        $("#HModel").val(data[0]["瑙勬牸鍨嬪彿"]);
+                        $("#HUseFlag").val(data[0]["鏄惁鍚敤"]=='Y'?true:false);
+                        $("#HMinPackQty").val(data[0]["鏈�灏忓寘瑁呮暟"]);
+                        $("#HInBoxPackQty").val(data[0]["鏍囧噯鍖呰鏁�"]);
+                        $("#HOutBoxPackQty").val(data[0]["HOutBoxPackQty"]);
+                        $("#HSupID").val(data[0]["渚涘簲鍟嗕唬鐮�"]);
+                        $("#HSupName").val(data[0]["渚涘簲鍟嗗悕绉�"]);
+                        $("#HMaker").val(data[0]["鍒涘缓浜�"]);
+                        $("#HCheckEmp").val(data[0]["瀹℃牳浜�"]);
+                        $("#HUpDater").val(data[0]["淇敼浜�"]);
+                        $("#HMakeTime").val(Format(new Date(data[0]["鍒涘缓鏃堕棿"]), "yyyy-MM-dd"));
+                        $("#HUpDateDate").val(Format(new Date(data[0]["淇敼鏃堕棿"]), "yyyy-MM-dd"));
+                        $("#HCheckTime").val(Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd"));
+                        var check = $("#HUseFlag").val();
+                        if ($("#HUseFlag").val() == 'false') {
+                            $("#checkboxHUseFlag").attr("checked", false);
+                        }
+                        else
+                            $("#checkboxHUseFlag").attr("checked", true);
+                       
+                        form.render('select');
+                        form.render('checkbox');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }
+            })
+        }
+
+        //鎵撳嵃
+        function get_print(data) {
+
+        }
+
+        function get_UrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        // 鐗╂枡鏍¢獙
+        function get_MaterialCheck(param = 0) {
+            var HMaterNumber = $("#HMaterNumber").val();
+            var user = sessionStorage["HUserName"];
+            var OrganizationID = sessionStorage["OrganizationID"];
+
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/MaterialHandingController/CheckMaterial",
+                async: true,
+                data: {
+                    "HMaterID": HMaterNumber,
+                    "user": user,
+                    "param": param,
+                    "OrganizationID": OrganizationID
+                },
+                success: function (data) {
+                    var responseData = data;
+                    if (typeof data === 'string') {
+                        try {
+                            responseData = JSON.parse(data);
+                        } catch (e) {
+                            if (data === "1") {
+                                responseData = 1;
+                            }
+                        }
+                    }
+
+                    if (responseData === 1) {
+                        // 寮瑰嚭璇㈤棶妗�
+                        layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾户缁紵', {
+                            icon: 3,
+                            title: '鎻愮ず'
+                        }, function (index) {
+                            layer.close(index);
+                            get_MaterialCheck(1);
+                        });
+                    } else if (responseData.code === "1") {
+                        // 姝e父杩斿洖鐗╂枡淇℃伅
+                        $("#HMaterName").val(responseData.data[0]["HName"]);
+                        $("#HModel").val(responseData.data[0]["HModel"]);
+                        $("#HUSEORGID").val(responseData.data[0]["HUSEORGID"]);
+                        if ($("#HUSEORGID").val() != OrganizationID) {
+                            layer.confirm('鐗╂枡缁勭粐鍜屼娇鐢ㄧ粍缁囦笉涓�鑷达紝鏄惁缁х画锛�', {
+                                btn: ['纭畾', '鍙栨秷'] 
+                            }, function (index) {
+                                layer.close(index);
+                                
+                            }, function (index) {
+                                
+                                layer.close(index);
+                                $("#HMaterName").val("");
+                                $("#HMaterNumber").val("");
+                                $("#HModel").val("");
+                                $("#HUSEORGID").val(OrganizationID);
+                            });
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(responseData.Message || "鐗╂枡淇℃伅涓嶅瓨鍦�", { time: 5000 });
+                    }
+                },
+                error: function (err) {
+                    layer.msg("鏍¢獙澶辫触:" + err, { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //鑾峰彇渚涘簲鍟咺D
+        function FetchSupInfo() {
+            var sWhere = "";
+            //var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+            $.ajax({
+                url: GetWEBURL() + "/Gy_Supplier/list",
+                type: "GET",
+                data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
+                success: function (result) {
+                    if (result.data.length > 0) {
+                        $("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+                    } else {
+                        layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
+                    }
+                    
+                }   
+            });
+        }
+
+
+    })
+</script>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
index b896404..d10c61d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
@@ -221,6 +221,13 @@
                                         <dd data-name="SRM_POInStockBillList_XB"><a lay-href="SRM/SRM_POInStockBillList_XB.html?type=ReArrival">澶忓疂閫佽揣鍗�</a> </dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>閫佽揣淇℃伅</a>
+                                    <dl class="layui-nav-child">
+                                        <dd data-name="SRM_MaterialHanding"><a lay-href="SRM/SRM_MaterialHanding.html">缁存姢閫佽揣淇℃伅</a></dd>
+                                        <dd data-name="SRM_MaterialHandingEdit"><a lay-href="SRM/SRM_MaterialHandingEdit.html">鏂板閫佽揣淇℃伅</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <li data-name="home" class="layui-nav-item">
diff --git a/WebSRM/login.html b/WebSRM/login.html
index 487ff03..436118d 100644
--- a/WebSRM/login.html
+++ b/WebSRM/login.html
@@ -139,7 +139,7 @@
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             layer.msg(result.Message, { icon: 1, });
                             sessionStorage["HUserName"] = result.data.h_p_SRM_GetSupIDByUser[0].Czymc;
-                            sessionStorage["HSupIDs"] = result.data.h_p_SRM_GetSupIDByUser1[0].HSupID;
+                            //sessionStorage["HSupIDs"] = result.data.h_p_SRM_GetSupIDByUser1[0].HSupID;
                             sessionStorage["OrganizationID"] = $("#edu").val();
                             sessionStorage["Organization"] = $("#edu option:selected").text();
                             sessionStorage["login"] = "login";

--
Gitblit v1.9.1