From 7a0ae6ead96c7c68f949cf1f2b6bfaec7f301e6a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 四月 2025 10:03:47 +0800
Subject: [PATCH] 合并
---
WebTM/views/设备管理/Sb_EquipRepairCheckBill_PDA.html | 145 ++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 83 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
index 2716a40..dbb4d95 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
@@ -111,7 +111,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">
@@ -119,7 +119,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">
@@ -127,7 +127,7 @@
</td>
</tr>
<tr>
- <th>楠岃瘉椤圭洰</th>
+ <th>楠岃瘉椤圭洰<span style=" color :red">*</span></th>
<td class="bz_td">
<input type="text" name="HRepairCheckMainName" class="layui-input" id="HRepairCheckMainName" placeholder="閫夋嫨楠岃瘉椤圭洰" style="background-color:#efefef4d;">
<input type="hidden" name="HRepairCheckMainID" id="HRepairCheckMainID" value="0" autocomplete="off" class="layui-input">
@@ -135,7 +135,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">
@@ -335,7 +335,7 @@
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
$("#HEmpID").val(sessionStorage["HKeeperID"]); //楠屾敹浜篒D
$("#HEmpName").val(sessionStorage["HKeeper"]); //楠屾敹浜�
- $("#HManagerID").val(sessionStorage["HManagerID"]); //璐ｄ换浜篒D
+ $("#HManagerID").val(sessionStorage["HManagerID"] == null ? 0 : sessionStorage["HManagerID"]); //璐ｄ换浜篒D
$("#HManagerName").val(sessionStorage["HManagerName"]); //璐ｄ换浜�
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
@@ -353,50 +353,7 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
-
- //鏉″舰鐮佸洖杞︽柟娉�
- $('#HBarCode').on('keydown', function (event) {
- var HBarCode = $('#HBarCode').val();
- if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
- return;
- }
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.count == 1) {
- var data = result.data[0];
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HEquipID": data.HInterID,
- "HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": "1"
- });
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
-
- HProcExchBillNoFlag = true;
- layer.close(index);
- }
- else {
- layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
- });
-
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -425,12 +382,11 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
- layer.close(index);
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
- layer.close(index);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
@@ -440,40 +396,43 @@
//鏂板
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": '3911' },
- 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": '3911' },
+ 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 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile.html";
+ parent.location.href = "../../views/index_Mobile.html";
});
})
//#endregion
@@ -860,6 +819,24 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ if ($("#HManagerID").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 ($("#HRepairCheckMainID").val() == 0) {
+ layer.msg("楠屾敹椤圭洰娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").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: "娓╅Θ鎻愮ず" });
return false;
@@ -891,16 +868,16 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
- $("#HEquipID").val(data.HInterID);
- $("#HBarName").val(data.HName);
- $("#HBarSpec").val(data.HModel);
- $("#HBarModel").val(data.HModel2);
+ $("#HEquipID").val(data.hmainid);
+ $("#HBarName").val(data.璁惧鍚嶇О);
+ $("#HBarSpec").val(data.璁惧瑙勬牸);
+ $("#HBarModel").val(data.璁惧鍨嬪彿);
$("#HQty").val(1);
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -909,11 +886,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