From b4a8d50e3d97fc9e893b554a60134e4eceb012eb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 05 一月 2026 08:58:08 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/outStock.js |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/outStock.js b/src/main/webapp/static/js/pakStore/outStock.js
index 0725dfd..82dc21b 100644
--- a/src/main/webapp/static/js/pakStore/outStock.js
+++ b/src/main/webapp/static/js/pakStore/outStock.js
@@ -6,17 +6,20 @@
 function getCol() {
     var cols = [];
     cols.push(
-        {field: 'fbillNo', merge: true, align: 'center', title: '鍗曟嵁缂栧彿'}
-        , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栧彿'}
-        , {field: 'fentryID', align: 'center', title: '鍒嗗綍鍙�'}
-        , {field: 'forderInterID', align: 'center', title: '閿�鍞鍗曞崟鍙�'}
-        , {field: 'fauxQty', align: 'center', title: '鏁伴噺'}
-        , {field: 'fcommitQty', align: 'center', title: '鍙戣揣鏁伴噺'}
-        , {field: 'fauxPrice', align: 'center', title: '鍗曚环'}
-        , {field: 'fdate', align: 'center', title: '鏃ユ湡'}
-        , {field: 'fnote', align: 'center', title: '澶囨敞'}
-        , {field: 'fadd', align: 'center', title: '鍦板潃'}
-        , {fixed: 'right', merge: ['fbillNo'], title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
+        {field: 'fbillNo', merge: true, align: 'center', title: '鍗曟嵁缂栧彿', width: 150}
+        , {field: 'fsourceBillNo', align: 'center', title: '鐢熶骇鍗曞彿', width: 150}
+        , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栧彿', width: 140}
+        , {field: 'fname', align: 'center', title: '鐗╂枡鍚嶇О'}
+        , {field: 'fmodel', align: 'center', title: '瑙勬牸', width: 200}
+        , {field: 'fentryID', align: 'center', title: '鍒嗗綍鍙�', width: 80}
+        , {field: 'forderInterID', align: 'center', title: '鍗曟嵁缂栧彿', hide: true}
+        , {field: 'fauxQty', align: 'center', title: '鏁伴噺', width: 100}
+        // , {field: 'fcommitQty', align: 'center', title: '鍙戣揣鏁伴噺'}
+        , {field: 'fauxPrice', align: 'center', title: '鍗曚环', width: 100}
+        , {field: 'fdate', align: 'center', title: '鏃ユ湡', hide: true}
+        , {field: 'fnote', align: 'center', title: '澶囨敞', hide: true}
+        , {field: 'fadd', align: 'center', title: '鍦板潃', hide: true}
+        , {merge: ['fbillNo'], title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
     );
     return cols;
 }
@@ -96,7 +99,7 @@
             outStockDetail = layer.open(
                 {
                     type: 2,
-                    title: '閫夋嫨鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
+                    title: '绔嬪簱鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
                     shadeClose: false,
@@ -107,6 +110,21 @@
                 }
             );
         }
+        if (layEvent == 'btnNormalOut') {
+            outStockDetail = layer.open(
+                {
+                    type: 2,
+                    title: '骞充粨鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
+                    maxmin: true,
+                    area: [top.detailWidth, top.detailHeight],
+                    shadeClose: false,
+                    content: 'outStockNormalDetail.html',
+                    success: function (layero, index) {
+
+                    }
+                }
+            );
+        }
     });
 });
 

--
Gitblit v1.9.1