From 89a083bd50be47f97cc912ef743825236337be6a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 29 十一月 2021 16:35:26 +0800
Subject: [PATCH] 条码打印

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 9257522..b7ec757 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -106,7 +106,7 @@
                                     <script type="text/html" id="toolbarDemo">
                                         <div class="layui-btn-container">
                                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-normal">鏅�氭潯鐮�</button>-->
-                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-box">鍐呭绠辨潯鐮�</button>
+                                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-box">鍐呭绠辨潯鐮�</button>-->
 
                                         </div>
                                     </script>
@@ -195,15 +195,25 @@
         var linterid = params[params[0]];
         var lentryid = params[params[1]];
         var type = params[params[2]];
-        //鍘熺敓鎴愭潯鐮佹柟娉�
+        //鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
         var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
         var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax
         var saveBarCode = "GetBarcodeSaveBillBox";//鏉$爜鐢熸垚淇濆瓨鏂规硶ajax
+        var openTmpListType = "SRM_POInStockBillList"; //鏉$爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
         //閲囪喘璁㈠崟鏉$爜鐢熸垚瑙勫垯
         if (type == 'SRM_POOrderBillList') {
             mainUrl = 'GetHBarCodeShowBillMainBycg';
             subUrl = "GetHBarCodeShowBillSubBycg";
             saveBarCode = "GetBarcodeSaveBillBoxBycg";
+            openTmpListType = 'SRM_POOrderBillList';
+
+        }
+        //濮斿璁㈠崟
+        else if (type == 'SRM_EntrustOrderBill') {
+            mainUrl = 'GetHBarCodeShowBillMainBywy';
+            subUrl = "GetHBarCodeShowBillSubBywy";
+            saveBarCode = "GetBarcodeSaveBillBoxBycg";//璋冪敤閲囪喘鏁版嵁
+            openTmpListType = 'SRM_POOrderBillList';
         }
         // debugger;
         $.ajax({
@@ -517,7 +527,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=HBarCodePrint', 'yes']
+                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=' + openTmpListType, 'yes']
                         , resize: false
                         //, cancel: function () {
                         //    $(".layui-btn").removeClass("layui-btn-disabled");
@@ -567,9 +577,9 @@
                     , { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
                     //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
                     //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
-                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate"}//
-                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100,  edit: 'text', event: "inputHKFPeriod"}//
-                    , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate"}//
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//
+                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod" }//
+                    , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }//
                     //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -622,8 +632,8 @@
                                 //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
                                 //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
                                 , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
-                                , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod"}
-                                , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate"}
+                                , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod" }
+                                , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }
                                 //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
                                 , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                                 , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }

--
Gitblit v1.9.1