From ccb72d1aa7a9358e30bd45ccb6cd7ebef4786fe7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 31 五月 2024 15:08:16 +0800
Subject: [PATCH] 故障登记单 我维修单 验收单 优化
---
WebTM/views/设备管理/Sb_EquipConkBookBill_PDA.html | 54 ++----------------
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 6 +-
WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html | 43 --------------
WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA_OLD.html | 43 --------------
4 files changed, 9 insertions(+), 137 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA_OLD.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA_OLD.html"
index 0f7dc32..66c481c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA_OLD.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA_OLD.html"
@@ -426,49 +426,6 @@
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.HItemID,
- "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) {
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 c273f7e..0fa1f7d 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"
@@ -451,49 +451,6 @@
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) {
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 41da872..5bbad4f 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"
@@ -375,48 +375,6 @@
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 () {
@@ -928,18 +886,18 @@
}
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.璁惧鍨嬪彿);
$("#HManagerID").val(data.HRepairEmpID);
- $("#HManagerName").val(data.璐熻矗浜�);
+ $("#HManagerName").val(data.缁存姢璐熻矗浜�);
$("#HQty").val(1);
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index fb7f25d..1b4ae15 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -585,11 +585,11 @@
, { field: '鏃ユ湡', title: '鏃ユ湡' }
, { field: 'HName', title: '浜у搧鍚嶇О' }
, { field: 'HNumber', title: '浜у搧浠ｇ爜' }
- , { field: 'HBarCode', title: 'SN鐮�' }
+ , { field: 'HBarCode', title: 'SN鐮�', width: 300 }
, { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' }
, { field: 'HBatchNo', title: '涓嶈壇绫诲瀷' }
, { field: 'HInterID', title: 'HInterID', hide: true }
- , { field: 'HEntryID', title: 'HEntryID', hide: true}
+ , { field: 'HEntryID', title: 'HEntryID', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
]]
}
@@ -609,7 +609,7 @@
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- , { field: '浜у搧鏉＄爜', title: 'SN鐮�' }
+ , { field: '浜у搧鏉＄爜', title: 'SN鐮�', width: 300}
//, { field: '閰嶄欢鏉＄爜', title: '閰嶄欢SN鐮�' }
//, { field: '浠诲姟鍗曞彿', title: '璁㈠崟鍙�' }
, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
--
Gitblit v1.9.1