From 4c0a7b99cb2eef43010e0663a63fd6adff9fd062 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 六月 2024 12:03:04 +0800
Subject: [PATCH] 条码生成添加计划跟踪号字段；生产订单批量下推生成生产汇报单；生产汇报单打印；工序检验单选择质检方案带出检验项目
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 251 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 185 insertions(+), 66 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 022b004..c6722c6 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,10 +87,11 @@
<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="6">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="7">閲囪喘鍏ュ簱鍗�</option>
+ <option value="8">閿�鍞��璐у崟</option>
+ <option value="9">鐢熶骇閫�鏂欏崟</option>
+ <option value="10">宸ュ簭娴佽浆鍗�</option>
</select>
</div>
</div>
@@ -212,32 +213,45 @@
var sWhere = "";
var sBillType = "3801";
var HModName = "Gy_BarCodeBill";
- var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID","鎿嶄綔鍛業D","鐝粍ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HMaterID = "";
var HBatchNo = "";
var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
- //#endregion
+
+ 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 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
}
})
@@ -249,11 +263,11 @@
//鍔犺浇宸ュ巶浠ｇ爜鏁版嵁
set_HWorksNumber();
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
- set_HBarCodeType();
+ set_HBarCodeType();
var rowdata = [{
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "","HMTONo": ""
}];
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -274,19 +288,19 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //#endregion
+ //#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
//澶村伐鍏锋爮
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
- var AddRow = table.cache['mainTable'];
+ var AddRow = table.cache['mainTable'];
var NewRow = {
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
- };
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
+ };
//console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -384,8 +398,7 @@
HBQty: 0, //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
- else
- {
+ else {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: value, //鏁伴噺
@@ -397,7 +410,7 @@
value = isNaN(value) ? 0 : value;
HMinQty2 = value; //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- if (HQty == 0) //闄ゆ暟涓�0
+ if (HQty == 0) //闄ゆ暟涓�0
{
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -412,7 +425,7 @@
HBQty: Math.ceil(HQty / value), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
-
+
break;
default:
}
@@ -442,16 +455,19 @@
return "濮斿璁㈠崟";
break;
case '6':
- return "鐢熶骇鍏ュ簱";
+ return "鐢熶骇鍏ュ簱鍗�";
break;
case '7':
- return "閲囪喘鍏ュ簱";
+ return "閲囪喘鍏ュ簱鍗�";
break;
case '8':
- return "閿�鍞��璐�";
+ return "閿�鍞��璐у崟";
break;
case '9':
- return "鐢熶骇閫�鏂�";
+ return "鐢熶骇閫�鏂欏崟";
+ break;
+ case '10':
+ return "宸ュ簭娴佽浆鍗�";
break;
}
}
@@ -464,7 +480,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({
@@ -473,7 +489,7 @@
title: '' + getSupType() + '鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['95%', '80%'],
+ area: ['95%', '95%'],
maxmin: true,
content: [url, 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -516,16 +532,17 @@
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,6})?/)[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)
- }
+ result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+ }
}
-
+
BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
//for (let i = 0; i < result.list.length; i++) {
// result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
//}
+ console.log(result.list[0]);
table.reload('mainTable', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -572,6 +589,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))//鏁版嵁楠岃瘉
{
@@ -582,8 +600,7 @@
var HOrgType = $("#HOrgID").find("option:selected").html();
//鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
var CampanyName = $("#HWorksNumber").find("option:selected").html();
- if (CampanyName == "" || CampanyName == null)
- {
+ if (CampanyName == "" || CampanyName == null) {
CampanyName = "xxx";
}
//鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
@@ -591,15 +608,15 @@
//鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
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);
})
//閲嶇疆
form.on('submit(ToolReset)', function (data) {
- layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�',{
+ layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�', {
btn: ['纭畾', '鍙栨秷'],
title: "鎻愮ず",
icon: 3,
@@ -609,7 +626,7 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
$("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
$("#HBarCodeType").val('0');
- var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+ var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: ''}]
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -617,6 +634,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+ , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
}]
table.reload('mainTable1', {
data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -628,7 +646,7 @@
table.reload('mainTable2', {
data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
- layer.close(index)
+ layer.close(index)
})
})
@@ -652,7 +670,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+ var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '' }]
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -678,7 +696,7 @@
success: function (data1) {
if (data1.code == 1) {
layer.alert(data1.Message)
- }
+ }
}, error: function () {
layer.close(index);
layer.alert(data1.Message, { icon: 5 });
@@ -808,22 +826,28 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
- , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
- , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+ , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+ , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
, { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+ , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber'}
+ , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+ , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+ , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
- , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
- , { field: 'HBQty', title: '绠辨暟', width: 100 }
- , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
+ , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+ , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
, { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
, { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
, { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
- , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+ , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
, { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
, { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
@@ -831,16 +855,17 @@
, { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
, { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
, { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
, { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
- , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitNumber', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅',width: 100 }
- , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
- , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
+ , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -848,6 +873,7 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
+ , totalRow: true
, cellMinWidth: 75
, height: 'full-325'
, cols: [columns]
@@ -856,7 +882,7 @@
}
};
option.data = rowdata;
- table.render(option);
+ table.render(option);
}
//鍒濆鏉＄爜淇℃伅琛ㄦ牸
function set_CountGrid() {
@@ -887,7 +913,7 @@
option1 = {
id: 'mainTable1'
, elem: '#mainTable1'
- , toolbar: '#toolbarDemo1'
+ , toolbar: '#toolbarDemo1'
, page: false
, limit: 500
, cellMinWidth: 120
@@ -956,7 +982,7 @@
option2 = {
id: 'mainTable2'
, elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
+ , toolbar: '#toolbarDemo2'
, page: false
, limit: 500
, cellMinWidth: 120
@@ -973,7 +999,7 @@
, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
}];
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -987,7 +1013,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
- , "HExpirationDateFlag": 0
+ , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
}];
table.render(option1);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1073,7 +1099,7 @@
colName += option2.cols[0][i]["title"] + ",";
}
}
-
+
var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1123,12 +1149,14 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -1389,8 +1417,8 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
- if (obj.event === 'HMaterNumber') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ //鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
+ if (obj.event === 'HMaterNumber') //鐗╂枡淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
//椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
@@ -1401,7 +1429,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) {
@@ -1423,6 +1451,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) {
@@ -1557,6 +1592,88 @@
}
});
}
+ //鎿嶄綔鍛樹唬鐮�
+ if (obj.event === 'HEmpNumber') //鎿嶄綔鍛樹唬鐮�
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎿嶄綔鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HEmpID: checkStatus.data[0].HItemID,
+ HEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜,
+ HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //鐝粍浠ｇ爜
+ if (obj.event === 'HGroupNumber') //鐝粍浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HGroupID: checkStatus.data[0].HItemID,
+ HGroupNumber: checkStatus.data[0].鐝粍浠ｇ爜,
+ HGroupName: checkStatus.data[0].鐝粍鍚嶇О,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
obj.event = "";
return false;
}
@@ -1582,12 +1699,14 @@
table.reload('mainTable1', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
+ HBarInfo = result.list;
//鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
- element.tabChange('tab-TabTest', '3');
+ 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);//鐢熸垚鎸夐挳鍚敤
@@ -1607,7 +1726,7 @@
, dataArr = checkStatus.data;
//鐢变簬鏉＄爜淇℃伅鍒楄〃涓病鏈� HItemID 瀛楁锛屾墍浠ラ噰鍙栦簡鐢� 鏉＄爜缂栧彿 鍘昏幏鍙� HItemID 鐨勬柟寮�
- if (checkStatus.data.length>0) {
+ if (checkStatus.data.length > 0) {
var rows = [];
for (var i = 0; i < dataArr.length; i++) {
rows.push(dataArr[i].HItemID.toString());
--
Gitblit v1.9.1