From d96116bd8ccf131bcd9d6773ff25449d514b7881 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期六, 30 七月 2022 15:18:38 +0800
Subject: [PATCH] 凯贝

---
 WebTM/views/生产管理/生产投料单/Sc_PPickingBillList.html |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 3 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
index abe5157..8cfa44b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
@@ -43,6 +43,18 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">鐢ㄦ枡鍗�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HPPomBillNo" id="HPPomBillNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇鍗�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">鏉$爜鍙�</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HBillCode" id="HBillCode" style="width:190px;">
@@ -116,6 +128,9 @@
                     case 'btn-print':
                         get_PrintReport();
                         break;
+                    case 'btn-view':
+                        get_PrintView();
+                        break;
                     default:
                         break;
                 }
@@ -146,8 +161,8 @@
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
                         { type:"checkbox",fixed:"left" }
-                        , { field: 'HInterID', title: 'HInterID', sort: true }
-                        , { field: 'HEntryID', title: 'HEntryID', sort: true }
+                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true}
+                        , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 150 }
                         , { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -158,6 +173,7 @@
                         , { field: '浠舵暟', title: '浠舵暟' }
                         , { field: '棰嗘枡鍗曞彿', title: '棰嗘枡鍗曞彿' }
                         , { field: '鐢ㄦ枡娓呭崟鍙�', title: '鐢ㄦ枡娓呭崟鍙�' }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
                     ]]
                 };
                 option.data = [];
@@ -167,6 +183,14 @@
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
                 var index = layer.load(0, { shade: false });
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + '/Sc_PckSplit/Get_PPickingBillList',
@@ -186,6 +210,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+                sWhere = "";
             }
 
             // 蹇�熻繃婊�
@@ -194,6 +219,8 @@
                 var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
                 var HBillCode = $("#HBillCode").val();//鍒跺崟浜�
+                var HPPomBillNo = $("#HPPomBillNo").val();//鍒跺崟浜�
+                var HICMOBillNo = $("#HICMOBillNo").val();//鍒跺崟浜�
 
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
@@ -207,6 +234,12 @@
                 if (HBillCode) {
                     sWhere += " and 鏉″舰鐮� like '%" + HBillCode + "%'";
                 }
+                if (HPPomBillNo) {
+                    sWhere += " and 鐢ㄦ枡娓呭崟鍙� like '%" + HPPomBillNo + "%'";
+                }
+                if (HICMOBillNo) {
+                    sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -217,6 +250,8 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HBillCode").val("");//閮ㄩ棬
+                $("#HPPomBillNo").val("");//閮ㄩ棬
+                $("#HICMOBillNo").val("");//閮ㄩ棬
 
                 sWhere = "";
             }
@@ -246,7 +281,31 @@
                     layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-
+            //棰勮
+            function get_PrintView() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var PrintIds = "";
+                if (checkStatus.data.length >= 1) {
+                    for (var i = 0; i < data.length; i++) {
+                        PrintIds += data[i].HInterID + "-" + data[i].HEntryID + ","
+                    }
+                    PrintIds = PrintIds.substring(0, PrintIds.length - 1);
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + data[0].HInterID.toString() + '&Type=HPPickingBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
             //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });

--
Gitblit v1.9.1