From be8b558b89a89deb3aa871fc2ddaacb7fb2197bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 16 十月 2023 09:25:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index bdddf81..e7ce3e2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -87,12 +87,10 @@
<option value="3">閲囪喘璁㈠崟</option>
<option value="4">鏀舵枡閫氱煡鍗�</option>
<option value="5">濮斿璁㈠崟</option>
- <option value="6">閫�璐ч�氱煡鍗�</option>
- <option value="7">鍏朵粬鍏ュ簱鍗�</option>
- <option value="8">鐩存帴璋冩嫧鍗�</option>
- <option value="9">閲囪喘閫�鏂欏崟</option>
- <option value="10">鐢熶骇閫�鏂欏崟</option>
- <option value="11">缁勮鎷嗗嵏鍗�</option>
+ <option value="6">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="7">閲囪喘鍏ュ簱鍗�</option>
+ <option value="8">閿�鍞��璐у崟</option>
+ <option value="9">鐢熶骇閫�鏂欏崟</option>
</select>
</div>
</div>
@@ -220,26 +218,39 @@
var HBatchNo = "";
var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+
+ var HMaterInfo = ""; //瀛樺偍鐗╂枡淇℃伅
+ var HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
+ var HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
//#endregion
//鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
var cur_title = data.elem.context.innerText;
if (cur_title == "鐗╂枡淇℃伅") {
HModName = "Gy_BarCodeBill";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.reload('mainTable', {
+ data: HMaterInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
} else if (cur_title == "鏉＄爜淇℃伅") {
HModName = "Gy_BarCodeBill_1";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn1();
-
+ table.reload('mainTable1', {
+ data: HBarInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
} else if (cur_title == "妗ｆ鍒楄〃") {
HModName = "Gy_BarCodeBill_2";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn2();
-
+ //鍔犺浇妗ｆ鍒楄〃
+ table.reload('mainTable2', {
+ data: HFileList // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
}
})
@@ -443,6 +454,18 @@
case '5':
return "濮斿璁㈠崟";
break;
+ case '6':
+ return "鐢熶骇鍏ュ簱鍗�";
+ break;
+ case '7':
+ return "閲囪喘鍏ュ簱鍗�";
+ break;
+ case '8':
+ return "閿�鍞��璐у崟";
+ break;
+ case '9':
+ return "鐢熶骇閫�鏂欏崟";
+ break;
}
}
@@ -454,7 +477,7 @@
//鑾峰彇缁勭粐ID
var SetHOrgID = $("#HOrgID").find("option:selected").val();
//椤甸潰灞�-鑷畾涔�
- var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+ var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
url = encodeURI(url);
//alert(url);
layer.open({
@@ -506,7 +529,10 @@
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0] //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
+ if (result.list[i].HMinQty != 0) {
+ result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+ }
}
BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
@@ -559,6 +585,7 @@
form.on('submit(ToolCreate)', function (data) {
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
var sSubStr = JSON.stringify(table.cache['mainTable']);
+ HMaterInfo = table.cache['mainTable'];
//鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -578,8 +605,8 @@
//鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
var HSelectBarCodeType = $("#HBarCodeType").find("option:selected").html();
//鑾峰彇褰撳墠鐧诲綍浜哄憳
- //var UserName = sessionStorage["HUserName"];
- var UserName = "Admin";
+ var UserName = sessionStorage["HUserName"];
+ //var UserName = "Admin";
var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
SaveBarCodeCreate(sMainSub);
})
@@ -1388,7 +1415,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1410,6 +1437,13 @@
HUnitName: checkStatus.data[0].HUnitName
});
+ if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
+ obj.update({
+ HQty: 1, //鏁伴噺
+ HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+ HBQty: 1 //绠辨暟
+ });
+ }
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1569,12 +1603,14 @@
table.reload('mainTable1', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
+ HBarInfo = result.list;
//鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
element.tabChange('tab-TabTest', '3');
//鍔犺浇妗ｆ鍒楄〃
table.reload('mainTable2', {
data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
+ });
+ HFileList = result.data;
}
else {
$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
--
Gitblit v1.9.1