From ba1b1c0fc71c4b70c0c36afa8924178849a4f266 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 06 六月 2024 14:45:26 +0800
Subject: [PATCH] 设备开关机添加扫码功能,设备模块扫码根据设备档案中的条形码字段进行匹配

---
 WebTM/views/设备管理/Sb_EquipConkBookBill_PDA.html |   58 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 27 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
index 5bbad4f..bf7d3e1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
@@ -414,7 +414,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -424,34 +423,37 @@
 
             //鏂板
             form.on('submit(Add)', function (data) {
-                $('#Saver').addClass("buttom_box_little");
-                $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
-                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
-                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3907' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
-                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
-                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3907' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                    $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                    $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    layer.close(index);
+                });       
             })
 
             //#region 閫�鍑烘寜閽�
@@ -906,11 +908,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }

--
Gitblit v1.9.1