From 73d47a28756a1a0f6aea2a8c2c694a4836d2d86f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 13 五月 2022 17:19:17 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 7dafa50..5a8abc4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -37,8 +37,8 @@
<input type="text" name="HBillNo1" id="HBillNo1" style="display:none">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏁磋鐢熸垚</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏉＄爜鐢熸垚</button>
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>-->
</div>
</div>
</form>
@@ -110,7 +110,7 @@
//鏁寸鐢熸垚
form.on('submit(btnPack)', function (data) {
var flag = "ZZ";
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = table.checkStatus('mainTable');
SavePack(flag, sSubStr);
});
//鎷肩鐢熸垚
@@ -156,6 +156,7 @@
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
, { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
@@ -168,6 +169,15 @@
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
, { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'false', width: 100 }
, { field: 'HSpsQty', title: '鍓╀綑鏁伴噺', edit: 'false', width: 100 }
+
+ , { field: 'FBillNo', title: '閿�鍞鍗曞彿', edit: 'false', width: 100 }
+ , { field: 'FLXName', title: '鑱旂郴浜�', edit: 'text', width: 100 }
+ , { field: 'FInAddress', title: '鏀惰揣鏂瑰湴鍧�', edit: 'false', width: 100 }
+ , { field: 'FMaterName', title: '閿�鍞墿鏂欏悕绉�', edit: 'false', width: 100 }
+ , { field: 'FBZFS', title: '鍖呰鏂瑰紡', edit: 'false', width: 100 }
+ , { field: 'FHX', title: '鑺卞瀷', edit: 'false', width: 100 }
+ , { field: 'FQK', title: '澧欏挃缂�', edit: 'false', width: 100 }
+ , { field: 'FWBBZ', title: '澶栧寘澶囨敞', edit: 'false', width: 100 }
, { field: 'HCusID', title: 'HCusID', edit: 'text', width: 100, hide: true }
, { field: 'HCusName', title: '瀹㈡埛', edit: 'false', width: 100 }
@@ -205,13 +215,22 @@
type: "POST",
url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
+ data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- set_InitGrid();//閲嶆柊鍔犺浇琛ㄦ牸
- });
+ var PrintIds = data.code;
+ PrintIds = PrintIds.substring(0, PrintIds.length - 1);
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + PrintIds + '&Type=HQKPackBill', 'yes']
+ , resize: false
+ })
}
else {
f_alert(data.Message);
@@ -222,7 +241,6 @@
error: function (err) {
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
}
});
}
@@ -231,9 +249,8 @@
function AllowLoadData(sSubStr) {
var Result = true;
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
- sSubStr = JSON.parse(sSubStr);
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HMinQty == "") {
+ for (var i = 0; i < sSubStr.data.length; i++) {
+ if (sSubStr.data[i].HMinQty == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈�灏忓寘瑁呮暟涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
--
Gitblit v1.9.1