MES-WEB-LayUI.git

parent: 5aaa7600 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yangle

2022-11-17 f7e000f067bff879bc5cc70f7fb55e721bdd4a72

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

1个文件已删除

12个文件已修改

3个文件已添加

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2498 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_UnitGroup.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Unit.html	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html	347 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html	562 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html	976 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html	55 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -705,6 +705,8 @@
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_StockCheckItemList.html" />
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\InventoryAnalysis.html" />
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Add_Edit_Gy_WorkDay.html" />
    <Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_WorkDay.html" />
    <Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_ProcPriceList.html" />
    <Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_Group_Add_Edit.html" />
    <Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_ProcPrice.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,11 +4,11 @@
      //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_UnitGroup.html

New file
@@ -0,0 +1,103 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>è®¡éåä½ç»åè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <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="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©åä½
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//éæ©åä½
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetHUnitGroupNameValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: 'åä½ç»ID', hide: true }
                  , { field: 'è®¡éåä½ç»ä»£ç ', width: 150, title: 'è®¡éåä½ç»ä»£ç ' }
                  , { field: 'è®¡éåä½ç»', width: 150, title: 'è®¡éåä½ç»', sort: true }
              ]]
              , page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetUnitGroupList_Json",
                    async: true,
                    data: { "Unit": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/index.html

@@ -939,7 +939,8 @@
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.html">ä¸è¯åå åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html">æéåå åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillList.html">ä½ä¸æå¯¼ä¹¦ç»´æ¤</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBill.html">ä½ä¸æå¯¼ä¹¦</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillEdit.html">ä½ä¸æå¯¼ä¹¦ç¼è¾</a></dd>
                                        <dd><a href="Gy_SOPBill.html" target="main_self_frame">ä½ä¸æå¯¼ä¹¦</a></dd>
                                    </dl>
                                </dd>
                                <dd>
@@ -954,6 +955,7 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ProcPrice.html">å·¥åºå·¥ä»·èµæ</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ProcPriceList.html">å·¥åºå·¥ä»·èµæç»´æ¤</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_WorkDay.html">å·¥ä½æ¥åè¡¨</a></dd>
                                    </dl>
                                </dd>
                                <dd>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Department.html

@@ -286,6 +286,7 @@

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                data.field.HUseOrgID = sessionStorage["OrganizationID"];
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("è¯·è¾å¥é¨é¨ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -12,12 +12,15 @@
        .layui-form-label {
            width: 85px;
        }

        .layui-form-item .layui-input-inline {
            width: 50%;
        }

        .layui-inline {
            width: 290px;
        }

        .layui-form-item .layui-inline {
            margin-right: 0px;
        }
@@ -32,11 +35,10 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">å¤å¶</button>
                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">æ°å¢</button>
                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">å¤å¶</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
                                <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>
                                <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>-->

                            </div>
                        </div>
@@ -94,22 +96,22 @@
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
        <label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
            </button>
        </div>
    </div>-->
                                                        <label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                                                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            </button>
                                                        </div>
                                                    </div>-->
                                                </div>

                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">è®¡éåä½ç»</label>
                                                        <div class="layui-input-inline">
@@ -174,9 +176,9 @@

                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> é»è®¤ä»åºï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">é»è®¤ä»åº</label>
                                                        <div class="layui-input-inline">
@@ -230,9 +232,9 @@
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">è¾å©è®¡éåä½</label>
                                                        <div class="layui-input-inline">
@@ -250,8 +252,8 @@
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
                                                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
        </button>-->
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                        </button>-->
                                                        <!--<input id="HDormID" name="HDormID" type="hidden" />-->
                                                    </div>
                                                </div>
@@ -346,19 +348,19 @@
                                                    </div>
                                                </div>

                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> è±æè§æ ¼ï¼</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
                                                     </div>
                                                 </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> è±æè§æ ¼ï¼</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
                                                    </div>
                                                </div>

                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> è¾å©å±æ§ï¼</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> è¾å©å±æ§ï¼</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
@@ -557,6 +559,7 @@
                                , "HUnitID": data.ä¸»è®¡éåä½
                                , "HUnitName": data.ä¸»è®¡éåä½åç§°
                                , "HUnitGroupID": data.è®¡éåä½ç»
                                , "HUnitGroupName": data.è®¡éåä½ç»åç§°
                                , "HSubjoin": data.éå å±æ§1
                                , "HSubjoin2": data.éå å±æ§2
                                , "HColor": data.é¢è²
@@ -589,7 +592,7 @@
                                , "HEndFlag": data.æç»æ è®°
                                , "HStopFlag": data.ç¦ç¨æ è®°
                            });

                            console.log($('#HUnitGroupID').val());
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
                        }
@@ -604,12 +607,36 @@
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
                //var sMainSub = sMainStr + ';' + sSubStr;
                if ($("#HNumber").val() == 0) {
                    layer.msg("è¯·éæ©ç©æä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HName").val() == 0) {
                    layer.msg("è¯·éæ©ç©æåç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HUnitName").val() == 0) {
                    layer.msg("è¯·éæ©ä¸»è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HUnitGroupName").val() == 0) {
                    layer.msg("è¯·éæ©è®¡éåä½ç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HWhName").val() == 0) {
                    layer.msg("è¯·éæ©é»è®¤ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HSecUnitName").val() == 0) {
                    layer.msg("è¯·éæ©è¾å©è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Gy_Material/SaveGy_MaterialList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"]},
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
@@ -630,6 +657,12 @@
                        }
                    });
            });

            //å¤å¶æé®
            form.on('submit(Copy)', function (data) {
                $('#HNumber').val('');
            }); 

            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

@@ -647,7 +680,7 @@
                $("#UnitType").val(1);
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'åä½åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -664,7 +697,7 @@
                $("#UnitType").val(2);
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'åä½åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -679,15 +712,15 @@


            //éæ©è®¡éåä½ç»
            form.on('submit(HUnitGroupList)', function () {//éæ©å·¥ç§
            form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'å·¥ç§åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WorkTypeList.html', 'yes']
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitGroup.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -699,7 +732,7 @@
            form.on('submit(HWhList)', function () {//éæ©å·¥ç§
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'ä»åºåè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -727,6 +760,11 @@
            $("#HWhName").val(obj[0].HName);
            $("#HWhID").val(obj[0].HItemID);
        }
        //è¿åè®¡éåä½ç»
        function GetHUnitGroupNameValue(obj) {
            $("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
            $("#HUnitGroupID").val(obj[0].HItemID);
        }
        //è¿åè®¡éåä½
        function GetHUnitNameValue(obj) {
            if ($("#UnitType").val() == 1) {

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Unit.html

@@ -193,7 +193,7 @@
            var shijian = year + "-" + month + "-" + day;

            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
            if (hID == 1) {
                //id new
                $("#HItemID").val(0);
            }
@@ -372,12 +372,24 @@
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
                //var sMainSub = sMainStr + ';' + sSubStr;
                if (!$("#HNumber").val()) {
                    layer.msg("è¯·è¾å¥ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HName").val()) {
                    layer.msg("è¯·è¾å¥åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HRate").val()) {
                    layer.msg("è¯·è¾å¥æ¢ç®æ¯ä¾ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaveGy_UnitList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] },
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Xt_ORGANIZATIONSList.html

@@ -13,6 +13,8 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -52,10 +54,10 @@
                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                            <div class="layui-inline">
                                <label class="layui-form-label">æ¥æ</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HMakeTime" id="HMakeTime" autocomplete="off">
                                <div class="layui-input-block">
                                    <input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
                                </div>
                            </div>
                        </div>
@@ -110,6 +112,8 @@

            //#region è¿å¥é¡µé¢å³å è½½

            $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
            var ItemID;
            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            get_LoginIs();

@@ -124,7 +128,26 @@
            }
            //å¤ææä½ç±»å
            if (OperationType == 1) {//æ æºåæ°å¢
                $("#HItemID").val(0);
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/GetMaxHItemID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            $("#HItemID").val(data.data[0].Column1 + 1);  //è·åæå¤§HItemID å¹¶ä¸+1
                            ItemID = data.data[0].Column1 + 1;
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("éè¯¯:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
                });                
            }
            else if (OperationType == 3) {//ç¼è¾
                $("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
@@ -200,12 +223,18 @@
            function RoadBillMain(linterid) {
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();

                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));

                $.ajax({
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/list",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
                    type: "GET",
                    data: {
                        "sWhere": "and HItemID=" + linterid
                    },
                    //data: {
                    //    "sWhere": linterid,
                    //    "user": sessionStorage["HUserName"],
                    //    "Organization": sessionStorage["Organization"]
                    //},
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data[0];
@@ -218,10 +247,12 @@
                                "HNumber": data.ç»ç»ä»£ç 
                                , "HItemID": data.HItemID
                                , "HName": data.ç»ç»åç§°
                                , "HMakeTime": data.æ¥æ
                                //, "HMakeTime": data.æ¥æ
                                , "HStopflag": data.ç¦ç¨æ è®°
                                , "HRemark": data.å¤æ³¨
                            });
                            $("#HMakeTime").val(Format(data.æ¥æ, "yyyy-MM-dd"));

                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -237,19 +268,24 @@

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                if (data.field.HStopflag) {
                    data.field.HStopflag = 1
                } else  {
                    data.field.HStopflag = 0
                }
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + OperationType},
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //ä¿ååæµè§
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_Employee_Add_Edit_.html

@@ -13,6 +13,8 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -91,7 +93,8 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">åºçå¹´æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <!--<input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">-->
                                                <input type="date" class="layui-input" name="HBirthDay" id="HBirthDay" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -100,7 +103,6 @@
                                                <input type="text" name="HAge" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -212,7 +214,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ¯ä¸æ¶é´</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -346,13 +348,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">è¿åæ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">è½¬æ£æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -379,13 +381,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">åä¿æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ååå°ææ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                    </div>
@@ -393,7 +395,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ååå¼å§æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -405,7 +407,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ç¦»èæ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                    </div>
@@ -413,7 +415,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æä½è¯å°ææ¥</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -766,7 +768,17 @@
            else {
                layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
            }
            //$("#HGradDate").val(Format(2022-11-06, "yyyy-MM-dd"));

            $("#HAge").val(0);
            $("#HGradDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInComDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInsuranceDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractBDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractYear").val(0);
            $("#HDimissionDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HStayCardEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
        //#endregion


@@ -1189,12 +1201,25 @@
            }
            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                data.field.HUseOrgID = sessionStorage["OrganizationID"];
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = "";
                if (!AllowLoadData(sSubStr))//æ°æ®éªè¯
                {
                    return false;
                }
                if ($("#HDeptName").val() == 0) {
                    layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HGroupName").val() == 0) {
                    layer.msg("è¯·éæ©çç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HCTPrjName").val() == 0) {
                    layer.msg("è¯·éæ©æ ¸ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Employee/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_Unit.html

@@ -74,6 +74,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -243,6 +244,9 @@
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //æ°å¢
                    case 'set_AddNew': set_AddNew();
                        break;
                    case 'btn-getCheckData':
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
@@ -313,6 +317,19 @@
                };
            });

            //#region æ°å¢
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['100%', '100%']
                    , title: 'è®¡éåä½-æ°å¢'
                    , shift: 0//å¼¹åºå¨ç»
                    , content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Unit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Xt_ORGANIZATIONSList.html

@@ -378,7 +378,7 @@
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_WorkCenter',
                            url: GetWEBURL() + 'DeltetXt_ORGANIZATIONSList',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Add_Edit_Gy_WorkDay.html

New file
@@ -0,0 +1,347 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>åè£æ¹å¼ç¼è¾</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .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 id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">ä¿å</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">éåº</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">æ¥æ</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">ä¸çæ¶é´</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">ä¸çæ¶é´ï¼</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">åå»ºäºº</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">åè£æè´¨</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">å¤æ³¨</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                </div>
                            </div>
                        </div>
                      
                    </div>
                    <input id="HItemID" name="HItemID" type="hidden" value="0" />
                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                </form>
            </div>
        </div>
    </div>

    <script>
        //#region æå æ³¨é
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index' //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

            //#region å¬ç¨åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            //#endregion


            //#region è¿å¥é¡µé¢å³å è½½

            $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))

            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            get_LoginIs();

            //è·åé¡µé¢è·³è½¬åæ°
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//æä½ç±»å
            } else {
                var OperationType = params[params[0]];//æä½ç±»å
                var linterid = params[params[1]];//æºåid
                var HSouceBillType = params[params[2]];//æºåç±»å
            }
            //å¤ææä½ç±»å
            if (OperationType == 1) {//æ æºåæ°å¢
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//ç¼è¾
                $("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
                //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
                RoadBillMain(linterid);
            }
            else if (OperationType == 4) {//æµè§
                $("#HItemID").val(linterid);//
                //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
            }
            else {
                layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
            }
            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);

            //#endregion


            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //éåºæé®
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })

            //æ¯å¦ç¦ç¨æé®
            form.on('checkbox(checkboxHStopflag)', function (data) {
                $("#HStopflag").val(data.elem.checked);
            });

            form.on('submit(HEmp-BT)', function () {
                get_checkEmp();
            });
            
            //ä¿åæé®
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });

            //#endregion


            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

            //#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            function get_LoginIs() {
                if (sessionStorage.login != "login") {
                    layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
                        icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
                    }, function () { window.location.href = "../../user/login.html"; });
                }
            }
            //#endregion

            //#region å è½½è¡¨å¤´
            function RoadBillMain(linterid) {
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_PackType/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data[0];
                            var IsHStopflag = data.ç¦ç¨æ è®°;
                            var IsHTypeFlow = data.æç»æ è®°;
                            //ç¦ç¨æ è®°
                            if (IsHStopflag) {
                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            }
                            //æç»æ è®°
                            if (IsHTypeFlow) {
                                $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                "HItemID": data.HItemID
                                ,"HNumber": data.åè£æ¹å¼ä»£ç 
                                , "HName": data.åè£æ¹å¼åç§°
                                , "HParentID": data.HParentID
                                , "HShortNumber": data.çä»£ç 
                                , "HHelpCode": data.å©è®°ç 
                                //, "HMakeEmp": data.åå»ºäºº
                                , "HPackMaterial": data.åè£æè´¨
                                , "HLevel": data.ççº§
                                , "HLenhth": data.é¿
                                , "HWidth": data.å®½
                                , "HHeight": data.é«
                                //, "HStopflag": data.ç¦ç¨æ è®°
                                , "HRemark": data.å¤æ³¨
                                , "HUseFlag": data.ä½¿ç¨æ è®°
                                , "HMakeTime": Format(data.åå»ºæ¶é´, "yyyy-MM-dd")
                            });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("åçéè¯¯!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("è¯·è¾å¥åè£æ¹å¼ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HName").val()) {
                    layer.msg("è¯·è¾å¥åè£æ¹å¼åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HMakeEmpID").val() == 0) {
                    layer.msg("è¯·éæ©åå»ºäººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HLenhth").val()) {
                    layer.msg("è¯·è¾å¥é¿ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HWidth").val()) {
                    layer.msg("è¯·è¾å¥å®½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HHeight").val()) {
                    layer.msg("è¯·è¾å¥é«ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_PackType/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //ä¿ååæµè§
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("éè¯¯:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
                });
            }
            //#endregion

            //#region éæ©èåæ¹æ³
            function get_checkEmp() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'èååè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HMakeEmp").val(checkStatus.data[0].HName);
                        $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion


            //#region ä¿ååæµè§æ¹æ³
            function ReRoadBillMain() {
                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
            }
            //#endregion

            //#endregion


            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_WorkDay.html

New file
@@ -0,0 +1,562 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>åè£æ¹å¼</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åè£ä»£ç </label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åè£åç§°</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></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_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å¬ç¨åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_PackType";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HItemID","HParentID",];
            //#endregion

            //#region è¿å¥é¡µé¢å³å è½½

            //åå§åçé¢
            set_ClearBill();

            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢
                    case 'set_AddNew': set_AddNew();
                        break;

                    //ç¼è¾
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //å é¤
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //éåºæé®
                    case 'get_Exit': parent.layui.admin.events.closeThisTabs();
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
                //$("#btnSearch").click();
            });
            //#endregion

            //#region æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion

            //#endregion

            //#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

            //#region åå§åçé¢
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
            }
            //#endregion

            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'åè£æ¹å¼ä»£ç ', title: 'åè£æ¹å¼ä»£ç ' }
                    //    , { field: 'åè£æ¹å¼åç§°', title: 'åè£æ¹å¼åç§°' }
                    //    , { field: 'ççº§', title: 'ççº§' }
                    //    //, { field: 'æç»æ è®°', title: 'æç»æ è®°' }
                    //    //, { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
                    //    , { field: 'è´è´£äºº', title: 'è´è´£äºº' }
                    //    , { field: 'å¤æ³¨', title: 'å¤æ³¨' }
                    //    , { field: 'åè£æè´¨', title: 'åè£æè´¨' }
                    //    , { field: 'é¿', title: 'é¿' }
                    //    , { field: 'å®½', title: 'å®½' }
                    //    , { field: 'é«', title: 'é«' }
                    //]]
                };
            }
            //#endregion



            //#region æ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_PackType/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and åè£æ¹å¼ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and åè£æ¹å¼åç§° like '%" + HName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion


            //#region å·æ°éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");

                sWhere = "";
            }
            //#endregion


            //#region æ°å¢
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['100%', '100%']
                    , title: 'åè£æ¹å¼åè¡¨-æ°å¢'
                    , shift: 0//å¼¹åºå¨ç»
                    , content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion

            //#region ç¼è¾
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'åè£æ¹å¼åè¡¨-ç¼è¾'
                        , shift: 0//å¼¹åºå¨ç»
                        , content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
                }
            }
            //#endregion

            //#region å é¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾å°frameç´¢å¼
                                        var index = layer.getFrameIndex(window.name);
                                        //å³éå½åframe
                                        layer.close(wait);
                                        //ä¿®æ¹ä¸ºååå·æ°çé¢
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })

                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }

            }
            //#endregion

            //#region å·æ°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion


            //#region éèåè®¾ç½®
            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);//å³éå¼¹çª
                    }
                })
            }
            //#endregion
            //#region æ¾ç¤ºåæ°æ®
            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 = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //è®¾ç½®åå®½
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //è®¾ç½®åå®¹åä½å¤§å°
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //è®¾ç½®åå®½
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //æ¾ç¤ºå
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //åæ¶å»ç»å
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //å»ç»å
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

            //#endregion

            //ä»¥ä¸æ¯layuiæ¨¡å
        });


    </script>

</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_SOPBill.html

File was deleted

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -81,6 +81,7 @@
                                            <select name="HBillType" id="HBillType">
                                                <option value="3711">çäº§æ±æ¥å</option>
                                                <option value="3710">çäº§è®¢å</option>
                                                <option value="3714">å·¥åºæ±æ¥å</option>
                                            </select>
                                        </div>
                                    </div>
@@ -1178,9 +1179,11 @@
                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//éç©ºéªè¯
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
                        url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                        //url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",  //æ§
                        type: "GET",
                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": '', "HCustom1": '', "HCustom2": '' },
                        //data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },  //æ§
                        success: function (result) {
                            //debugger;
                            playSound1();
@@ -1207,10 +1210,14 @@
                                    element.tabChange('tab-ProductlnBill', '2');//è·³è½¬é¡µç¾
                                }
                                else if (result.data.HBarType == 'æºåæ¡ç ') {
                                    $("#HSupName").val(result.data.HSupName);
                                    $("#HSupID").val(result.data.HSupID);
                                    $("#HDeptName").val(result.data.HDeptName);
                                    $("#HDeptID").val(result.data.HDeptID);
                                    //$("#HSupName").val(result.data.HSupName);
                                    //$("#HSupID").val(result.data.HSupID);
                                    //$("#HDeptName").val(result.data.HDeptName);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    if (result.data.hDeptIDField != 0) {
                                        $("#HDeptID").val(result.data.hDeptIDField);
                                        $("#HDeptName").val(result.data.hDeptNameField);
                                    }
                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    HSourceFlag = true;
                                    //è·åæºåç±»åãæºååå·
@@ -1229,10 +1236,14 @@
                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                    }
                                    else {
                                        $("#HSupName").val(result.data.HSupName);
                                        $("#HSupID").val(result.data.HSupID);
                                        //$("#HSupName").val(result.data.HSupName);
                                        //$("#HSupID").val(result.data.HSupID);
                                        //$("#HDeptName").val(result.data.HDept);
                                        //$("#HDeptID").val(result.data.HDeptID);
                                        if (result.data.hDeptIDField != 0) {
                                            $("#HDeptID").val(result.data.hDeptIDField);
                                            $("#HDeptName").val(result.data.hDeptNameField);
                                        }
                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                        $("#HBillType").val(result.data.hSourceBillTypeField)
                                        HSourceFlag = true;
@@ -1246,11 +1257,20 @@
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        if (result.data.hSourceBillTypeField == "3710") {
                                        else if (result.data.hSourceBillTypeField == "3710") {
                                            $("#HBillType").empty();
                                            $("#HBillType").val("3710");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§è®¢å' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        else if (result.data.hSourceBillTypeField == "3714") {
                                            $("#HBillType").empty();
                                            $("#HBillType").val("3714");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å·¥åºæ±æ¥å' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
@@ -1404,6 +1424,7 @@
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var sBillType = '1202'
                var HSourceBillType = $("#HBillType").val()
                if (HSourceBillNo == "" || sInterID <= 0) {
                    layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
@@ -1411,15 +1432,21 @@
                }
                //
                $.ajax({ 
                    url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_ProductIn_Json",
                    //url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",    //æ§
                    type: "GET",
                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"] },
                    //data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },    //æ§
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            if (result.data[0].HDeptID != 0) {
                                $("#HDeptID").val(result.data[0].HDeptID);
                                $("#HDeptName").val(result.data[0].HDeptName);
                            if (result.data.hDeptIDField != 0) {
                                $("#HDeptID").val(result.data.hDeptIDField);
                                $("#HDeptName").val(result.data.hDeptNameField);
                            }
                            //if (result.data[0].HDeptID != 0) {
                            //    $("#HDeptID").val(result.data[0].HDeptID);
                            //    $("#HDeptName").val(result.data[0].HDeptName);
                            //}
                            playSound1();
                            HSourceFlag = true;
                            layer.load(3)

			@@ -705,6 +705,8 @@
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_StockCheckItemList.html" />
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\InventoryAnalysis.html" />
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\Sc_MouldStockBillMain_Temp.html" />
			<Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Add_Edit_Gy_WorkDay.html" />
			<Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_WorkDay.html" />
			<Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_ProcPriceList.html" />
			<Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_Group_Add_Edit.html" />
			<Content Include="views\åºç¡èµæ\å·¥èµåºç¡èµæ\Gy_ProcPrice.html" />

			@@ -4,11 +4,11 @@
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨

New file
			@@ -0,0 +1,103 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>è®¡éåä½ç»åè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<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="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {//éæ©åä½
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			RoadQuery($('#Value').val());
			});
			form.on('submit(FH)', function () {//éæ©åä½
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			parent.GetHUnitGroupNameValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val());
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'HItemID', width: 150, title: 'åä½ç»ID', hide: true }
			, { field: 'è®¡éåä½ç»ä»£ç ', width: 150, title: 'è®¡éåä½ç»ä»£ç ' }
			, { field: 'è®¡éåä½ç»', width: 150, title: 'è®¡éåä½ç»', sort: true }
			]]
			, page: true
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where) {
			var Value = Where;
			if (Value == null) {
			Value = '';
			}
			$.ajax({
			type: "get",
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
			url: GetWEBURL() + "/Web/GetUnitGroupList_Json",
			async: true,
			data: { "Unit": Value },
			//data: { "Value": Value },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -939,7 +939,8 @@
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.html">ä¸è¯åå åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html">æéåå åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillList.html">ä½ä¸æå¯¼ä¹¦ç»´æ¤</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBill.html">ä½ä¸æå¯¼ä¹¦</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillEdit.html">ä½ä¸æå¯¼ä¹¦ç¼è¾</a></dd>
			<dd><a href="Gy_SOPBill.html" target="main_self_frame">ä½ä¸æå¯¼ä¹¦</a></dd>
			</dl>
			</dd>
			<dd>
			@@ -954,6 +955,7 @@
			<dl class="layui-nav-child">
			<dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ProcPrice.html">å·¥åºå·¥ä»·èµæ</a></dd>
			<dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ProcPriceList.html">å·¥åºå·¥ä»·èµæç»´æ¤</a></dd>
			<dd><a lay-href="åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_WorkDay.html">å·¥ä½æ¥åè¡¨</a></dd>
			</dl>
			</dd>
			<dd>

			@@ -286,6 +286,7 @@

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			data.field.HUseOrgID = sessionStorage["OrganizationID"];
			var sMainStr = JSON.stringify(data.field);
			if (!$("#HNumber").val()) {
			layer.msg("è¯·è¾å¥é¨é¨ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			@@ -12,12 +12,15 @@
			.layui-form-label {
			width: 85px;
			}

			.layui-form-item .layui-input-inline {
			width: 50%;
			}

			.layui-inline {
			width: 290px;
			}

			.layui-form-item .layui-inline {
			margin-right: 0px;
			}
			@@ -32,11 +35,10 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">å¤å¶</button>
			<button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">æ°å¢</button>
			<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">å¤å¶</button>
			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>
			<!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>-->

			</div>
			</div>
			@@ -94,22 +96,22 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
			<input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
			<input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			</div>

			<div class="layui-inline">
			<!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è®¡éåä½ç»</label>
			<div class="layui-input-inline">
			@@ -174,9 +176,9 @@

			<div class="layui-inline">
			<!--<label class="layui-form-label"> é»è®¤ä»åºï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">é»è®¤ä»åº</label>
			<div class="layui-input-inline">
			@@ -230,9 +232,9 @@
			<div class="layui-row">
			<div class="layui-inline">
			<!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è¾å©è®¡éåä½</label>
			<div class="layui-input-inline">
			@@ -250,8 +252,8 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<!--<input id="HDormID" name="HDormID" type="hidden" />-->
			</div>
			</div>
			@@ -346,19 +348,19 @@
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label"> è±æè§æ ¼ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"> è±æè§æ ¼ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label"> è¾å©å±æ§ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"> è¾å©å±æ§ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			@@ -557,6 +559,7 @@
			, "HUnitID": data.ä¸»è®¡éåä½
			, "HUnitName": data.ä¸»è®¡éåä½åç§°
			, "HUnitGroupID": data.è®¡éåä½ç»
			, "HUnitGroupName": data.è®¡éåä½ç»åç§°
			, "HSubjoin": data.éå å±æ§1
			, "HSubjoin2": data.éå å±æ§2
			, "HColor": data.é¢è²
			@@ -589,7 +592,7 @@
			, "HEndFlag": data.æç»æ è®°
			, "HStopFlag": data.ç¦ç¨æ è®°
			});

			console.log($('#HUnitGroupID').val());
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			@@ -604,12 +607,36 @@
			var sMainStr = JSON.stringify(data.field);
			//var sSubStr = JSON.stringify(table.cache['mainTable']);
			//var sMainSub = sMainStr + ';' + sSubStr;
			if ($("#HNumber").val() == 0) {
			layer.msg("è¯·éæ©ç©æä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HName").val() == 0) {
			layer.msg("è¯·éæ©ç©æåç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HUnitName").val() == 0) {
			layer.msg("è¯·éæ©ä¸»è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HUnitGroupName").val() == 0) {
			layer.msg("è¯·éæ©è®¡éåä½ç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HWhName").val() == 0) {
			layer.msg("è¯·éæ©é»è®¤ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecUnitName").val() == 0) {
			layer.msg("è¯·éæ©è¾å©è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "Gy_Material/SaveGy_MaterialList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"]},
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			@@ -630,6 +657,12 @@
			}
			});
			});

			//å¤å¶æé®
			form.on('submit(Copy)', function (data) {
			$('#HNumber').val('');
			});

			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			@@ -647,7 +680,7 @@
			$("#UnitType").val(1);
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'åä½åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -664,7 +697,7 @@
			$("#UnitType").val(2);
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'åä½åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -679,15 +712,15 @@


			//éæ©è®¡éåä½ç»
			form.on('submit(HUnitGroupList)', function () {//éæ©å·¥ç§
			form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥ç§åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WorkTypeList.html', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitGroup.html', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -699,7 +732,7 @@
			form.on('submit(HWhList)', function () {//éæ©å·¥ç§
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä»åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -727,6 +760,11 @@
			$("#HWhName").val(obj[0].HName);
			$("#HWhID").val(obj[0].HItemID);
			}
			//è¿åè®¡éåä½ç»
			function GetHUnitGroupNameValue(obj) {
			$("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
			$("#HUnitGroupID").val(obj[0].HItemID);
			}
			//è¿åè®¡éåä½
			function GetHUnitNameValue(obj) {
			if ($("#UnitType").val() == 1) {

			@@ -193,7 +193,7 @@
			var shijian = year + "-" + month + "-" + day;

			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			if (hID == 1) {
			//id new
			$("#HItemID").val(0);
			}
			@@ -372,12 +372,24 @@
			var sMainStr = JSON.stringify(data.field);
			//var sSubStr = JSON.stringify(table.cache['mainTable']);
			//var sMainSub = sMainStr + ';' + sSubStr;
			if (!$("#HNumber").val()) {
			layer.msg("è¯·è¾å¥ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HName").val()) {
			layer.msg("è¯·è¾å¥åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HRate").val()) {
			layer.msg("è¯·è¾å¥æ¢ç®æ¯ä¾ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "SaveGy_UnitList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] },
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼

			@@ -13,6 +13,8 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<style>
			.layui-form-item .layui-inline {
			margin-top: 5px;
			@@ -52,10 +54,10 @@
			<input class="layui-input" name="HName" id="HName" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HMakeTime" id="HMakeTime" autocomplete="off">
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
			</div>
			</div>
			</div>
			@@ -110,6 +112,8 @@

			//#region è¿å¥é¡µé¢å³å è½½

			$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
			var ItemID;
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();

			@@ -124,7 +128,26 @@
			}
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºåæ°å¢
			$("#HItemID").val(0);
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/GetMaxHItemID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HItemID").val(data.data[0].Column1 + 1); //è·åæå¤§HItemID å¹¶ä¸+1
			ItemID = data.data[0].Column1 + 1;
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.alert("éè¯¯:" + err, { icon: 5 });
			console.log("Reason" + sMainStr);
			}
			});
			}
			else if (OperationType == 3) {//ç¼è¾
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			@@ -200,12 +223,18 @@
			function RoadBillMain(linterid) {
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();

			$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));

			$.ajax({
			url: GetWEBURL() + "Xt_ORGANIZATIONS/list",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
			type: "GET",
			data: {
			"sWhere": "and HItemID=" + linterid
			},
			//data: {
			// "sWhere": linterid,
			// "user": sessionStorage["HUserName"],
			// "Organization": sessionStorage["Organization"]
			//},
			data: { "HInterID": linterid },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data[0];
			@@ -218,10 +247,12 @@
			"HNumber": data.ç»ç»ä»£ç
			, "HItemID": data.HItemID
			, "HName": data.ç»ç»åç§°
			, "HMakeTime": data.æ¥æ
			//, "HMakeTime": data.æ¥æ
			, "HStopflag": data.ç¦ç¨æ è®°
			, "HRemark": data.å¤æ³¨
			});
			$("#HMakeTime").val(Format(data.æ¥æ, "yyyy-MM-dd"));

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -237,19 +268,24 @@

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			if (data.field.HStopflag) {
			data.field.HStopflag = 1
			} else {
			data.field.HStopflag = 0
			}
			var sMainStr = JSON.stringify(data.field);
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + OperationType},
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			ReRoadBillMain();
			//ReRoadBillMain();
			}
			else {
			layer.alert(data.Message, { icon: 5 });

			@@ -74,6 +74,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -243,6 +244,9 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			break;
			case 'btn-getCheckData':
			var data = checkStatus.data;
			layer.alert(JSON.stringify(data));
			@@ -313,6 +317,19 @@
			};
			});

			//#region æ°å¢
			function set_AddNew() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'è®¡éåä½-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Unit.html?OperationType=1&linterid=&HSouceBillType='
			})
			}
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HNumber = $("#HNumber").val();

			@@ -378,7 +378,7 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_WorkCenter',
			url: GetWEBURL() + 'DeltetXt_ORGANIZATIONSList',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			success: function (result) {

New file
			@@ -0,0 +1,347 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>åè£æ¹å¼ç¼è¾</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<style>
			.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 id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">éåº</button>
			</div>
			</div>
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
			<input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸çæ¶é´</label>
			<div class="layui-input-inline">
			<input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸çæ¶é´ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åå»ºäºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åè£æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			</div>
			</div>
			</div>

			</div>
			<input id="HItemID" name="HItemID" type="hidden" value="0" />
			<input id="HBarCode" name="HBarCode" type="hidden" value="0" />
			<input id="HParentID" name="HParentID" type="hidden" value="0" />
			<input id="HUpDater" name="HUpDater" type="hidden" value="0" />
			<input id="HShortNumber" name="HShortNumber" type="hidden" />
			</form>
			</div>
			</div>
			</div>

			<script>
			//#region æå æ³¨é
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {

			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			var sWhere = "";
			var date = new Date();
			var day = date.getDate();
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;
			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½

			$('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();

			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			}
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºåæ°å¢
			$("#HItemID").val(0);
			}
			else if (OperationType == 3) {//ç¼è¾
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(linterid);
			}
			else if (OperationType == 4) {//æµè§
			$("#HItemID").val(linterid);//
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(linterid);
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}
			$("#HUSEORGID").val(sessionStorage["OrganizationID"]);

			//#endregion


			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//éåºæé®
			form.on('submit(Cancel)', function () {
			Pub_Close(1);
			})

			//æ¯å¦ç¦ç¨æé®
			form.on('checkbox(checkboxHStopflag)', function (data) {
			$("#HStopflag").val(data.elem.checked);
			});

			form.on('submit(HEmp-BT)', function () {
			get_checkEmp();
			});

			//ä¿åæé®
			form.on('submit(set_SaveBill)', function (data) {
			set_SaveBill(data);
			});

			//#endregion


			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			function get_LoginIs() {
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}
			}
			//#endregion

			//#region å è½½è¡¨å¤´
			function RoadBillMain(linterid) {
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "Gy_PackType/cx",
			type: "GET",
			data: {
			"HInterID": linterid
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data[0];
			var IsHStopflag = data.ç¦ç¨æ è®°;
			var IsHTypeFlow = data.æç»æ è®°;
			//ç¦ç¨æ è®°
			if (IsHStopflag) {
			$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
			}
			//æç»æ è®°
			if (IsHTypeFlow) {
			$("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
			}
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HItemID": data.HItemID
			,"HNumber": data.åè£æ¹å¼ä»£ç
			, "HName": data.åè£æ¹å¼åç§°
			, "HParentID": data.HParentID
			, "HShortNumber": data.çä»£ç
			, "HHelpCode": data.å©è®°ç
			//, "HMakeEmp": data.åå»ºäºº
			, "HPackMaterial": data.åè£æè´¨
			, "HLevel": data.ççº§
			, "HLenhth": data.é¿
			, "HWidth": data.å®½
			, "HHeight": data.é«
			//, "HStopflag": data.ç¦ç¨æ è®°
			, "HRemark": data.å¤æ³¨
			, "HUseFlag": data.ä½¿ç¨æ è®°
			, "HMakeTime": Format(data.åå»ºæ¶é´, "yyyy-MM-dd")
			});
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			var sMainStr = JSON.stringify(data.field);
			if (!$("#HNumber").val()) {
			layer.msg("è¯·è¾å¥åè£æ¹å¼ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HName").val()) {
			layer.msg("è¯·è¾å¥åè£æ¹å¼åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HMakeEmpID").val() == 0) {
			layer.msg("è¯·éæ©åå»ºäººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HLenhth").val()) {
			layer.msg("è¯·è¾å¥é¿ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HWidth").val()) {
			layer.msg("è¯·è¾å¥å®½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HHeight").val()) {
			layer.msg("è¯·è¾å¥é«ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Gy_PackType/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			//ReRoadBillMain();
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.alert("éè¯¯:" + err, { icon: 5 });
			console.log("Reason" + sMainStr);
			}
			});
			}
			//#endregion

			//#region éæ©èåæ¹æ³
			function get_checkEmp() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMakeEmp").val(checkStatus.data[0].HName);
			$("#HMakeEmpID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion


			//#region ä¿ååæµè§æ¹æ³
			function ReRoadBillMain() {
			location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
			//document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
			}
			//#endregion

			//#endregion


			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>
			</body>
			</html>

New file
			@@ -0,0 +1,562 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>åè£æ¹å¼</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åè£ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åè£åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></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_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var Organization = sessionStorage["Organization"]
			var HModName = "Gy_PackType";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","HParentID",];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åçé¢
			set_ClearBill();

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			break;

			//ç¼è¾
			case 'set_ShowBill': set_ShowBill();
			break;
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//éåºæé®
			case 'get_Exit': parent.layui.admin.events.closeThisTabs();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			sWhere = "";
			//$("#btnSearch").click();
			});
			//#endregion

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});
			//#endregion

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			// , { field: 'åè£æ¹å¼ä»£ç ', title: 'åè£æ¹å¼ä»£ç ' }
			// , { field: 'åè£æ¹å¼åç§°', title: 'åè£æ¹å¼åç§°' }
			// , { field: 'ççº§', title: 'ççº§' }
			// //, { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			// //, { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			// , { field: 'è´è´£äºº', title: 'è´è´£äºº' }
			// , { field: 'å¤æ³¨', title: 'å¤æ³¨' }
			// , { field: 'åè£æè´¨', title: 'åè£æè´¨' }
			// , { field: 'é¿', title: 'é¿' }
			// , { field: 'å®½', title: 'å®½' }
			// , { field: 'é«', title: 'é«' }
			//]]
			};
			}
			//#endregion



			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_PackType/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (HNumber) {
			sWhere += " and åè£æ¹å¼ä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and åè£æ¹å¼åç§° like '%" + HName + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion


			//#region å·æ°éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");

			sWhere = "";
			}
			//#endregion


			//#region æ°å¢
			function set_AddNew() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'åè£æ¹å¼åè¡¨-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
			})
			}
			//#endregion

			//#region ç¼è¾
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].HItemID.toString();
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'åè£æ¹å¼åè¡¨-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion

			//#region å é¤
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var ItemID = data[0].HItemID.toString();
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_PackType',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(wait);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(wait);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(wait);
			}
			});
			})

			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}

			}
			//#endregion

			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_Display(sWhere);
			}
			//#endregion


			//#region éèåè®¾ç½®
			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);//å³éå¼¹çª
			}
			})
			}
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			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 = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}
			//#endregion

			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å
			});


			</script>

			</body>
			</html>

			@@ -81,6 +81,7 @@
			<select name="HBillType" id="HBillType">
			<option value="3711">çäº§æ±æ¥å</option>
			<option value="3710">çäº§è®¢å</option>
			<option value="3714">å·¥åºæ±æ¥å</option>
			</select>
			</div>
			</div>
			@@ -1178,9 +1179,11 @@
			//if (AllowLoadData(sSubStr, 'HBarCode') != false) {//éç©ºéªè¯
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			//url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json", //æ§
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": '', "HCustom1": '', "HCustom2": '' },
			//data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] }, //æ§
			success: function (result) {
			//debugger;
			playSound1();
			@@ -1207,10 +1210,14 @@
			element.tabChange('tab-ProductlnBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			//$("#HSupName").val(result.data.HSupName);
			//$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptID").val(result.data.HDeptID);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			@@ -1229,10 +1236,14 @@
			$("#HSourceBillNo").attr("readonly", "readonly");
			}
			else {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			//$("#HSupName").val(result.data.HSupName);
			//$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			$("#HBillType").val(result.data.hSourceBillTypeField)
			HSourceFlag = true;
			@@ -1246,11 +1257,20 @@
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			if (result.data.hSourceBillTypeField == "3710") {
			else if (result.data.hSourceBillTypeField == "3710") {
			$("#HBillType").empty();
			$("#HBillType").val("3710");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (result.data.hSourceBillTypeField == "3714") {
			$("#HBillType").empty();
			$("#HBillType").val("3714");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å·¥åºæ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			@@ -1404,6 +1424,7 @@
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var sBillType = '1202'
			var HSourceBillType = $("#HBillType").val()
			if (HSourceBillNo == "" \|\| sInterID <= 0) {
			layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -1411,15 +1432,21 @@
			}
			//
			$.ajax({
			url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_ProductIn_Json",
			//url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json", //æ§
			type: "GET",
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"] },
			//data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo }, //æ§
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			if (result.data[0].HDeptID != 0) {
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			//if (result.data[0].HDeptID != 0) {
			// $("#HDeptID").val(result.data[0].HDeptID);
			// $("#HDeptName").val(result.data[0].HDeptName);
			//}
			playSound1();
			HSourceFlag = true;
			layer.load(3)