MES-WEB-LayUI.git

parent: 2b6ca739 | 补丁 | 提交 | ignore whitespace

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

yangle

2022-11-21 3aedb186b2cf0b8a8dedbcc55e59b6d3249dd4c6

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

3个文件已修改

	WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html	181 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html	219 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -27,7 +27,7 @@
    </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;">
@@ -43,54 +43,54 @@
                            <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">
                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">åå»ºäºº</label>
                                <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>
                                    <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">åè£æè´¨</label>
                                <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">
                                    <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
                                </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 class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
                                </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="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
                                </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 class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
                                </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="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
                                </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>
@@ -111,7 +111,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , laydate = layui.laydate;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
@@ -120,10 +121,37 @@
            var shijian = year + "-" + month + "-" + day;
            //#endregion


            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            laydate.render({
                elem: '#HWorkBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HWorkEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakEnd'
                , type: 'time'
            });
            //#region è¿å¥é¡µé¢å³å è½½

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

            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            get_LoginIs();
@@ -175,7 +203,7 @@
            form.on('submit(HEmp-BT)', function () {
                get_checkEmp();
            });
            

            //ä¿åæé®
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
@@ -201,7 +229,7 @@
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_PackType/cx",
                    url: GetWEBURL() + "Gy_WorkDay/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
@@ -221,21 +249,13 @@
                            }
                            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")
                                , "HDate": data.HDate
                                , "HWorkBegin": data.HWorkBegin
                                , "HWorkEnd": data.HWorkEnd
                                , "HNoonbreakBegin": data.HNoonbreakBegin
                                , "HNoonbreakEnd": data.HNoonbreakEnd
                                , "HNightbreakBegin": data.HNightbreakBegin
                                , "HNightbreakEnd": data.HNightbreakEnd
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -253,33 +273,9 @@
            //#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", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",
@@ -302,33 +298,6 @@
                });
            }
            //#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=');

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

@@ -25,15 +25,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åè£ä»£ç </label>
                                    <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">
                                        <input type="text" class="layui-input" name="HDate" id="HDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_PackType";
            var HModName = "Gy_WorkDay";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HItemID","HParentID",];
            //#endregion

            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            //#region è¿å¥é¡µé¢å³å è½½

            //åå§åçé¢
@@ -218,7 +215,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_PackType/list',
                    url: GetWEBURL() + '/Gy_WorkDay/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

@@ -286,12 +283,10 @@

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

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
@@ -313,11 +308,8 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and åè£æ¹å¼ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and åè£æ¹å¼åç§° like '%" + HName + "%'";
                if (HDate) {
                    sWhere += " and DATEDIFF(D,æ¥æ,'" + HDate +"')=0";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
@@ -341,7 +333,7 @@
                    type: 2
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['100%', '100%']
                    , title: 'åè£æ¹å¼åè¡¨-æ°å¢'
                    , title: 'å·¥ä½æ¥-æ°å¢'
                    , shift: 0//å¼¹åºå¨ç»
                    , content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
                })
@@ -358,7 +350,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'åè£æ¹å¼åè¡¨-ç¼è¾'
                        , title: 'å·¥ä½æ¥-ç¼è¾'
                        , shift: 0//å¼¹åºå¨ç»
                        , content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
@@ -378,7 +370,7 @@
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            url: GetWEBURL() + 'DeltetGy_WorkDay',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {

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

@@ -1,5 +1,5 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>ä½ä¸æå¯¼ä¹¦</title>
@@ -34,7 +34,7 @@
        }

        .layui-table-cell{
            height:20px;
            height:23px;
        }

    </style>
@@ -51,7 +51,7 @@
                                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">éåº</button>
                                </div>
                                <div class="layui-inline">
                                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="IsAuto" style="background-color:#959393;margin-left:15px" id="auto">èªå¨ææ¾</button>
                                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">èªå¨ææ¾</button>
                                </div>
                                <div class="layui-inline">
                                    <h1 style="text-align: center;margin-left:300px"><b>å·¥ä½ä½ä¸æå¯¼ä¹¦</b></h1>
@@ -90,19 +90,13 @@
                            <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
                            <div style="margin-top:10px; width:100%;height:100%">
                                <div style="width:77%;height:670px;float:left;line-height:500px">
                                    <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin:200px 0 0 1.5px;font-size:25px"><</button>-->

                                    <div class="layui-carousel" id="test1">
                                        <div carousel-item>
                                            <div><img src="ä½ä¸æå¯¼ä¹¦.png" style="width:100%;height:100%"></div>
                                            <div><img id="img" src="" style="width:100%;height:100%"></div>
                                            <div><img src="../../../Files/R-C.jpg" style="width:100%;height:100%"></div>

                                            <!--<div><embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>-->
                                        <div carousel-item id="file">
                                           
                                        </div>
                                    </div>

                                    <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin-top:200px;font-size:25px">></button>-->
                                </div>
                                <div style="width:22%;height:670px;float:left;margin-left:1%">
                                    <div style="width:100%;height:49%;margin-bottom:2%">
@@ -124,7 +118,7 @@
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>-->
        <!--<a class="layui-btn layui-btn-xs" lay-event="view">æ¥ç</a>-->
        <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>-->
    </script>
    <script type="text/javascript">
@@ -140,28 +134,6 @@
            var HSouceBillType = params[params[2]];//æºåç±»å
            var closeType = params[params[3]];  //å³éç±»å
        }

        // æ¥å·¥å¹³å°;å·¥åºæµè½¬å¡ç»´æ¤;çäº§èµæºåè¡¨

        //1.è¿å¥æ¨¡åï¼ä»æ¬å°éç½®æä»¶è·åæå±çäº§èµæºåå·¥ä½ï¼åå§åæ¨¡åãçé¢æ¸ç©ºï¼å³è¾¹ä¸ç½æ ¼æ¾ç¤ºè¯¥çäº§èµæºçäº§ç¶æè¡¨éçå½æ¥è®¡åå·¥åï¼é»è®¤ä¸ºå½åå¼å·¥çå·¥åï¼ä¸ç½æ ¼æ¾ç¤ºè¿ä¸ªå·¥ååè¯¥å·¥ä½çæä»¶æ¸å(è·åä½ä¸æå¯¼ä¹¦çæ°æ®)ã

        //2.å·¦è¾¹æ¾ç¤ºå·¥ä½ä½ä¸æå¯¼ä¹¦çç¬¬ä¸å¼ æä»¶(å¾çæPDF) ã

        //3.ç¹å»ä¸ä¸å¼ ï¼ä¸ä¸å¼ ï¼å¯ä»¥å¨ä½ä¸æå¯¼ä¹¦çæ¬å·¥ä½çæä»¶åè¡¨éåæ¢PDFæä»¶æå¾ç;

        //4.å·¥ååè¡¨éï¼åå»æèç¹æ¥çæé®ï¼å¯ä»¥åæ¢å·¥åï¼å·¦è¾¹ ä½ä¸æå¯¼ä¹¦ä¹ç¸åºæ¹åï¼ä¸ç½æ ¼çæä»¶åè¡¨ä¹åºæ¹
        //å;

        //5.èªå¨ææ¾æé®ï¼ç¹å»èªå¨ææ¾æé®ï¼è¿è¡èªå¨ææ¾æ¨¡å¼ï¼æé®ååæ¹ä¸ºâæå¨æï¼ ç¹å» æå¨ææ¾ æé®ï¼âè¿è¡æå¨ææ¾æ¨¡å¼

        //6.æå¨ææ¾æ¨¡å¼ä¸ï¼ä¸æå¨åæ¢ï¼å½åå·¥åï¼ä½ä¸æå¯¼ä¹¦åä¸ååæ´ã

        //7.èªå¨ææ¾æ¨¡å¼ä¸ï¼æ¯2åéåä¸æ¬¡æ¥è¯¢ï¼è·åå½åå¼å·¥çå·¥åï¼å¦æç®åå¼å·¥çå·¥ååçé¢ä¸æ¾ç¤ºçå·¥åä¸ç¬¦åæ¶ï¼èªå¨åæ¢å°å¼å·¥çå·¥åï¼ä½ä¸æå¯¼ä¹¦ä¹ç¸å³æ´æ°

        //8.éåºæé®ãéåºæ¬æ¨¡åã


        //äº§åæ ¹æ®å·¥åæ¥ï¼èªå¨ææ¾ï¼å½åå·¥åºå®æåèªå¨åæ¢æå¯¼ä¹¦çï¼æå¨ææ¾ï¼çº¦çäºä»ä¹é½ä¸åï¼å·¥ååè¡¨éæ¾ç¤ºå½æ¥éè¦è¿è¡å¾ä»»å¡ï¼é¡µé¢è°æ´ä¸ºå¨å±æ¾ç¤ºï¼

        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -184,9 +156,9 @@
            var option = [];
            var option2 = [];
            var arr = [];
            var HInterID;
            //#endregion
            //#region è¿å¥é¡µé¢æ¢å è½½
            $("#img").attr("src", "http://localhost:8082/LuBaoUi/Files/OIP-C.jpg")
            //åå§åè¡¨æ ¼
            set_InitGrid();
            set_InitGrid2();
@@ -196,9 +168,9 @@
                , width: '100%' //è®¾ç½®å®¹å¨å®½åº¦
                , height: '100%' //è®¾ç½®å®¹å¨é«åº¦
                , arrow: 'always' //å§ç»æ¾ç¤ºç®å¤´
                , indicator: 'none' //æç¤ºå¨ä¸æ¾ç¤º
                , indicator: 'inside' //æç¤ºå¨ä¸æ¾ç¤º
                , autoplay: false //æå¨ææ¾
                , interval: 2000 //ææ¾éåº¦
                , interval: 3000 //ææ¾éåº¦
            });
            //#region  è·åæ¶é´æ¥æ
            $(document).ready(function () {
@@ -224,13 +196,27 @@
            });
            //#endregion

            //å è½½æ°æ®å°ç½æ ¼
            get_Display(sWhere);
            get_Display(sWhere);
            get_Display2(sWhere);
            get_Display2(sWhere);
            //#region å è½½æ°æ®å°ç½æ ¼
            //get_Display(sWhere);

            //å¤ææä½ç±»å
            //éç¨å»¶æ¶çæ¹å¼çå¾æ°æ®
            get_Display(sWhere);
            setTimeout(function () { get_Display2(sWhere); }, 1000); 
            setTimeout(function () { get_Display2(sWhere); }, 1000); 
            setTimeout(function () { get_Display3(sWhere); }, 1000);
            setTimeout(function () { ins.reload({ autoplay: false }) }, 1500);
            //#endregion

            //#region èªå¨ææ¾æ¨¡å¼ä¸è·åé¡µé¢ä¿¡æ¯çæ¹æ³
            function set_LoadAgain() {
                get_Display(sWhere);
                get_Display2(sWhere);
                get_Display3(sWhere);
                setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
            }
            //#endregion

            //#region å¤ææä½ç±»å(è¿éæ²¡ç¨å°)
            if (OperationType == 1 || OperationType == 2) {//æ æºæ°å¢
                //åå§åºæ¬ä¿¡æ¯èµå¼                
            }
@@ -240,10 +226,10 @@
            else {
                layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
            }

            //#endregion

            //éåº

            //#region éåº
            form.on('submit(Exit)', function (data) {
                if (linterid == undefined) {
                    //å³éé¡µç¾
@@ -254,63 +240,78 @@
                    Pub_Close(1);
                }
            });

            //æ¯å¦èªå¨ææ¾
            form.on('submit(IsAuto)', function (data) {
                var num = 0;
                if (ins.config.autoplay == false) {
                    ins.reload({ autoplay: true }) //ææ¾æ¹å¼æ¹ä¸ºèªå¨ææ¾
             //#endregion
            //#region æ¯å¦èªå¨ææ¾
            form.on('submit(Autoplay)', function (data) {
                var num = 0;                
                if (document.getElementById("auto").innerHTML == "èªå¨ææ¾") {
                    //ins.reload({ autoplay: true }) //è½®æå¾ææ¾æ¹å¼æ¹ä¸ºèªå¨ææ¾
                    document.getElementById("auto").innerHTML = "æå¨ææ¾";
                    var timer = setInterval(function () {
                        set_LoadAgain();
                        if (document.getElementById("auto").innerHTML === "èªå¨ææ¾") {
                            clearInterval(timer); //æåå¨æå½æ°
                        }}, 120000) //æ¯éä¸¤åéæ§è¡ä¸æ¬¡                 
                    num = 1;
                } else if (ins.config.autoplay == true && num == 0) {
                    ins.reload({ autoplay: false }) //ææ¾æ¹å¼æ¹ä¸ºæå¨ææ¾
                } else if (document.getElementById("auto").innerHTML = "æå¨ææ¾" && num == 0) {
                    //ins.reload({ autoplay: false }) //è½®æå¾ææ¾æ¹å¼æ¹ä¸ºæå¨ææ¾
                    document.getElementById("auto").innerHTML = "èªå¨ææ¾";
                }
            });
             //#endregion

            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç ï¼è¿éæ²¡ç¨å°ï¼
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢ä¸è¡
                    case 'btn-AddLine': btnAddLine(NewRow);
                        break;
                    //å¤å¶ä¸è¡
                    case 'btn-CopyLine': btnCopyLine(data);
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                }
            });
            //è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //è¡åå é¤
                //set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
            });
            //çå¬ååæ ¼ç¼è¾  ååæ ¼ç¼è¾å åæ´
            //table.on('edit(mainTable)', function (obj) {
            //    var value = obj.value //å¾å°ä¿®æ¹åçå¼
            //        , data = obj.data //å¾å°æå¨è¡ææé®å¼
            //        , field = obj.field; //å¾å°åæ®µ
            //    arr.push(data);
            //});
            //#endregion

            //ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
            table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
                console.log(obj);
            //#region ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
            table.on('rowDouble(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
                //var datas = obj.data; //è·å¾å½åè¡æ°æ®
                //HBillNo = datas["åæ®å·"].toString();
                //var HMainID = datas.hmainid;
                var wait = layer.load();
                HInterID = obj.data.HInterID
                if (HInterID == "" || HInterID == null) {
                    HInterID = 0;
                }
                $("#file").html("");
                $(".layui-carousel-ind").html("");
                $.ajax({
                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
                    type: "GET",
                    //data: { "sWhere": HMainID },
                    data: { "sWhere": HInterID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option2.data = data1.data;
                            table.render(option2);

                            for (let i = 0; i < data1.data.length; i++) {
                                var html = '';
                                if (data1.data[i].æä»¶ç±»å == '.jpeg' || data1.data[i].æä»¶ç±»å == '.jpg') {
                                    var FileName = data1.data[i].æä»¶åç§°;
                                    //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
                                    html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
                                    $("#file").append(html);
                                }
                                if (data1.data[i].æä»¶ç±»å == '.pdf') {
                                    var FileName2 = data1.data[i].æä»¶åç§°;
                                    //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
                                    html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
                                    $("#file").append(html);
                                }
                            }
                            if (data1.data.length == 0) {
                                var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">ææªä¸ä¼ æä»¶</h1>';
                                $("#file").append(html2);
                            }
                            ins.reload({ autoplay: false })
                            layer.close(wait);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -321,12 +322,10 @@
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
                //DisPlay_HideColumn_Sec();
                //set_ClearBillHMainID(HMainID);    //å¨å·æ¸å
            });
            //#endregion

            //åå§åè¡¨æ ¼
            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    id: 'mainTable'
@@ -345,7 +344,7 @@
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                        , { field: 'å·¥åº', title: 'å·¥åº', width: 100 }
                        //, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 60 }
                        //, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 66 }
                    ]]
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
@@ -375,8 +374,9 @@
                    }
                };
            }
           
            //å è½½ç½æ ¼
           //#endregion

            //#region å è½½ç½æ ¼
            function get_Display(sWhere) {
                var wait = layer.load();//é®ç½©
                $.ajax({
@@ -385,6 +385,9 @@
                    data: { "sWhere": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data[0]) {
                                HInterID = data1.data[0].HInterID
                            }
                            option.data = data1.data;
                            table.render(option);
                            layer.close(wait);
@@ -401,11 +404,14 @@

            //å è½½å³ä¸æ¹ç½æ ¼
            function get_Display2(sWhere) {
                if (HInterID == "" || HInterID == null) {
                    HInterID = 0;
                }
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
                    type: "GET",
                    //data: { "sWhere": HMainID },
                    data: { "sWhere": HInterID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option2.data = data1.data;
@@ -421,7 +427,52 @@
                    }
                });
            }
            

            //å è½½å·¦ä¾§æä»¶
            function get_Display3(sWhere) {
                if (HInterID == "" || HInterID == null) {
                    HInterID = 0;
                }
                $("#file").html("");
                $(".layui-carousel-ind").html("");
                $.ajax({
                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
                    type: "GET",
                    data: { "sWhere": HInterID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            for (let i = 0; i < data1.data.length; i++) {
                                var html = '';
                                if (data1.data[i].æä»¶ç±»å == '.jpeg' || data1.data[i].æä»¶ç±»å == '.jpg') {
                                    var FileName = data1.data[i].æä»¶åç§°;
                                    //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
                                    html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
                                    $("#file").append(html);
                                }
                                if (data1.data[i].æä»¶ç±»å == '.pdf') {
                                    var FileName2 = data1.data[i].æä»¶åç§°;
                                    //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
                                    html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                    $("#file").append(html);
                                }
                            }
                            if (data1.data.length == 0) {
                                var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">ææªä¸ä¼ æä»¶</h1>';
                                $("#file").append(html2);
                            }
                            ins.reload({ autoplay: false })
                            //layer.close(wait);
                        } else {
                            //layer.close(wait);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        //layer.close(wait);
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>

			@@ -27,7 +27,7 @@
			</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;">
			@@ -43,54 +43,54 @@
			<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">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åå»ºäºº</label>
			<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>
			<input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åè£æè´¨</label>
			<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">
			<input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
			</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 class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
			</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="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
			</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 class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
			</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="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
			</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>
			@@ -111,7 +111,8 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, element = layui.element
			, laydate = layui.laydate;
			var sWhere = "";
			var date = new Date();
			var day = date.getDate();
			@@ -120,10 +121,37 @@
			var shijian = year + "-" + month + "-" + day;
			//#endregion


			laydate.render({
			elem: '#HDate'
			//, type:'year'
			});
			laydate.render({
			elem: '#HWorkBegin'
			, type: 'time'
			});
			laydate.render({
			elem: '#HWorkEnd'
			, type: 'time'
			});
			laydate.render({
			elem: '#HNoonbreakBegin'
			, type: 'time'
			});
			laydate.render({
			elem: '#HNoonbreakEnd'
			, type: 'time'
			});
			laydate.render({
			elem: '#HNightbreakBegin'
			, type: 'time'
			});
			laydate.render({
			elem: '#HNightbreakEnd'
			, type: 'time'
			});
			//#region è¿å¥é¡µé¢å³å è½½

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

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();
			@@ -175,7 +203,7 @@
			form.on('submit(HEmp-BT)', function () {
			get_checkEmp();
			});


			//ä¿åæé®
			form.on('submit(set_SaveBill)', function (data) {
			set_SaveBill(data);
			@@ -201,7 +229,7 @@
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "Gy_PackType/cx",
			url: GetWEBURL() + "Gy_WorkDay/cx",
			type: "GET",
			data: {
			"HInterID": linterid
			@@ -221,21 +249,13 @@
			}
			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")
			, "HDate": data.HDate
			, "HWorkBegin": data.HWorkBegin
			, "HWorkEnd": data.HWorkEnd
			, "HNoonbreakBegin": data.HNoonbreakBegin
			, "HNoonbreakEnd": data.HNoonbreakEnd
			, "HNightbreakBegin": data.HNightbreakBegin
			, "HNightbreakEnd": data.HNightbreakEnd
			});
			layer.close(ajaxLoad);
			} else {
			@@ -253,33 +273,9 @@
			//#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", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
			dataType: "json",
			@@ -302,33 +298,6 @@
			});
			}
			//#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=');

			@@ -25,15 +25,9 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åè£ä»£ç </label>
			<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">
			<input type="text" class="layui-input" name="HDate" id="HDate">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -110,11 +104,14 @@
			var sWhere = "";
			var option = [];
			var Organization = sessionStorage["Organization"]
			var HModName = "Gy_PackType";
			var HModName = "Gy_WorkDay";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","HParentID",];
			//#endregion

			laydate.render({
			elem: '#HDate'
			//, type:'year'
			});
			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åçé¢
			@@ -218,7 +215,7 @@
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_PackType/list',
			url: GetWEBURL() + '/Gy_WorkDay/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

			@@ -286,12 +283,10 @@

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

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -313,11 +308,8 @@
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (HNumber) {
			sWhere += " and åè£æ¹å¼ä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and åè£æ¹å¼åç§° like '%" + HName + "%'";
			if (HDate) {
			sWhere += " and DATEDIFF(D,æ¥æ,'" + HDate +"')=0";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -341,7 +333,7 @@
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'åè£æ¹å¼åè¡¨-æ°å¢'
			, title: 'å·¥ä½æ¥-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
			})
			@@ -358,7 +350,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'åè£æ¹å¼åè¡¨-ç¼è¾'
			, title: 'å·¥ä½æ¥-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èµåºç¡èµæ/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			})
			@@ -378,7 +370,7 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_PackType',
			url: GetWEBURL() + 'DeltetGy_WorkDay',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			success: function (result) {

			@@ -1,5 +1,5 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ä½ä¸æå¯¼ä¹¦</title>
			@@ -34,7 +34,7 @@
			}

			.layui-table-cell{
			height:20px;
			height:23px;
			}

			</style>
			@@ -51,7 +51,7 @@
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">éåº</button>
			</div>
			<div class="layui-inline">
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="IsAuto" style="background-color:#959393;margin-left:15px" id="auto">èªå¨ææ¾</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">èªå¨ææ¾</button>
			</div>
			<div class="layui-inline">
			<h1 style="text-align: center;margin-left:300px"><b>å·¥ä½ä½ä¸æå¯¼ä¹¦</b></h1>
			@@ -90,19 +90,13 @@
			<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
			<div style="margin-top:10px; width:100%;height:100%">
			<div style="width:77%;height:670px;float:left;line-height:500px">
			<!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin:200px 0 0 1.5px;font-size:25px"><</button>-->

			<div class="layui-carousel" id="test1">
			<div carousel-item>
			<div><img src="ä½ä¸æå¯¼ä¹¦.png" style="width:100%;height:100%"></div>
			<div><img id="img" src="" style="width:100%;height:100%"></div>
			<div><img src="../../../Files/R-C.jpg" style="width:100%;height:100%"></div>

			<!--<div><embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>-->
			<div carousel-item id="file">

			</div>
			</div>

			<!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin-top:200px;font-size:25px">></button>-->
			</div>
			<div style="width:22%;height:670px;float:left;margin-left:1%">
			<div style="width:100%;height:49%;margin-bottom:2%">
			@@ -124,7 +118,7 @@
			</div>
			</div>
			<script type="text/html" id="barDemo">
			<!--<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>-->
			<!--<a class="layui-btn layui-btn-xs" lay-event="view">æ¥ç</a>-->
			<!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>-->
			</script>
			<script type="text/javascript">
			@@ -140,28 +134,6 @@
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}

			// æ¥å·¥å¹³å°;å·¥åºæµè½¬å¡ç»´æ¤;çäº§èµæºåè¡¨

			//1.è¿å¥æ¨¡åï¼ä»æ¬å°éç½®æä»¶è·åæå±çäº§èµæºåå·¥ä½ï¼åå§åæ¨¡åãçé¢æ¸ç©ºï¼å³è¾¹ä¸ç½æ ¼æ¾ç¤ºè¯¥çäº§èµæºçäº§ç¶æè¡¨éçå½æ¥è®¡åå·¥åï¼é»è®¤ä¸ºå½åå¼å·¥çå·¥åï¼ä¸ç½æ ¼æ¾ç¤ºè¿ä¸ªå·¥ååè¯¥å·¥ä½çæä»¶æ¸å(è·åä½ä¸æå¯¼ä¹¦çæ°æ®)ã

			//2.å·¦è¾¹æ¾ç¤ºå·¥ä½ä½ä¸æå¯¼ä¹¦çç¬¬ä¸å¼ æä»¶(å¾çæPDF) ã

			//3.ç¹å»ä¸ä¸å¼ ï¼ä¸ä¸å¼ ï¼å¯ä»¥å¨ä½ä¸æå¯¼ä¹¦çæ¬å·¥ä½çæä»¶åè¡¨éåæ¢PDFæä»¶æå¾ç;

			//4.å·¥ååè¡¨éï¼åå»æèç¹æ¥çæé®ï¼å¯ä»¥åæ¢å·¥åï¼å·¦è¾¹ ä½ä¸æå¯¼ä¹¦ä¹ç¸åºæ¹åï¼ä¸ç½æ ¼çæä»¶åè¡¨ä¹åºæ¹
			//å;

			//5.èªå¨ææ¾æé®ï¼ç¹å»èªå¨ææ¾æé®ï¼è¿è¡èªå¨ææ¾æ¨¡å¼ï¼æé®ååæ¹ä¸ºâæå¨æï¼ ç¹å» æå¨ææ¾ æé®ï¼âè¿è¡æå¨ææ¾æ¨¡å¼

			//6.æå¨ææ¾æ¨¡å¼ä¸ï¼ä¸æå¨åæ¢ï¼å½åå·¥åï¼ä½ä¸æå¯¼ä¹¦åä¸ååæ´ã

			//7.èªå¨ææ¾æ¨¡å¼ä¸ï¼æ¯2åéåä¸æ¬¡æ¥è¯¢ï¼è·åå½åå¼å·¥çå·¥åï¼å¦æç®åå¼å·¥çå·¥ååçé¢ä¸æ¾ç¤ºçå·¥åä¸ç¬¦åæ¶ï¼èªå¨åæ¢å°å¼å·¥çå·¥åï¼ä½ä¸æå¯¼ä¹¦ä¹ç¸å³æ´æ°

			//8.éåºæé®ãéåºæ¬æ¨¡åã


			//äº§åæ ¹æ®å·¥åæ¥ï¼èªå¨ææ¾ï¼å½åå·¥åºå®æåèªå¨åæ¢æå¯¼ä¹¦çï¼æå¨ææ¾ï¼çº¦çäºä»ä¹é½ä¸åï¼å·¥ååè¡¨éæ¾ç¤ºå½æ¥éè¦è¿è¡å¾ä»»å¡ï¼é¡µé¢è°æ´ä¸ºå¨å±æ¾ç¤ºï¼

			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -184,9 +156,9 @@
			var option = [];
			var option2 = [];
			var arr = [];
			var HInterID;
			//#endregion
			//#region è¿å¥é¡µé¢æ¢å è½½
			$("#img").attr("src", "http://localhost:8082/LuBaoUi/Files/OIP-C.jpg")
			//åå§åè¡¨æ ¼
			set_InitGrid();
			set_InitGrid2();
			@@ -196,9 +168,9 @@
			, width: '100%' //è®¾ç½®å®¹å¨å®½åº¦
			, height: '100%' //è®¾ç½®å®¹å¨é«åº¦
			, arrow: 'always' //å§ç»æ¾ç¤ºç®å¤´
			, indicator: 'none' //æç¤ºå¨ä¸æ¾ç¤º
			, indicator: 'inside' //æç¤ºå¨ä¸æ¾ç¤º
			, autoplay: false //æå¨ææ¾
			, interval: 2000 //ææ¾éåº¦
			, interval: 3000 //ææ¾éåº¦
			});
			//#region è·åæ¶é´æ¥æ
			$(document).ready(function () {
			@@ -224,13 +196,27 @@
			});
			//#endregion

			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			get_Display(sWhere);
			get_Display2(sWhere);
			get_Display2(sWhere);
			//#region å è½½æ°æ®å°ç½æ ¼
			//get_Display(sWhere);

			//å¤ææä½ç±»å
			//éç¨å»¶æ¶çæ¹å¼çå¾æ°æ®
			get_Display(sWhere);
			setTimeout(function () { get_Display2(sWhere); }, 1000);
			setTimeout(function () { get_Display2(sWhere); }, 1000);
			setTimeout(function () { get_Display3(sWhere); }, 1000);
			setTimeout(function () { ins.reload({ autoplay: false }) }, 1500);
			//#endregion

			//#region èªå¨ææ¾æ¨¡å¼ä¸è·åé¡µé¢ä¿¡æ¯çæ¹æ³
			function set_LoadAgain() {
			get_Display(sWhere);
			get_Display2(sWhere);
			get_Display3(sWhere);
			setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
			}
			//#endregion

			//#region å¤ææä½ç±»å(è¿éæ²¡ç¨å°)
			if (OperationType == 1 \|\| OperationType == 2) {//æ æºæ°å¢
			//åå§åºæ¬ä¿¡æ¯èµå¼
			}
			@@ -240,10 +226,10 @@
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}

			//#endregion

			//éåº

			//#region éåº
			form.on('submit(Exit)', function (data) {
			if (linterid == undefined) {
			//å³éé¡µç¾
			@@ -254,63 +240,78 @@
			Pub_Close(1);
			}
			});

			//æ¯å¦èªå¨ææ¾
			form.on('submit(IsAuto)', function (data) {
			var num = 0;
			if (ins.config.autoplay == false) {
			ins.reload({ autoplay: true }) //ææ¾æ¹å¼æ¹ä¸ºèªå¨ææ¾
			//#endregion
			//#region æ¯å¦èªå¨ææ¾
			form.on('submit(Autoplay)', function (data) {
			var num = 0;
			if (document.getElementById("auto").innerHTML == "èªå¨ææ¾") {
			//ins.reload({ autoplay: true }) //è½®æå¾ææ¾æ¹å¼æ¹ä¸ºèªå¨ææ¾
			document.getElementById("auto").innerHTML = "æå¨ææ¾";
			var timer = setInterval(function () {
			set_LoadAgain();
			if (document.getElementById("auto").innerHTML === "èªå¨ææ¾") {
			clearInterval(timer); //æåå¨æå½æ°
			}}, 120000) //æ¯éä¸¤åéæ§è¡ä¸æ¬¡
			num = 1;
			} else if (ins.config.autoplay == true && num == 0) {
			ins.reload({ autoplay: false }) //ææ¾æ¹å¼æ¹ä¸ºæå¨ææ¾
			} else if (document.getElementById("auto").innerHTML = "æå¨ææ¾" && num == 0) {
			//ins.reload({ autoplay: false }) //è½®æå¾ææ¾æ¹å¼æ¹ä¸ºæå¨ææ¾
			document.getElementById("auto").innerHTML = "èªå¨ææ¾";
			}
			});
			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç ï¼è¿éæ²¡ç¨å°ï¼
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢ä¸è¡
			case 'btn-AddLine': btnAddLine(NewRow);
			break;
			//å¤å¶ä¸è¡
			case 'btn-CopyLine': btnCopyLine(data);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			}
			});
			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			//set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
			});
			//çå¬ååæ ¼ç¼è¾ ååæ ¼ç¼è¾å åæ´
			//table.on('edit(mainTable)', function (obj) {
			// var value = obj.value //å¾å°ä¿®æ¹åçå¼
			// , data = obj.data //å¾å°æå¨è¡ææé®å¼
			// , field = obj.field; //å¾å°åæ®µ
			// arr.push(data);
			//});
			//#endregion

			//ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
			table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			console.log(obj);
			//#region ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
			table.on('rowDouble(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			//var datas = obj.data; //è·å¾å½åè¡æ°æ®
			//HBillNo = datas["åæ®å·"].toString();
			//var HMainID = datas.hmainid;
			var wait = layer.load();
			HInterID = obj.data.HInterID
			if (HInterID == "" \|\| HInterID == null) {
			HInterID = 0;
			}
			$("#file").html("");
			$(".layui-carousel-ind").html("");
			$.ajax({
			url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
			type: "GET",
			//data: { "sWhere": HMainID },
			data: { "sWhere": HInterID },
			success: function (data1) {
			if (data1.count == 1) {
			option2.data = data1.data;
			table.render(option2);

			for (let i = 0; i < data1.data.length; i++) {
			var html = '';
			if (data1.data[i].æä»¶ç±»å == '.jpeg' \|\| data1.data[i].æä»¶ç±»å == '.jpg') {
			var FileName = data1.data[i].æä»¶åç§°;
			//html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
			html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
			$("#file").append(html);
			}
			if (data1.data[i].æä»¶ç±»å == '.pdf') {
			var FileName2 = data1.data[i].æä»¶åç§°;
			//<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
			html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
			$("#file").append(html);
			}
			}
			if (data1.data.length == 0) {
			var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">ææªä¸ä¼ æä»¶</h1>';
			$("#file").append(html2);
			}
			ins.reload({ autoplay: false })
			layer.close(wait);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -321,12 +322,10 @@
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			//DisPlay_HideColumn_Sec();
			//set_ClearBillHMainID(HMainID); //å¨å·æ¸å
			});
			//#endregion

			//åå§åè¡¨æ ¼
			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			id: 'mainTable'
			@@ -345,7 +344,7 @@
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 100 }
			//, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 60 }
			//, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 66 }
			]]
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			@@ -375,8 +374,9 @@
			}
			};
			}

			//å è½½ç½æ ¼
			//#endregion

			//#region å è½½ç½æ ¼
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			@@ -385,6 +385,9 @@
			data: { "sWhere": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data[0]) {
			HInterID = data1.data[0].HInterID
			}
			option.data = data1.data;
			table.render(option);
			layer.close(wait);
			@@ -401,11 +404,14 @@

			//å è½½å³ä¸æ¹ç½æ ¼
			function get_Display2(sWhere) {
			if (HInterID == "" \|\| HInterID == null) {
			HInterID = 0;
			}
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
			type: "GET",
			//data: { "sWhere": HMainID },
			data: { "sWhere": HInterID },
			success: function (data1) {
			if (data1.count == 1) {
			option2.data = data1.data;
			@@ -421,7 +427,52 @@
			}
			});
			}


			//å è½½å·¦ä¾§æä»¶
			function get_Display3(sWhere) {
			if (HInterID == "" \|\| HInterID == null) {
			HInterID = 0;
			}
			$("#file").html("");
			$(".layui-carousel-ind").html("");
			$.ajax({
			url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
			type: "GET",
			data: { "sWhere": HInterID },
			success: function (data1) {
			if (data1.count == 1) {
			for (let i = 0; i < data1.data.length; i++) {
			var html = '';
			if (data1.data[i].æä»¶ç±»å == '.jpeg' \|\| data1.data[i].æä»¶ç±»å == '.jpg') {
			var FileName = data1.data[i].æä»¶åç§°;
			//html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
			html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
			$("#file").append(html);
			}
			if (data1.data[i].æä»¶ç±»å == '.pdf') {
			var FileName2 = data1.data[i].æä»¶åç§°;
			//<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
			html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
			$("#file").append(html);
			}
			}
			if (data1.data.length == 0) {
			var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">ææªä¸ä¼ æä»¶</h1>';
			$("#file").append(html2);
			}
			ins.reload({ autoplay: false })
			//layer.close(wait);
			} else {
			//layer.close(wait);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			//layer.close(wait);
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			}
			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>