From 7e9aed4d1d60a20c659a3cedeac94e05205cf2ea Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 19 三月 2024 09:00:25 +0800
Subject: [PATCH] 销售订单:编辑时是否取库存数据为否 问题解决

---
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index b6394a6..203de9c 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -226,6 +226,7 @@
 
             //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
             element.on('tab(tab-TabTest)', function (data) {
+                HMaterInfo = table.cache['mainTable'];
                 var cur_title = data.elem.context.innerText;
                 if (cur_title == "鐗╂枡淇℃伅") {
                     HModName = "Gy_BarCodeBill";
@@ -476,7 +477,7 @@
                 //鑾峰彇缁勭粐ID
                 var SetHOrgID = $("#HOrgID").find("option:selected").val();
                 //椤甸潰灞�-鑷畾涔�
-                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                 url = encodeURI(url);
                 //alert(url);
                 layer.open({
@@ -604,8 +605,8 @@
                 //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
                 var HSelectBarCodeType = $("#HBarCodeType").find("option:selected").html();
                 //鑾峰彇褰撳墠鐧诲綍浜哄憳
-                //var UserName = sessionStorage["HUserName"];
-                var UserName = "Admin";
+                var UserName = sessionStorage["HUserName"];
+                //var UserName = "Admin";
                 var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
                 SaveBarCodeCreate(sMainSub);
             })
@@ -829,10 +830,10 @@
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О',  width: 200 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
                     , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
-                    , { field: 'HBQty', title: '绠辨暟', width: 100 }
-                    , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true}
+                    , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
+                    , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+                    , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true}
                     , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
                     , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
                     , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
@@ -850,7 +851,7 @@
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
                     , { field: 'HUnitName', title: '璁¢噺鍗曚綅',width: 100 }
-                    , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
+                    , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
                     , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
                     , { field: 'HDate', title: '杩涙枡鏃ユ湡',  width: 100 }
@@ -861,6 +862,7 @@
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: false
+                    , totalRow: true
                     , cellMinWidth: 75
                     , height: 'full-325'
                     , cols: [columns]
@@ -1414,7 +1416,7 @@
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes'],
+                                content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 

--
Gitblit v1.9.1