From 4475a6d2d7dc245176bcfb704a3275b95a5057fd Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 六月 2024 16:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html |   86 ++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 33 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index 0fa1f7d..dd24b0a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -163,7 +163,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>閮ㄩ棬</th>
+                                            <th>閮ㄩ棬<span style=" color:red">*</span></th>
                                             <td class="bz_td">
                                                 <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
@@ -171,7 +171,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>缁翠慨浜�</th>
+                                            <th>缁翠慨浜�<span style=" color:red">*</span></th>
                                             <td class="bz_td">
                                                 <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨缁翠慨浜�" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
@@ -179,7 +179,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>缁翠慨椤圭洰</th>
+                                            <th>缁翠慨椤圭洰<span style=" color:red">*</span></th>
                                             <td class="bz_td">
                                                 <input type="text" name="HRepair" class="layui-input" id="HRepair" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HRepairID" id="HRepairID" value="0" autocomplete="off" class="layui-input">
@@ -203,7 +203,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>鏁呴殰鐧昏鍗�</th>
+                                            <th>鏁呴殰鐧昏鍗�<span style=" color:red">*</span></th>
                                             <td class="bz_td">
                                                 <input type="text" name="HMainSourceBillNo" class="layui-input" id="HMainSourceBillNo" placeholder="閫夋嫨鏁呴殰鐧昏鍗�" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off" class="layui-input">
@@ -212,7 +212,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>璐熻矗浜�</th>
+                                            <th>璐熻矗浜�<span style=" color:red">*</span></th>
                                             <td class="bz_td">
                                                 <input type="text" name="HManagerName" class="layui-input" id="HManagerName" placeholder="閫夋嫨璐熻矗浜�" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HManagerID" id="HManagerID" value="0" autocomplete="off" class="layui-input">
@@ -489,7 +489,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -499,34 +498,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": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3910' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HRepairBeginDate").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": '3910' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HRepairBeginDate").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 閫�鍑烘寜閽�
@@ -849,10 +851,26 @@
             }
             //闈炵┖楠岃瘉
             function AllowLoadData(sSubStr) {
+                if ($("#HDeptID").val() == 0) {
+                    layer.msg("閮ㄩ棬娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("缁翠慨浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HRepairID").val() == 0) {
+                    layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HMainSourceInterID").val() == 0) {
+                    layer.msg("鏁呴殰鐧昏鍗曟病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
                 if ($("#HManagerID").val() == 0) {
                     layer.msg("璐熻矗浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
-                }
+               
 
                 if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                     layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -909,11 +927,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