From 76824fbc74817dc6a87cef54c2ab18705490356e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 四月 2025 08:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 252 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 182 insertions(+), 70 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index fa55302..2cdd867 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -24,7 +24,7 @@
border-radius: 4px;
}
- .title {
+ /*.title {
border-left: 4px solid #1492ff;
padding-left: 6px;
margin: 20px 10px 4px;
@@ -60,67 +60,83 @@
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
- }
+ }*/
- .layui-form-label {
+ /* .layui-form-label {
padding: 9px 5px;
width: 85px;
- }
+ }*/
- .layui-input-block {
+ /* .layui-input-block {
margin-left: 85px;
min-height: 36px;
+ }*/
+
+ .layui-table-cell {
+ height: auto;
+ white-space: normal;
+ }
+
+ .layui-col-xs8 {
+ width: 55.666667%;
}
</style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 15px;background-color: #efefef;">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
<div class="maintitle">鍒拌揣纭</div>
- <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉＄爜</label>
- <div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input"><!--lay-verify="required"-->
- <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;"><span style="color:red;">*</span>鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin">纭畾</button>
</div>
</div>
- </div>
-
+ </div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
- <li class="layui-this">琛ㄥご淇℃伅</li>
- <li>鏄庣粏淇℃伅</li>
+ <li lay-id="1" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鏄庣粏淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
- <input type="hidden" class="layui-input" name="HInterID" id="HInterID" style="width:100px">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID" autocomplete="off" class="layui-input">
+ </div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">渚涘簲鍟�:</label>
- <div class="layui-input-block">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" disabled="disabled">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">渚涘簲鍟�</label>
</div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
+ </div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
- <div class="layui-input-block">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -138,9 +154,9 @@
</div>
</div>
- <div class="layer-footer" style="text-align: center;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Check" id="btn_Check">瀹℃牳</button>
- <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
</form>
</div>
@@ -170,7 +186,7 @@
});
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
- $("#HBarCode").focus();
+ $("#HBillNo").focus();
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -182,6 +198,49 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
+
+ ////鎵弿鏉″舰鐮佹柟娉昻ew
+ //function GetMeesageByBarCode() {
+ // var HBarCode = $('#HBarCode').val();
+ // if (!HBarCode) {
+ // layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ // return;
+ // }
+ // var HInterID = $('#HInterID').val();
+ // if (!HInterID) {
+ // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ // return;
+ // }
+ // var index = layer.load();
+ // $.ajax({
+ // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // type: "GET",
+ // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // success: function (result) {
+ // if (result.code == "1") {
+ // var sSubStr = table.cache['mainTable'];
+ // for (var i = 0; i < sSubStr.length; i++) {
+ // if (sSubStr[i].HMaterID == result.data[0].HMaterID) {
+ // sSubStr[i].HSQty += result.data[0].HQty;
+ // table.render(option);
+ // break;
+ // }
+ // }
+ // 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: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ // $('#HBarCode').val("");
+ // $("#HBarCode").focus();
+ //}
//鎵弿鏉″舰鐮佹柟娉�
function GetMeesageByBarCode() {
var HBarCode = $('#HBarCode').val();
@@ -195,58 +254,103 @@
return;
}
var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID },
- success: function (result) {
- if (result.code == "1") {
- var sSubStr = table.cache['mainTable'];
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- table.render(option);
- break;
- }
- }
- 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: "娓╅Θ鎻愮ず" });
- }
- });
+ var sSubStr = table.cache['mainTable'];
+ if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ table.render(option);
+ return;
+ }
+ layer.close(index);
+ //$.ajax({
+ // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // type: "GET",
+ // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // success: function (result) {
+ // if (result.code == "1") {
+ // var sSubStr = table.cache['mainTable'];
+ // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // table.render(option);
+ // break;
+ // }
+ // 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: "娓╅Θ鎻愮ず" });
+ // }
+ //});
$('#HBarCode').val("");
$("#HBarCode").focus();
}
- form.on('submit(btn_Cancel)', function () {
- parent.location.href = "../../../views/index.html"
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
})
//瀹℃牳
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var sSubStr = table.cache['mainTable'];
+ var HReturn = "";
for (var i = 0; i < sSubStr.length; i++) {
if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓嶈兘瓒呭嚭璁㈠崟鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (parseInt(sSubStr[i].HSQty) == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓�0", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (parseInt(sSubStr[i].HSQty) != parseInt(sSubStr[i].HQty)) {
+ HReturn += "绗�" + (i + 1) + "琛�,璁㈠崟鏁伴噺涓庢潯鐮佹暟閲忎笉涓�鑷达紝鏄惁缁х画瀹℃牳<br/>";
+ }
}
+ if (HReturn != "") {
+ layer.confirm(HReturn, {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function (index, layero) {
+ //鎸夐挳涓�鍥炶皟
+ set_Aduit();
+ }, function (index) {
+ //鎸夐挳浜屽洖璋�
+ return;
+ });
+ } else {
+ set_Aduit();
+ }
+
+ });
+
+ //瀹℃牳鎸夐挳鏂规硶
+ function set_Aduit() {
var index = layer.load();
var HInterID = $('#HInterID').val();
var HBillNo = $('#HBillNo').val();
+ var sSubStr = table.cache['mainTable'];
+
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var msg = JSON.stringify(sSubStr) + ';' + sessionStorage["HUserName"];
+
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost",
type: "Post",
- data: { "msg": JSON.stringify(sSubStr) },
+ data: { "msg": msg },
success: function (result) {
if (result.code == "1") {
- layer.msg("瀹℃牳鎴愬姛", { icon: 1, btn: ['纭'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("瀹℃牳鎴愬姛", {
+ icon: 1, time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ window.location.reload();
+ element.tabChange('TabTest', '1');
+ });
layer.close(index);
}
else {
@@ -259,14 +363,14 @@
layer.close(index);
}
});
- });
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
//琛ㄥご
columns = [
{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left' }
- , { field: 'HSQty', title: '鏁伴噺', edit: 'text', totalRow: true }
+ , { field: 'HSQty', title: '鏉＄爜鏁伴噺', edit: 'text', totalRow: true }
, { field: 'HQty', title: '璁㈠崟鏁伴噺' }
, { field: 'HMaterID', title: 'HMaterID' }
, { field: 'HMaterNum', title: '鐗╂枡浠ｇ爜' }
@@ -274,7 +378,8 @@
, { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
, { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
];
option = {
id: 'mainTable'
@@ -342,10 +447,17 @@
option.data = result.data;
table.render(option);
layer.close(index);
+ element.tabChange('TabTest', '2');
}
else {
layer.close(index);
- 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 () {
+ element.tabChange('TabTest', '1');
+ $("#HBillNo").select();
+ $("#HBillNo").focus();
+ });
}
},
error: function (err) {
--
Gitblit v1.9.1