From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产;小卫彩盒SN校验标题调整;过站解绑列表添加日期区间过滤;香囊标签打印,添加暂停打印,继续打印功能

---
 WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html |  440 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 308 insertions(+), 132 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
index b0fe471..26fd756 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃</title>
+    <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">
@@ -59,19 +59,19 @@
                                     <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-inline">
+                                <div class="layui-inline" style="display:none;">
                                     <label class="layui-form-label">鐧藉澂鍙戝竷鍚堣鍏枻鏁�</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none;">
                                     <label class="layui-form-label">鏌撳巶鍑虹珯鍚堣鍏枻鏁�</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none;">
                                     <label class="layui-form-label">宸</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
@@ -137,12 +137,97 @@
                                             <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </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="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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-detail"><i class="layui-icon layui-icon-return"></i>鏄庣粏鎶ヨ〃</button>
@@ -175,6 +260,10 @@
             var sWhere = "";
             var option = [];
             var HModName = "ProdProcessSumReport_DyeColor";
+
+            var titleData = ["HCusID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -188,6 +277,10 @@
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
                     //閫�鍑�
                     case 'btn-exit': Pub_Close(2);
                         break;
@@ -195,8 +288,10 @@
                     case 'HideColumn':
                         get_HideColumn();
                         break;
+                    //鏄庣粏鎶ヨ〃
                     case 'btn-detail':
                         get_EntryReport();
+                        break;
                 };
             });
             //閲嶇疆鎸夐挳
@@ -226,6 +321,42 @@
                 });
             });
 
+            //琛岀洃鍚簨浠�-鍙屽嚮
+            table.on('rowDouble(mainTable)', function (obj) {
+                //閫変腑楂樹寒 鍙屽嚮琛�
+                obj.tr.find(':checkbox').prop('checked', true);
+                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = true;
+                    }
+                });
+
+                //涓嬫帹
+                var sBillNo = obj.data["鐢熶骇璁㈠崟鍙�"];
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '鏌撳巶鏄庣粏鎶ヨ〃'
+                    , closeBtn: 1
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: 'Kf_ProdProcessEntryReport_DyeColor.html?sBillNo=' + sBillNo
+                    , resize: false
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        //location.reload();
+                    }
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+
+            });
 
             //#endregion
 
@@ -246,75 +377,72 @@
 
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
-                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
-                var HBillNo = $("#HBillNo").val();          //鍗曟嵁鍙�
-                var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
-                var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
-                //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-
-                //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
-                var com = "";
-                if (ColName != 0 && Comparator != 0) {
-                    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;
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , cellMinWidth: 120
+                    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+                    , totalRow: true
+                    , height: 'full-70'
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+                        , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+                        , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+                        , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+                        , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
+                    ]]
+                    , done: function (res) {
                     }
-                    com = " and (" + ColName + " " + com + ")";
-                }
+                };
+            }
 
-                sWhere = {
-                    HBeginDate: HBeginDate
-                    , HEndDate: HEndDate
-                    , HMaterNumber: HMaterNumber
-                    , HBillNo: HBillNo
-                    , HProductName: HProductName
-                    , HProductModel: HProductModel
-                    , RandomSearch: com
-                }
-                sWhere = JSON.stringify(sWhere);
 
-                //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            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); $("#ColName1").empty();
+                $("#ColName1").append(Organization); $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + "/ProdProcessSumReport/ProdProcessSumReport_DyeColor",
+                    url: GetWEBURL() + '/ProdProcessSumReport/ProdProcessSumReport_DyeColor',
                     type: "GET",
-                    async: false,
-                    data: { "sWhere": sWhere },
-                    //async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]  },
                     success: function (data1) {
-
                         if (data1.count == 1) {
-
+                            var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧藉澂鍙戝竷"];
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left' });
                             for (var i = 0; i < data.length; i++) {
-                                if ($.inArray(data[i].name, "") > -1) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                 }
                                 else if (data[i].ColName == '鐧藉澂鍙戝竷') {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
@@ -330,78 +458,10 @@
                                     }
                                 }
                             }
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cellMinWidth: 120
-                                , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
-                                , totalRow: true
-                                , height: 'full-70'
-                                , cols: [col]
-                                , data: data1.data
-                            };
-                            table.render(option);
-                        } else {
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cellMinWidth: 120
-                                , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
-                                , totalRow: true
-                                , height: 'full-70'
-                                , cols: [[
-                                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
-                                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
-                                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
-                                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
-                                    , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
-                                    , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
-                                    , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', width: 200 }
-                                    , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
-                                    , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
-                                ]]
-                                , done: function (res) {
-                                }
-                            };
-                            table.render(option);
-                        }
-                    },
-                    error: function (err) {
-                        layer.msg('閿欒' + err, {
-                            icon: 5,
-                            time: 20000
-                        }, function () {
-                            //do something
-                        });
-                    }
-                })
-            }
-
-            //鍒楀悕鏄剧ず涓嬫媺妗�
-            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_Display(sWhere) {
-                var wait = layer.load();//閬僵
-                $.ajax({
-                    url: GetWEBURL() + '/ProdProcessSumReport/ProdProcessSumReport_DyeColor',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
+
+
                             //璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃�
                             for (var i = 0; i < data1.data.length; i++) {
                                 if (data1.data[i].鐢熶骇璁㈠崟鏃ユ湡!=null) {
@@ -410,6 +470,7 @@
                             }
 
                             option.data = data1.data;
+                            option.cols = [col];
                             //var num = 0;
                             //for (let i = 0; i < data1.data.length; i++) {
                             //    for (let j = i + 1; j < data1.data.length; j++) {
@@ -422,7 +483,7 @@
                             //        }
                             //    }
                             //}
-                            table.render(option);
+                            ins = table.render(option);
 
                             //璁$畻鐧藉澂鍙戝竷鍚堣鍏枻鏁�
                             var sumHMaterOutQty = 0;
@@ -446,11 +507,18 @@
                             layer.close(wait);
                         } else {
                             $("#SumHMaterOutQty").val("");
+
+                            option.data = [];
+                            ins = table.render(option);
+
                             layer.close(wait);
                             layer.alert(data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         $("#SumHMaterOutQty").val("");
+                        option.data = [];
+                        ins = table.render(option);
+
                         layer.close(wait);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -470,7 +538,12 @@
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
-
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
                 //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
                 var com = "";
                 if (ColName != 0 && Comparator != 0) {
@@ -493,15 +566,63 @@
                     }
                     com = " and (" + ColName + " " + com + ")";
                 }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+
+
+                //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+                var OtherSearch = getSWhereByHUser();
+
 
                 sWhere = {
                     HBeginDate: HBeginDate
                     , HEndDate: HEndDate
-                    ,HMaterNumber: HMaterNumber
+                    , HMaterNumber: HMaterNumber
                     , HBillNo: HBillNo
                     , HProductName: HProductName
                     , HProductModel: HProductModel
-                    , RandomSearch:com
+                    , RandomSearch: com
+                    , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
                 }
                 //set_InitGrid(JSON.stringify(sWhere));
                 get_Display(JSON.stringify(sWhere));
@@ -520,11 +641,39 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
                 //form.render()
                 ColFilter();
                 sWhere = "";
             }
 
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Kf_ProdProcessSumReport_DyeColor_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
@@ -564,11 +713,11 @@
                         if (data1.data.length != 0) {
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            /*var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                 if (dataCol[i]) {
                                     var dataCols = dataCol[i].split('|');
                                 }
@@ -632,6 +781,7 @@
                 })
             }
 
+            //鏄庣粏鎶ヨ〃
             function get_EntryReport() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -661,6 +811,32 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
+
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮繃婊ゆ潯浠�
+            function getSWhereByHUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data;
+                        } else {
+                            res = result.data;
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                res = res.replaceAll("'", "''");
+                return res;
+            }
+            //#endregion
             //#endregion
         });
     </script>

--
Gitblit v1.9.1