From 2ace77c833ab4e37b76c644fbdf0f7ce366979cf Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 11 三月 2024 10:58:42 +0800
Subject: [PATCH] 计划平台优化完善 报工平台 报检申请 生产汇报 功能优化完善
---
WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html | 131 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 63 deletions(-)
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
index c271668..f62d98c 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
@@ -65,7 +65,7 @@
</div>
<div class="layui-col-xs10">
<div class="layui-col-xs10">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" style="float: right " lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">娣诲姞</button>
@@ -167,7 +167,7 @@
set_InitGrid(); //鍒濆鍖栬〃鏍�
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
- var pFocus = $("#HBarCode");
+ var pFocus = $("#HQty");
pFocus.focus(); //鑾峰彇鍏夋爣
pFocus.select();
}
@@ -185,7 +185,7 @@
};
}
- //#region 浠庣紦瀛樺垪琛ㄤ腑杩斿洖淇℃伅
+ //#region 浠庢壂鐮佹ā鍧楄烦杞繑鍥炰俊鎭�
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -209,10 +209,19 @@
//#endregion
- //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
if (HInterID != 0) {
- $("#HBarCode").select();
- $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //杩斿洖鐗╂枡淇℃伅
+ $("#HBarCode").val(HMaterID);
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == 0) {
+ $('#HBarCode').val("");
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ else {
+ GetBarCode();
+ $("#HQty").focus(); //鑾峰彇鍏夋爣
+ }
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
}
@@ -222,9 +231,7 @@
return;
}
-
//#endregion
-
//#region 鍔熻兘鎺т欢
@@ -262,7 +269,6 @@
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- layer.close(index)
layer.closeAll("loading");
})
}
@@ -289,8 +295,8 @@
//鎵弿鏉＄爜
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetBarCode();
+ $("#HQty").select();
$("#HQty").focus(); //鑾峰彇鍏夋爣
layer.closeAll("loading");
}
@@ -298,8 +304,8 @@
//鏉＄爜鎸夐挳
form.on('submit(HBarCode-BT)', function (data) {
- layer.load(3)
GetBarCode();
+ $("#HQty").select();
$("#HQty").focus(); //鑾峰彇鍏夋爣
layer.closeAll("loading");
});
@@ -309,9 +315,15 @@
var sBarCode = $('#HBarCode').val()
if (sBarCode == '') {
playSound();
- layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
return;
}
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetBarCode_Json",
@@ -329,14 +341,25 @@
}
else {
playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
},
error: function (err) {
playSound();
- layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -345,9 +368,7 @@
//娣诲姞鎸夐挳
form.on('submit(cmdAdd)', function (data) {
- layer.load(3)
GetMeesageByBarCode();
- layer.closeAll("loading");
});
//灏嗘潯鐮佷俊鎭啓鍏ユ潯鐮佷复鏃惰〃
@@ -356,14 +377,25 @@
var sBarCode = $('#HBarCode').val()
if (sBarCode == '') {
playSound();
- layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
return;
}
- if (sHQty == "" || sHQty ==0) {
+ if (sHQty == "" || sHQty <= 0 || sHQty > 100) {
playSound();
- layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛屽ぇ浜�100锛岃閲嶆柊杈撳叆鏁伴噺锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HQty").select();
+ $("#HQty").focus();
+ });
return;
}
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
@@ -374,19 +406,32 @@
playSound_OK();
//娓呯┖鏁伴噺
$("#HQty").val("");
+ $("#HQty").select();
+ $("#HQty").focus();
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
}
else {
playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
},
error: function (err) {
playSound();
- layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -416,7 +461,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -429,7 +474,7 @@
break;
default:
- if (data[i].name == '鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
+ if (data[i].name == '绫虫暟' || data[i].name == '浠舵暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
}
else {
@@ -439,17 +484,6 @@
}
}
columns = col;
-
- ////璁剧疆璧嬪�煎垪瀹�
- //var colWidth = getColumnsWidth();
- //if (colWidth == "" || colWidth == []) {
-
- //}
- //else {
- // $.each(columns, function (x, m) {
- // m["width"] = colWidth[x];
- // });
- //}
listOption.cols = [columns];
listOption.data = result.data;
listOption.totalRow = true;
@@ -466,35 +500,6 @@
}
});
}
-
- //#region 鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- type: "Get",
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
- async: false,
- dataType: "json",
- data: { "colNum": colNum, "Name": HModName },
- success: function (data1) {
- if (data1.code == 1) {
- result = data1.data;
- }
- else if (data1.code == -1) {
-
- }
- else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- return result;
- }
- //#endregion
//#endregion
--
Gitblit v1.9.1