From eabb48863f0d76e230b65db8af286328e077a5af Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 16 二月 2022 10:41:25 +0800
Subject: [PATCH] .

---
 version/db/wms_saas20220216.bak              |    0 
 src/main/webapp/static/js/receive/receive.js |    6 ++++--
 src/main/webapp/views/receive/receive.html   |    4 ++--
 src/main/resources/application.yml           |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9d82566..b0d2ab6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -50,4 +50,4 @@
     id: LTAI4GDzr6ioSHuRw2mk22ug
     secret: 84CHL7tF21LbU1qpaP0jn9mIAZP9bv
     bucket: tjdt
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    endpoint: http://oss-cn-hangzhou.aliyuncs.com
\ No newline at end of file
diff --git a/src/main/webapp/static/js/receive/receive.js b/src/main/webapp/static/js/receive/receive.js
index b0b9e5c..c71cb74 100644
--- a/src/main/webapp/static/js/receive/receive.js
+++ b/src/main/webapp/static/js/receive/receive.js
@@ -198,7 +198,7 @@
             ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿', hide: true}
             ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
             ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
-            ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��', templet: '#settleTpl', width: 100}
+            ,{field: 'settle$', align: 'center',title: '鍗曟嵁鐘舵��', templet: '#settleTpl', width: 100}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#printBar',  width: 120}
         ]],
         request: {
@@ -325,6 +325,8 @@
                 break;
             // 鎵撳嵃
             case 'print':
+                alert('寰呭畬鎴�');
+                return;
                 layer.confirm('寮�濮嬫墦鍗�' +data.orderNo + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
                     layer.closeAll();
                     printPakouts(data.orderNo);
@@ -459,7 +461,7 @@
         // });
     }
 
-    // 鎵撳嵃鎷ｈ揣鍗�
+    // 鎵撳嵃鍏ュ簱鍗�
     function printPakouts(orderNo) {
         $.ajax({
             url: baseUrl+"/work/stock/out/print",
diff --git a/src/main/webapp/views/receive/receive.html b/src/main/webapp/views/receive/receive.html
index ea2a0d6..c8ca6b6 100644
--- a/src/main/webapp/views/receive/receive.html
+++ b/src/main/webapp/views/receive/receive.html
@@ -85,9 +85,9 @@
                     <form class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">璁㈠崟缂栧彿:</label>
+                                <label class="layui-form-label">鍏ュ簱鍗曠紪鍙�:</label>
                                 <div class="layui-input-inline">
-                                    <input name="order_no" class="layui-input" placeholder="杈撳叆璁㈠崟缂栧彿"/>
+                                    <input name="order_no" class="layui-input" placeholder="杈撳叆鍏ュ簱鍗曠紪鍙�"/>
                                 </div>
                             </div>
                             <div class="layui-inline">&emsp;
diff --git a/version/db/wms_saas20220105.bak b/version/db/wms_saas20220216.bak
similarity index 90%
rename from version/db/wms_saas20220105.bak
rename to version/db/wms_saas20220216.bak
index c61129c..f970cec 100644
--- a/version/db/wms_saas20220105.bak
+++ b/version/db/wms_saas20220216.bak
Binary files differ

--
Gitblit v1.9.1