From 6a3d112a2b2c66d603d6ea1a8d2a35754a69a7d5 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 05 九月 2025 09:27:16 +0800
Subject: [PATCH] 其他入库单：增加字段 件数
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 271 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 169 insertions(+), 102 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 070a685..0d89311 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"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
<style type="text/css">
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
@@ -57,21 +58,22 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐</label>
+ <label class="layui-form-label" id="BT_HOrgID">缁勭粐</label>
<div class="layui-input-inline">
<select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px">
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ巶浠ｇ爜</label>
+ <label class="layui-form-label" id="BT_HWorksNumber">宸ュ巶浠ｇ爜</label>
<div class="layui-input-inline">
<select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
+ <!--<option value="0">鑸滄垚</option>-->
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label" id="BT_HDate">鏃ユ湡</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" readonly>
</div>
@@ -79,7 +81,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label" id="BT_HSourceBillType">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" class="layui-input" value="" style="float:left;width:150px">
<option value="1">鐢熶骇璁㈠崟</option>
@@ -92,11 +94,13 @@
<option value="8">閿�鍞��璐у崟</option>
<option value="9">鐢熶骇閫�鏂欏崟</option>
<option value="10">宸ュ簭娴佽浆鍗�</option>
+ <option value="11">閿�鍞嚭搴撳崟</option>
+ <option value="12">棰嗘枡鍑哄簱鍗�</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label>
+ <label class="layui-form-label" id="BT_HSourceBillNo">閫夊崟鍙�<label style="color:red">*</label></label>
<div class="layui-input-inline">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
@@ -105,9 +109,10 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏉＄爜绫诲瀷</label>
+ <label class="layui-form-label" id="BT_HBarCodeType">鏉＄爜绫诲瀷</label>
<div class="layui-input-inline">
<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
+ <!--<option value="11">鍞竴鏉＄爜</option>-->
</select>
</div>
</div>
@@ -198,7 +203,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -292,8 +297,11 @@
set_EditFromGrid(linterid);
}
else {
- layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ layer.alert(get_MessageError("[0000-2-049]鏈煡鎿嶄綔绫诲瀷锛�", sessionStorage["HTranSlate"]), { icon: 5 });
}
+
+ initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
+ form.render('select');
//#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
@@ -475,13 +483,19 @@
case '10':
return "宸ュ簭娴佽浆鍗�";
break;
+ case '11':
+ return '閿�鍞嚭搴撳崟';
+ break;
+ case '12':
+ return '棰嗘枡鍑哄簱鍗�';
+ break;
}
}
//琛ㄥご淇℃伅婧愬崟淇℃伅寮圭獥
form.on('submit(HSourceBillNoList)', function () {
if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
- return layer.msg('璇烽�夋嫨鍗曟嵁绫诲瀷');
+ return layer.msg(get_MessageError('[0000-2-050]璇烽�夋嫨鍗曟嵁绫诲瀷', sessionStorage["HTranSlate"]));
}
//鑾峰彇缁勭粐ID
var SetHOrgID = $("#HOrgID").find("option:selected").val();
@@ -498,12 +512,17 @@
area: ['95%', '95%'],
maxmin: true,
content: [url, 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+ btn1: function (index, layero) {
+ HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
+ HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ element.tabChange('tab-TabTest', '1');
+
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));
}
var list = [];
var BillSelect = [];
@@ -529,7 +548,7 @@
type: "post",
url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
//contentType: 'application/json',
- async: true,
+ async: false,
dataType: "json",
data: { "msg": Str },
//traditional: true,
@@ -562,7 +581,7 @@
})
}
else {
- layer.msg("涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", { time: 1 * 2000, icon: 5 });
+ layer.msg(get_MessageError("[3899-2-001]涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
}
}
@@ -599,6 +618,17 @@
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
for (var i = 0; i < table.cache['mainTable'].length; i++) {
table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
+ if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
+ table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
+ if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ }
}
var sSubStr = JSON.stringify(table.cache['mainTable']);
HMaterInfo = table.cache['mainTable'];
@@ -628,37 +658,12 @@
//閲嶇疆
form.on('submit(ToolReset)', function (data) {
- layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�', {
- btn: ['纭畾', '鍙栨秷'],
- title: "鎻愮ず",
+ layer.confirm(get_MessageError('[3899-2-002]纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�', sessionStorage["HTranSlate"]), {
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+ title: get_MessageError("[0000-2-009]鎻愮ず", sessionStorage["HTranSlate"]),
icon: 3,
}, function (index) {
- $("#HOrgID").find("option").remove(); //娓呴櫎婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗕腑鐨勫��
- set_HOrg(); //璋冪敤鑾峰彇婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗙殑鍊�
- $("#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: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
- table.reload('mainTable', {
- data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
- var arr1 = [{
- "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": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
- }]
- table.reload('mainTable1', {
- data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
-
- //鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
- element.tabChange('tab-TabTest', '1');
- //鍔犺浇妗ｆ鍒楄〃
- table.reload('mainTable2', {
- data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
- layer.close(index)
+ location.replace('Gy_BarCodeBill.html?OperationType=1');
})
})
@@ -673,14 +678,14 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../PublicPage/MaterialInfo.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
+ 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
var data = checkStatus.data;
@@ -722,6 +727,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/Sync_data',
type: "GET",
+ async: false,
//data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.code == 1) {
@@ -740,6 +746,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/Batch',
type: "GET",
+ async: false,
data: { "HMaterID": HMaterID, "HBatchNo": HBatchNo },
success: function (data1) {
if (data1.code == 1) {
@@ -749,14 +756,14 @@
table.reload('mainTable', {
data: BatchNoArray // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
- layer.alert(data1.Message)
+ layer.alert(get_MessageError(data1.Message, sessionStorage["HTranSlate"]))
}
}, error: function () {
- layer.alert(data1.Message, { icon: 5 });
+ layer.alert(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
}
});
} else {
- layer.alert('璇锋偍鍦ㄨ幏鍙栨壒鍙峰悗鍦ㄨ緭鍏ユ渶灏忓寘瑁呮暟 ^_^||')
+ layer.alert(get_MessageError('[3899-2-004]璇锋偍鍦ㄨ幏鍙栨壒鍙峰悗鍦ㄨ緭鍏ユ渶灏忓寘瑁呮暟 ^_^||', sessionStorage["HTranSlate"]))
}
});
@@ -788,6 +795,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -810,6 +818,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Sc_BarCode/GetHWorksNumberBill",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -834,6 +843,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Sc_BarCode/GetHBarCodeTypeBill",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -858,6 +868,7 @@
, { 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: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
, { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
@@ -873,6 +884,7 @@
, { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
, { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { 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 }
@@ -898,7 +910,6 @@
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -1028,7 +1039,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
option.data = [{
- "HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+ "HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
, "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": "",
@@ -1092,17 +1103,17 @@
option.data = table.cache["mainTable"];
table.render(option);
//rows++;
- layer.msg('澧炲姞涓�琛屾寜閽紒')
+ layer.msg(get_MessageError('[3899-2-005]澧炲姞涓�琛屾寜閽紒', sessionStorage["HTranSlate"]))
}
//澶嶅埗涓�琛�
function btnCopyLine(data) {
data[0].HQty = '';
var copydata = JSON.stringify(data);
if (data.length <= 0) {
- layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ layer.msg(get_MessageError("[0000-2-001]璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒", sessionStorage["HTranSlate"]));
}
else if (data.length > 1) {
- layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ layer.msg(get_MessageError("[0000-2-002]鍙兘閫夋嫨澶嶅埗涓�琛岋紒", sessionStorage["HTranSlate"]));
}
else {
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
@@ -1152,7 +1163,7 @@
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
+ ,btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, laero) {
if (value == 0) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1251,7 +1262,7 @@
table.render(option);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1335,7 +1346,7 @@
table.render(option1);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1421,7 +1432,7 @@
table.render(option2);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1431,10 +1442,10 @@
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
- layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ layer.confirm(get_MessageError('[0000-1-003]鐪熺殑鍒犻櫎琛屼箞', sessionStorage["HTranSlate"]), function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
- layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ layer.msg(get_MessageError('[0000-2-003]棣栬鏃犳硶鍒犻櫎锛侊紒锛�', sessionStorage["HTranSlate"]));
} else {
//obj.del();
//layer.close(index);
@@ -1570,6 +1581,8 @@
//鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
if (obj.event === 'HMaterNumber') //鐗╂枡淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
+ //鑾峰彇缁勭粐ID
+ var HOrgID = $("#HOrgID").find("option:selected").val();
//椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
type: 2,
@@ -1579,36 +1592,51 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
- //console.log(obj.data);
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterNumber: checkStatus.data[0].HNumber,
- HMaterName: checkStatus.data[0].HName,
- HMaterModel: checkStatus.data[0].HModel,
- HUnitID: checkStatus.data[0].HUnitID,
- HUnitNumber: checkStatus.data[0].HUnitNumber,
- HUnitName: checkStatus.data[0].HUnitName
- });
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length >= 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ 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, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+ };
- if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
- obj.update({
- HQty: 1, //鏁伴噺
- HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
- HBQty: 1 //绠辨暟
- });
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
+ option.data[rowIndex + i].HMaterName = resultData.HMaterName;
+ option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
+ option.data[rowIndex + i].HUnitName = resultData.HUnitName;
+
+ if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
+ option.data[rowIndex + i].HQty = 1; //鏁伴噺
+ option.data[rowIndex + i].HMinQty = 1; //鏈�灏忓寘瑁呮暟閲�
+ option.data[rowIndex + i].HBQty = 1; //绠辨暟
+ }
+ }
+ table.render(option);
}
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ layer.closeAll();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1632,14 +1660,14 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../PublicPage/PropertyInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1674,14 +1702,14 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../PublicPage/UnitInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1715,14 +1743,14 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../PublicPage/CustomerInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1754,15 +1782,15 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1779,8 +1807,16 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
- }
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": OptionData[0].HItemID
+ , "HEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData[0].鑱屽憳鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
});
}
//鐝粍浠ｇ爜
@@ -1796,14 +1832,14 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, 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('璇烽�夋嫨鏁版嵁');
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1835,13 +1871,38 @@
}
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+ function getMaterialByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
+ async: false,
+ type: "GET",
+ data: {
+ "HMaterID": HMaterID
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ resultData = data[0];
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
//鏉＄爜鐢熸垚
function SaveBarCodeCreate(sMainSub, CampanyName) {
$.ajax(
{
type: "POST",
url: GetWEBURL() + "/Sc_BarCode/Sub_SaveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: { "msg": sMainSub, "CampanyName": CampanyName },
dataType: "json",
success: function (result) {
@@ -1860,12 +1921,12 @@
}
else {
$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
- layer.alert(result.Message, { icon: 5 });
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
}
layer.closeAll("loading");
},
error: function (err) {
- layer.alert(err.Message, { icon: 5 });
+ layer.alert(get_MessageError(err.Message, sessionStorage["HTranSlate"]), { icon: 5 });
}
});
}
@@ -1894,7 +1955,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏉＄爜鏁版嵁锛�');
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨瑕佹墦鍗扮殑鏉＄爜鏁版嵁锛�', sessionStorage["HTranSlate"]));
}
}
@@ -1902,22 +1963,22 @@
function AllowLoadData(sSubStr) {
var Result = true;
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
//if (sSubStr[i].HMainID == "") {
- // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
if (sSubStr[i].HMaterID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(get_MessageError("[0000-2-056]鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
return Result = false;
}
if (sSubStr[i].HQty == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(get_MessageError("[0000-2-057]鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓虹┖!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
return Result = false;
}
}
@@ -1932,6 +1993,12 @@
});
+
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ OptionData = obj;
+ }
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1