From 3f4c60630a161bcc0e1abf2a298522d19a56c938 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 13 二月 2026 14:04:50 +0800
Subject: [PATCH] 客户问题优化调整11

---
 fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
index 4b14cbf..3db4f2e 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
@@ -42,6 +42,11 @@
             }
         });
 
+        //鐩戝惉浠撳簱閫夋嫨,閫夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮鍝佺淇℃伅
+        form.on('select(select_depotId)', function (obj) {
+            updateFoodVarietyByDepot(obj.value);
+        })
+
         // 鍒濆鍖栬〃鍗曟暟鎹�
         renderTable();
     });
@@ -89,6 +94,24 @@
         "background": "#eff4f6"
     });
     layer.close(index);
+}
+
+//鏍规嵁閫夋嫨鐨勪粨搴撲俊鎭�,鏇存柊绮鍝佺
+function updateFoodVarietyByDepot(selectId) {
+    var selectDepot;
+    $.each(listDepot, function (index, data) {
+        if (data.id === selectId) {
+            selectDepot = data;
+            return false;
+        }
+    });
+
+    if (selectDepot) {
+        form.val("form-data", {
+            foodVariety: selectDepot.foodVariety
+        });
+        form.render();
+    }
 }
 
 // 娓叉煋琛ㄥ崟鏁版嵁
@@ -234,11 +257,13 @@
  * 鐧昏寮圭獥
  */
 function quickRegister() {
+    $("#form-data")[0].reset();
+    form.render();
     //鐧昏鎸夐挳鏀惧紑
     $("#btn_register").css("display", "block");
     $("#text-info").removeClass("text-info");
     //绉伴噸鎿嶄綔寮圭獥
-    var pro = '鐧昏';
+    var pro = '鐧昏绉伴噸';
     recordData = null;
     updateEditAndProgress();
     flushPage();
@@ -248,6 +273,8 @@
         area: ['1283px', '815px'],
         cancel: function (index, layero) {
             $("#weightDetail").css("display", "none");
+            // 鍒濆鍖栬〃鍗曟暟鎹�
+            renderTable();
         },
         shade: 0,
         scrollbar: 0,
@@ -261,8 +288,9 @@
  * @param progress
  */
 function showWindows() {
-
-    //鐧昏鎸夐挳鏀惧紑
+    $("#form-data")[0].reset();
+    form.render();
+    //鐧昏鎸夐挳闅愯棌
     $("#btn_register").css("display", "none");
     $("#text-info").addClass("text-info");
     //绉伴噸鎿嶄綔寮圭獥
@@ -278,6 +306,8 @@
         area: ['1283px', '815px'],
         cancel: function (index, layero) {
             $("#weightDetail").css("display", "none");
+            // 鍒濆鍖栬〃鍗曟暟鎹�
+            renderTable();
         },
         shade: 0,
         scrollbar: 0,
@@ -483,13 +513,18 @@
         id3: snapDto3.id,
         sort: $("#scaleName").val()
     };
+    if (!gatewaySer) {
+        layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛屾姄鍥惧け璐ワ紒");
+        return;
+    }
+    var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.snapUrl;
 
     //褰撳墠AJAX鏈嶅姟涓哄悓姝ユ湇鍔★紝杩斿洖鏁版嵁鍖呰鐓х墖淇℃伅
     var index = layer.load();
     $.ajax({
         sync: false,
         type: "POST",
-        url: "/inout/api/snap-img",
+        url: url,
         dataType: "json",
         contentType: "application/json;charset=UTF-8",
         data: JSON.stringify(snapData),
@@ -598,6 +633,7 @@
         contentType: "application/json;charset=UTF-8",
         data: JSON.stringify(recordData),
         success: function (result) {
+            layer.close(index);
             if (result.code != "0000") {
                 alertError(result.msg);
             } else {
@@ -606,11 +642,13 @@
                 notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
                 //绗竴娆＄О閲嶅悗锛屽埛鏂伴〉闈�
                 if (recordData.recordWeight <= 0.0) {
-                    flushData();
                     layer.closeAll();
+                    // 鍒濆鍖栬〃鍗曟暟鎹�
+                    renderTable();
+                    $("#form-data")[0].reset();
+                    form.render();
                 }
             }
-            layer.close(index);
         },
         error: function () {
             layer.close(index);
@@ -668,11 +706,16 @@
  * 璇诲彇杞︾墝鍙�
  */
 function flushPlateNum() {
+    if (!gatewaySer) {
+        layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛岃溅鐗岃鍙栧け璐ワ紒");
+        return;
+    }
+    var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.plateNumUrl;
     var param = JSON.stringify(snapDto1);
     var index = layer.load();
     $.ajax({
         type: "POST",
-        url: "/inout/api/get-plateNum",
+        url: url,
         dataType: "json",
         contentType: "application/json;charset=UTF-8",
         data: param,
@@ -709,7 +752,7 @@
         }
         $("#resultIntelCard").text(data.intelCard);
 
-        layer.open({
+        var indexNotify = layer.open({
             type: 1,
             offset: ['150px', '200px'],
             area: '450px;',
@@ -718,7 +761,7 @@
             btn: ['纭畾'],
             content: $('#dialog-from-notify'),
             yes: function (index) {
-                layer.closeAll();
+                layer.close(indexNotify);
             }
         });
     } else {

--
Gitblit v1.9.3