From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:50:59 +0800
Subject: [PATCH] 1

---
 src/main/webapp/static/js/locDetl/locDetl.js |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 0b1e265..0ad9a4f 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -20,8 +20,9 @@
         ,{field: 'sku', align: 'center',title: 'sku', hide: true}
         ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
         ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
-        ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
-        ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
+        ,{field: 'origin', align: 'center',title: '鎵规澶囨敞', hide: false}
+        ,{field: 'owner$', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
+        ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅old', hide: false}
         ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
         ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
         ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
@@ -64,7 +65,7 @@
         where:{
           unreason: false
         },
-        limits: [20, 30, 50, 100, 200, 500],
+        limits: [20, 30, 50, 100, 200, 500, 50000],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -98,6 +99,7 @@
                     res.data[_index][data.value] = 'N';
                 }
             });
+            getOutBound();
         }
     });
 
@@ -197,7 +199,7 @@
                     };
                     var loadIndex = layer.msg('姝e湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
                     $.ajax({
-                        url: baseUrl+"/locDetl/export/auth",
+                        url: baseUrl+"/locDetl/export/auth/v2",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
                         dataType:'json',
@@ -493,6 +495,29 @@
         type: 'datetime'
     });
 
+    // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+    function getOutBound(){
+        $.ajax({
+            url: baseUrl+"/owner/auto/site",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#takeSiteSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#ownerSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
 
 });
 

--
Gitblit v1.9.1