From 607e62cd6ec91d53bac549299d986c23e5143d28 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 15:06:47 +0800
Subject: [PATCH] 出入库优化-称重相关方法

---
 igds-web/src/main/resources/static/admin/inout/in-weight.js |   47 +++++++----------------------------------------
 1 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index e5e5e36..dc553ba 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -6,6 +6,7 @@
 var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
 var timerWeight;
 var textParam;//璁惧璇嗗埆缁撴灉
+var curProgress;//褰撳墠璇︾粏娴佺▼
 
 $(function () {
     layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -49,8 +50,7 @@
 
     // 鐩戝惉閲嶉噺鍙樺寲
     $(".weight").blur(function () {
-        var name = this.name;
-        deAutoByIn(name);
+        deAutoByIn(this.name);
     });
 
     // 鍒濆鍖朩ebSocket
@@ -78,7 +78,6 @@
             updateWeight();
         });
     });
-
 };
 
 // socket淇℃伅杩斿洖铏曠悊
@@ -92,7 +91,6 @@
         $("#btn-submit").removeClass("layui-btn-disabled");
         $("#btn-submit").attr("disabled", false);
     }
-
     if ("btn-submit" == btnId) {
         $("#btn-submit").addClass("layui-btn-disabled");
         $("#btn-submit").attr("disabled", true);
@@ -105,8 +103,6 @@
 
             $("#btn-printBill").removeClass("layui-btn-disabled");
             $("#btn-printBill").attr("disabled", false);
-
-            addDisabled();
         }
     }
     if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
@@ -119,44 +115,15 @@
         $("#btn-printBill").addClass("layui-btn-disabled");
         $("#btn-printBill").attr("disabled", true);
 
-        delDisabled();
         resetForm();
     }
 }
 
-//鏇存敼鎵i噸淇℃伅妗嗕笉鍙紪杈�
-function addDisabled() {
-    //鏉傝川
-    $("#impurity").attr("disabled", true);
-    $("#deImpurity").attr("disabled", true);
-    //姘村垎
-    $("#wet").attr("disabled", true);
-    $("#deWet").attr("disabled", true);
-    //鍊间粨
-    $("#deHandle").attr("disabled", true);
-    //鍏朵粬
-    $("#deOther").attr("disabled", true);
-}
-
-//鎭㈠鎵i噸淇℃伅妗嗙紪杈戠姸鎬�
-function delDisabled() {
-    //鏉傝川
-    $("#impurity").attr("disabled", false);
-    $("#deImpurity").attr("disabled", false);
-    //姘村垎
-    $("#wet").attr("disabled", false);
-    $("#deWet").attr("disabled", false);
-    //鍊间粨
-    $("#deHandle").attr("disabled", false);
-    //鍏朵粬
-    $("#deOther").attr("disabled", false);
-}
-
-// 鐐瑰嚮绉伴噸
+//鐐瑰嚮绉伴噸
 function weight() {
     // 娌℃湁涓氬姟鏁版嵁涓嶅彲鎵ц
     if (!recordData) {
-        layer.alert("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
+        alertError("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
         return;
     }
 
@@ -224,7 +191,7 @@
 
 //鏂扮殑璇诲崱鏂瑰紡
 function flushICCard() {
-	flushICCard1();
+    flushICCard1();
 }
 
 /**
@@ -283,7 +250,7 @@
         success: function (json) {
             var data = json.no;
             if (data === "not found") {
-            	alertError("璇烽噸鏂拌鍗★紒");
+                alertError("璇烽噸鏂拌鍗★紒");
             } else {
                 textParam = data;
                 $("#text-param").text("璇嗗埆鍗″彿锛�" + textParam);
@@ -291,7 +258,7 @@
             }
         },
         error: function () {
-        	alertError("IC鍗¤鍙栧嚭閿欙紒");
+            alertError("IC鍗¤鍙栧嚭閿欙紒");
         }
     });
 }

--
Gitblit v1.9.3