From ae3f96ab7a980bda64af2c2dd536ee3611493319 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 25 八月 2025 16:03:34 +0800
Subject: [PATCH] 委外接收发出单同步页面添加,工艺路线反关闭设置时间优化,出战汇报同步优化

---
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillSync.html  |  562 ++++++++++++++++++++++++++++
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillSync.html |  564 ++++++++++++++++++++++++++++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html              |    8 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html        |   39 +
 WebTM/WebTM.csproj                                         |    2 
 5 files changed, 1,171 insertions(+), 4 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a4f2367..747a87f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -888,6 +888,8 @@
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
+    <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBillSync.html" />
+    <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBillSync.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鎺ユ敹鍗昞Sc_ProcessExchangeIssueBillList_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSync.html" />
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 4c1a350..4ef0007 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1639,7 +1639,13 @@
                         </div> `,
                         success: function (layero, index) {
                             $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
-                            $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
+                            // 鑾峰彇褰撳墠鏃ユ湡
+                            const currentDate = new Date();
+                            // 鍒涘缓鏂版棩鏈熷璞★紙閬垮厤淇敼鍘熸棩鏈燂級
+                            const after30Days = new Date(currentDate);
+                            // 璁剧疆鏃ユ湡涓哄綋鍓嶆棩鏈� + 30澶�
+                            after30Days.setDate(currentDate.getDate() + 30);
+                            $("#endTime").val(Format(after30Days, "yyyy-MM-dd"));
                             // 纭畾鎸夐挳鐐瑰嚮浜嬩欢
                             $('#confirmTime').on('click', function () {
                                 var startTime = $('#startTime').val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html"
new file mode 100644
index 0000000..c3f9373
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html"
@@ -0,0 +1,562 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>濮斿鍙戝嚭鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, 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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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="date" class="layui-input" id="HDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍚屾鐘舵��</label>
+                                    <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+                                        <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+                                            <option value="1" >鍏ㄩ儴</option>
+                                            <option value="2">宸插悓姝�</option>
+                                            <option value="3">鏈悓姝�</option>
+                                            <option value="4" selected="selected">鍚屾澶辫触</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+                                    <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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+            //鍏敤鍙橀噺
+            var sWhere = "";
+            var option = [];
+            var HModName = "Cj_StationEntrustInBillSync"
+            var syncMessage = []//鍚屾鎶ラ敊淇℃伅
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+            //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+            $('#HWorkBillNo').on('keydown', function (event) {
+                var HWorkBillNo = $('#HWorkBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HWorkBillNo) {
+                        layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+            //鍗曟嵁鍙峰洖杞︽柟娉�
+            $('#HBillNo').on('keydown', function (event) {
+                var HBillNo = $('#HBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HBillNo) {
+                        layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+            //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+            $('#HProcExchBillNo').on('keydown', function (event) {
+                var HProcExchBillNo = $('#HProcExchBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNo) {
+                        layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
+
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鍚屾
+                    case 'btn-InSync': get_InSync();
+                        break;
+                    //鎵归噺鍚屾
+                    case 'btn_InSync_Batch': get_InSync_Batch();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HWorkBillNo").val("");
+                $("#HBillNo").val("");
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HProcExchBillNo").val("");
+                $("#HRelationQty").val("4");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render("select");
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HWorkBillNo = $("#HWorkBillNo").val();
+                var HBillNo = $("#HBillNo").val();
+                var HProcExchBillNo = $("#HProcExchBillNo").val();
+                var HRelationQty = $("#HRelationQty").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                switch (HRelationQty) {
+                    case "1":
+                        sWhere += "";
+                        break;
+                    case "2":
+                        sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+                        break;
+                    case "3":
+                        sWhere += " and 鍚屾鐘舵�� = ''";
+                        break;
+                    case "4":
+                        sWhere += " and 鍚屾鐘舵�� = '鍚屾澶辫触'";
+                        break;
+                }
+                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 (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) > '" + HDate + "'";
+                }
+                if (HWorkBillNo) {
+                    sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HProcExchBillNo) {
+                    sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+                }
+                sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 0) {
+                            option.data = [];
+                            layer.alert(data1.Message, { icon: 5 });
+                        } else {
+                            var data = [];
+                            var col = [];
+                            var titleData = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            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', totalRowText: '鍚堣' });
+                            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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                        }
+                        table.render(option);
+                        layer.close(wait);
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鎵归噺鍚屾
+            function get_InSync_Batch() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var InterID = '';
+                    var BillNo = '';
+                    syncMessage = [];
+                    for (var i = 0; i < data.length; i++) {
+                        InterID=(data[i].hmainid.toString());
+                        BillNo=(data[i].鍗曟嵁鍙�.toString());
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Cj_StationEntrustInBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+                            dataType: "json",
+                            success: function (data1) {
+                                if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+                                    let errMessage = [];
+                                    errMessage.push(data1.Message);
+                                    syncMessage.push(errMessage);
+                                    layer.alert(data1.Message, { icon: 5 });
+
+                                }
+                            },
+                            error: function (err) {
+                                layer.alert(err.Message, { icon: 5 });
+                            }
+                        });
+                    }
+                }
+                else {
+                    layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
+                }
+            }
+            //鍚屾
+            function get_InSync() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillNo = data[0].鍗曟嵁鍙�.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_StationEntrustInBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                });
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err.Message, { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹悓姝ワ紒');
+                }
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var data = option.data;
+                
+                data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                            item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
+                table.exportFile('mainTable', data, "xls");
+                        
+            }
+            //#endregion
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            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');
+            }
+            //閫�鍑�
+            function get_Exit() {
+                Pub_Close(2);
+            }
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+            function getDeptIDByUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HUserID": sessionStorage["Czybm"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data.length > 0) {
+                                for (let item of result.data) {
+                                    res += item.HItemID.toString() + ","
+                                }
+                                res = res.slice(0, -1);
+                                res = ` and HDeptID in (${res})`
+                            }
+
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html"
new file mode 100644
index 0000000..7dd2354
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html"
@@ -0,0 +1,564 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>濮斿鎺ユ敹鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, 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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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="date" class="layui-input" id="HDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍚屾鐘舵��</label>
+                                    <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+                                        <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+                                            <option value="1" >鍏ㄩ儴</option>
+                                            <option value="2">宸插悓姝�</option>
+                                            <option value="3">鏈悓姝�</option>
+                                            <option value="4" selected="selected">鍚屾澶辫触</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+                                    <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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+            //鍏敤鍙橀噺
+            var sWhere = "";
+            var option = [];
+            var HModName = "Cj_StationEntrustOutBillSync"
+            var syncMessage = []//鍚屾鎶ラ敊淇℃伅
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+            //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+            $('#HWorkBillNo').on('keydown', function (event) {
+                var HWorkBillNo = $('#HWorkBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HWorkBillNo) {
+                        layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+            //鍗曟嵁鍙峰洖杞︽柟娉�
+            $('#HBillNo').on('keydown', function (event) {
+                var HBillNo = $('#HBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HBillNo) {
+                        layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+            //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+            $('#HProcExchBillNo').on('keydown', function (event) {
+                var HProcExchBillNo = $('#HProcExchBillNo').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNo) {
+                        layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+                        return;
+                    }
+                    $("#btnSearch").click();
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
+
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鍚屾
+                    case 'btn-InSync': get_InSync();
+                        break;
+                    //鎵归噺鍚屾
+                    case 'btn_InSync_Batch': get_InSync_Batch();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HWorkBillNo").val("");
+                $("#HBillNo").val("");
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HProcExchBillNo").val("");
+                $("#HRelationQty").val("4");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render("select");
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HWorkBillNo = $("#HWorkBillNo").val();
+                var HBillNo = $("#HBillNo").val();
+                var HProcExchBillNo = $("#HProcExchBillNo").val();
+                var HRelationQty = $("#HRelationQty").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                switch (HRelationQty) {
+                    case "1":
+                        sWhere += "";
+                        break;
+                    case "2":
+                        sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+                        break;
+                    case "3":
+                        sWhere += " and 鍚屾鐘舵�� = ''";
+                        break;
+                    case "4":
+                        sWhere += " and 鍚屾鐘舵�� = '鍚屾澶辫触'";
+                        break;
+                }
+                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 (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) > '" + HDate + "'";
+                }
+                if (HWorkBillNo) {
+                    sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HProcExchBillNo) {
+                    sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+                }
+                sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 0) {
+                            option.data = [];
+                            layer.alert(data1.Message, { icon: 5 });
+                        } else {
+                            var data = [];
+                            var col = [];
+                            var titleData = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            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', totalRowText: '鍚堣' });
+                            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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                        }
+                        table.render(option);
+                        layer.close(wait);
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鎵归噺鍚屾
+            function get_InSync_Batch() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var InterID = '';
+                    var BillNo = '';
+                    syncMessage = [];
+                    for (var i = 0; i < data.length; i++) {
+                        InterID=(data[i].hmainid.toString());
+                        BillNo=(data[i].鍗曟嵁鍙�.toString());
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+                            dataType: "json",
+                            success: function (data1) {
+                                if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+                                    let errMessage = [];
+                                    errMessage.push(data1.Message);
+                                    syncMessage.push(errMessage);
+                                    layer.alert(data1.Message, { icon: 5 });
+
+                                }
+                            },
+                            error: function (err) {
+                                layer.alert(err.Message, { icon: 5 });
+                            }
+                        });
+                    }
+                }
+                else {
+                    layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
+                }
+            }
+            //鍚屾
+            function get_InSync() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillNo = data[0].鍗曟嵁鍙�.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                });
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err.Message, { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹悓姝ワ紒');
+                }
+            }
+
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var data = option.data;
+
+                data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                            item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
+                table.exportFile('mainTable', data, "xls");
+
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            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');
+            }
+            //閫�鍑�
+            function get_Exit() {
+                Pub_Close(2);
+            }
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+            function getDeptIDByUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HUserID": sessionStorage["Czybm"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data.length > 0) {
+                                for (let item of result.data) {
+                                    res += item.HItemID.toString() + ","
+                                }
+                                res = res.slice(0, -1);
+                                res = ` and HDeptID in (${res})`
+                            }
+
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
index cc979cb..7b36426 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
@@ -107,7 +107,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭閿欒淇℃伅</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
@@ -247,7 +247,7 @@
                         break;
                     //瀵煎嚭excel
                     case 'get_export':
-                        table.exportFile(['閿欒淇℃伅'], syncMessage, 'xls');
+                        get_Export();
                         break;
                     //閫�鍑�
                     case 'btn-Exit': get_Exit();
@@ -466,8 +466,41 @@
                 }
             }
 
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
+                var data = option.data;
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            data.forEach((item) => {
+                                for (let itemobj in item) {
+                                    if (item[itemobj] == null) {
+                                        item[itemobj] = "";
+                                    }
+                                    if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                                        item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                        item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                    }
+                                }
+                            });
+
+                            table.exportFile('mainTable', data, "xls");
+                        } else {
+                            layer.alert(get_MessageError("[褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺]褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
-            table.on('row(mainTablemainTable)', function (obj) {
+            table.on('row(mainTable)', function (obj) {
                 //閫変腑琛屾敼鍙橀鑹�
                 var flag = !obj.tr.find(':checkbox:first').prop('checked');
                 obj.tr.find(':checkbox').prop('checked', flag);

--
Gitblit v1.9.1