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_EquipBeginBill_PDA.html | 127 ++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 78 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill_PDA.html"
index 52b3113..af7161c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill_PDA.html"
@@ -68,8 +68,8 @@
<div class="layui-tab-item layui-show">
<table style="width:80%;">
<tbody>
- <tr style="display:none;">
- <th>鏉″舰鐮�</th>
+ <tr>
+ <th>璁惧鏉＄爜</th>
<td class="bz_td">
<input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇锋壂鎻忔潯鐮�" style="border-radius: 50px;">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
@@ -97,6 +97,12 @@
</td>
</tr>
<tr>
+ <th>璁惧瑙勬牸</th>
+ <td class="bz_td">
+ <input type="text" name="HEquipModel" class="layui-input" id="HEquipModel" placeholder="" style="background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
+ <tr>
<th>鍏宠仈涓昏澶�</th>
<td class="bz_td" style="margin-top: 8px;">
<input type="text" name="HEquipRelationName" class="layui-input" id="HEquipRelationName" placeholder="閫夋嫨鍏宠仈涓昏澶�" style="background-color:#EDEDED;" readonly>
@@ -121,7 +127,7 @@
<tr>
<th>澶�    娉�</th>
<td class="bz_td">
- <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉�" >
+ <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉�">
</td>
</tr>
</tbody>
@@ -312,41 +318,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() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.count == 1) {
- var data = result.data[0];
-
- 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 () {
@@ -387,38 +359,41 @@
}
});
-
//鏂板
form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').removeClass("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').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+ $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
- option.data = [];
- table.render(option);
+ // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+ $("#formData")[0].reset();
+ layui.form.render();
+ option.data = [];
+ table.render(option);
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3917' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HBeginTime").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"]); //鍒涘缓浜�
- $("#HBeginEmpID").val(sessionStorage["HEmpID"]); //寮�鏈轰汉ID
- $("#HBeginEmpName").val(sessionStorage["HEmpName"]); //寮�鏈轰汉
+ $("#HBarCode").focus();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3917' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HBeginTime").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"]); //鍒涘缓浜�
+ $("#HBeginEmpID").val(sessionStorage["HEmpID"]); //寮�鏈轰汉ID
+ $("#HBeginEmpName").val(sessionStorage["HEmpName"]); //寮�鏈轰汉
+
+ layer.close(index);
+ });
})
//#region 閫�鍑烘寜閽�
@@ -657,22 +632,16 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
- $("#HCardID").val(data.hmainid);
- $("#HCardNumber").val(data.鍗＄墖缂栫爜);
- $("#HCardName").val(data.璧勪骇鍚嶇О);
- $("#HCardStatusID_OLD").val(data.HCardStatusID);
- $("#HCardStatusName_OLD").val(data.璧勪骇鐘舵��);
- $("#HCardAddr_OLD").val(data.HCardAddr);
- $("#HCardAddrName_OLD").val(data.璧勪骇浣嶇疆);
- $("#HOrgID").val(data.HOrgID);
- $("#HOrgName").val(data.璧勪骇缁勭粐);
- $("#HQty").val(1);
+ $("#HEquipID").val(data.HInterID);
+ $("#HEquipName").val(data.璁惧鍚嶇О);
+ $("#HEquipModel").val(data.璁惧瑙勬牸);
+
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -680,11 +649,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