From 5e5bef3f5b55a7e052f0d271328b1d670b5f9384 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 五月 2022 09:13:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 5a8abc4..8eba67b 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"
@@ -111,6 +111,13 @@
form.on('submit(btnPack)', function (data) {
var flag = "ZZ";
var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 0) {
+ SavePack(flag, sSubStr);
+ }
+ else {
+ layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
+ return;
+ }
SavePack(flag, sSubStr);
});
//鎷肩鐢熸垚
@@ -158,6 +165,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', 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 }
, { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -221,16 +229,16 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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
- })
+ var Type = "HQKPackBill";
+ var OpenTmp = "";
+ if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" || sSubStr.data[0].FMaterName != "")) {
+ OpenTmp = "鑺卞瀷鏉＄爜";
+ }
+ else {
+ OpenTmp = "鍖呰鏂瑰紡鏉＄爜";
+ }
+ window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
}
else {
f_alert(data.Message);
--
Gitblit v1.9.1