From 45012c55d231a88bd17d3e6bc8c19a9940266d4e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:09:01 +0800
Subject: [PATCH] fix: 修正 客户分类复制页面 供应商分类复制页面 审核按钮禁用异常
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 642 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 526 insertions(+), 116 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 d8cf2d8..9a2d54d 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,25 +81,25 @@
</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>
<option value="2">鐢熶骇姹囨姤鍗�</option>
<option value="3">閲囪喘璁㈠崟</option>
- <option value="4">鏀舵枡閫氱煡鍗�</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>
+ <option value="10">宸ュ簭娴佽浆鍗�</option>-->
+ <option value="11">閿�鍞嚭搴撳崟</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;">
@@ -106,9 +108,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>
@@ -166,6 +169,10 @@
<!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
<input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
</script>
+ <script type="text/html" id="switchTp3">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" value="{{d.HExpirationDateFlag}}" lay-skin="primary" lay-filter="HExpirationDateFlag" {{ d.HExpirationDateFlag == 1 ? 'checked' : '' }}>
+ </script>
</form>
</div>
</div>
@@ -176,6 +183,12 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
+ //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+ var childPage = null; //鑾峰彇瀛愮獥鍙ｅ璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙ｇ殑鍙橀噺鍜屾柟娉�
+ var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
+ var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
+ //#endregion
+
//鑾峰彇鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -209,15 +222,49 @@
var option2 = [];
var sWhere = "";
var sBillType = "3801";
- var HModName = "";
- var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var HModName = "Gy_BarCodeBill";
+ var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠ｇ爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧", "杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HMaterID = "";
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 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
+ }
+ })
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -227,15 +274,15 @@
set_HWorksNumber();
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
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, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+ }];
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
set_InitGrid2();
-
- //鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
- DisPlay_HideColumn1();
- DisPlay_HideColumn2();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
@@ -249,8 +296,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浜嬩欢
@@ -259,8 +309,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
- console.log(NewRow);
+
+ 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": ""
+ };
+ //console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -296,6 +350,45 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 淇敼琛� 鏃堕棿
+
+ var data = obj.data;
+ //鐢熶骇鏃ユ湡
+ if (obj.event == 'HProduceDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ //淇濊川鏈熻嚦
+ if (obj.event == 'HExpiryDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ //#endregion
});
//鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
@@ -318,8 +411,7 @@
HBQty: 0, //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
- else
- {
+ else {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: value, //鏁伴噺
@@ -331,7 +423,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({
@@ -346,7 +438,7 @@
HBQty: Math.ceil(HQty / value), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
-
+
break;
default:
}
@@ -375,18 +467,36 @@
case '5':
return "濮斿璁㈠崟";
break;
+ case '6':
+ return "鐢熶骇鍏ュ簱鍗�";
+ break;
+ case '7':
+ return "閲囪喘鍏ュ簱鍗�";
+ break;
+ case '8':
+ return "閿�鍞��璐у崟";
+ break;
+ case '9':
+ return "鐢熶骇閫�鏂欏崟";
+ break;
+ case '10':
+ return "宸ュ簭娴佽浆鍗�";
+ break;
+ case '11':
+ 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();
//椤甸潰灞�-鑷畾涔�
- 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({
@@ -395,15 +505,15 @@
title: '' + getSupType() + '鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['95%', '80%'],
+ 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) {
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 = [];
@@ -429,7 +539,7 @@
type: "post",
url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
//contentType: 'application/json',
- async: true,
+ async: false,
dataType: "json",
data: { "msg": Str },
//traditional: true,
@@ -437,12 +547,21 @@
HMaterID = result.list[0].HMaterID;
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
-
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��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].HEmpID = sessionStorage["HEmpID"]
+ result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
+ result.list[i].HEmpName = sessionStorage["HEmpName"]
}
+ 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 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -453,7 +572,7 @@
})
}
else {
- layer.msg("涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", { time: 1 * 2000, icon: 5 });
+ layer.msg(get_MessageError("[3899-2-001]涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
}
}
@@ -487,18 +606,34 @@
//鏉＄爜鐢熸垚
form.on('submit(ToolCreate)', function (data) {
+ $('#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'];
//鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
return false;
}
//鑾峰彇閫夋嫨鐨勭粍缁�
var HOrgType = $("#HOrgID").find("option:selected").html();
//鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
var CampanyName = $("#HWorksNumber").find("option:selected").html();
- if (CampanyName == "" || CampanyName == null)
- {
+ if (CampanyName == "" || CampanyName == null) {
CampanyName = "xxx";
}
//鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
@@ -506,17 +641,17 @@
//鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
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('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�',{
- 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(); //娓呴櫎婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗕腑鐨勫��
@@ -524,7 +659,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: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -532,6 +667,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": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}]
table.reload('mainTable1', {
data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -543,7 +679,7 @@
table.reload('mainTable2', {
data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
- layer.close(index)
+ layer.close(index)
})
})
@@ -558,16 +694,34 @@
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 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].鏁伴噺, HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+
+ var data = checkStatus.data;
+ var arr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ arr.push({
+ "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+ , "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+ , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "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": data[i].HISKFPERIOD == false ? 0 : 1
+ , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+ , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+ , "HCheckEmpName": ""
+ })
+ }
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -589,11 +743,12 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/Sync_data',
type: "GET",
+ async: false,
//data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.code == 1) {
layer.alert(data1.Message)
- }
+ }
}, error: function () {
layer.close(index);
layer.alert(data1.Message, { icon: 5 });
@@ -607,6 +762,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/Batch',
type: "GET",
+ async: false,
data: { "HMaterID": HMaterID, "HBatchNo": HBatchNo },
success: function (data1) {
if (data1.code == 1) {
@@ -616,14 +772,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"]))
}
});
@@ -655,6 +811,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -677,6 +834,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Sc_BarCode/GetHWorksNumberBill",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -701,6 +859,7 @@
var Organization = '';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Sc_BarCode/GetHBarCodeTypeBill",
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -722,32 +881,50 @@
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
- , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+ , { 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: '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: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
- , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', 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: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', 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: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
- , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
- , { 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: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
- , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+ , { 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: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
, { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { 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: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', 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, 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, hide: true }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -755,13 +932,16 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
- , cellMinWidth: 120
- , height: 650
+ , totalRow: true
+ , cellMinWidth: 75
+ , height: 'full-325'
, cols: [columns]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, done: function (res, curr, count) {
}
};
+ option.data = rowdata;
+ table.render(option);
}
//鍒濆鏉＄爜淇℃伅琛ㄦ牸
function set_CountGrid() {
@@ -793,11 +973,10 @@
id: 'mainTable1'
, elem: '#mainTable1'
, toolbar: '#toolbarDemo1'
- , height: 500
, page: false
, limit: 500
, cellMinWidth: 120
- , height: 650
+ , height: 'full-325'
, cols: [columns]
, done: function (res, curr, count) {
}
@@ -863,11 +1042,10 @@
id: 'mainTable2'
, elem: '#mainTable2'
, toolbar: '#toolbarDemo2'
- , height: 500
, page: false
, limit: 500
, cellMinWidth: 120
- , height: 650
+ , height: 'full-325'
, cols: [columns]
, done: function (res, curr, count) {
}
@@ -879,8 +1057,14 @@
"HMainID": 0, "HSubID": 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": "",
+ "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": ""
}];
table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
function set_AddFNew1() {
@@ -888,13 +1072,22 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+ , "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
}];
table.render(option1);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
function set_AddFNew2() {
option2.data = [];
table.render(option2);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
//鏃ユ湡鏍煎紡鍖�
@@ -924,17 +1117,18 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- rows++;
- layer.msg('澧炲姞涓�琛屾寜閽紒')
+ //rows++;
+ 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);//鍘婚櫎棣栬瀛楃'['
@@ -964,7 +1158,7 @@
colName += option2.cols[0][i]["title"] + ",";
}
}
-
+
var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -984,7 +1178,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) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1014,12 +1208,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;
@@ -1081,7 +1277,7 @@
table.render(option);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1165,7 +1361,7 @@
table.render(option1);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1187,7 +1383,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option2.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option2.cols[0][i + 1]["hide"] = true;
@@ -1249,7 +1447,7 @@
table.render(option2);
}
}, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
}
@@ -1259,10 +1457,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);
@@ -1277,9 +1475,126 @@
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+ if (event.key != "F7") {
+ var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+ if (obj.event == "HMaterNumber") { //瀹氫綅褰撳墠姝ｅ湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+ if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+ if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙ｆ槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙ｇ殑瀵硅薄
+ var offset = $(this).offset(); //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+ var innerHeight = window.innerHeight;
+ var top = offset.top + 0.05 * innerHeight;
+ var left = offset.left;
+ if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+ top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+ }
+ layer.open({
+ type: 2 //寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['25%', '30%'] //澶у皬
+ , shadeClose: true //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+ , offset: [top, left]
+ , title: false //涓嶆樉绀烘爣棰樻爮
+ //, title: '椤圭洰璐圭敤鍒楄〃' //鏍囬
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , closeBtn: 0 //绂佺敤鍏抽棴鎸夐挳
+ , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+ , success: function (layero, index) {
+ setTimeout(function () {
+ var value = $(e.currentTarget).val().replace("'", ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ }, 200);
+ }
+ , end: function () {
+ obj.event = "";
+ childPage = null;
+ currRowIndex = 0;
+ if (childData != null) {
+ obj.update({
+ "HMaterID": childData.HItemID,
+ "HMaterNumber": childData.鐗╂枡浠ｇ爜,
+ "HMaterName": childData.鐗╂枡鍚嶇О,
+ "HMaterModel": childData.瑙勬牸鍨嬪彿,
+ "HUnitID": childData.HUnitID,
+ "HUnitNumber": childData.璁￠噺鍗曚綅浠ｇ爜,
+ "HUnitName": childData.璁￠噺鍗曚綅鍚嶇О
+ });
+
+ if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
+ obj.update({
+ HQty: 1, //鏁伴噺
+ HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+ HBQty: 1 //绠辨暟
+ });
+ }
+
+ childData = null;
+ }
+ }
+ });
+ } else {
+ setTimeout(function () {
+ var value = $(e.currentTarget).val().replace("'", ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ }, 200);
+ }
+ } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙ｄ腑 閫変腑琛� 鐨勪綅缃�
+ if (event.key == "ArrowUp") {
+ currRowIndex--;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "ArrowDown") {
+ currRowIndex++;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "Enter") {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HSourceBillNo");
+ element.focus();
+
+ childPage.getSelectedData(currRowIndex);
+
+ if (childData != null) {
+ obj.update({
+ "HMaterID": childData.HItemID,
+ "HMaterNumber": childData.鐗╂枡浠ｇ爜,
+ "HMaterName": childData.鐗╂枡鍚嶇О,
+ "HMaterModel": childData.瑙勬牸鍨嬪彿,
+ "HUnitID": childData.HUnitID,
+ "HUnitNumber": childData.璁￠噺鍗曚綅浠ｇ爜,
+ "HUnitName": childData.璁￠噺鍗曚綅鍚嶇О
+ });
+
+ if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
+ obj.update({
+ HQty: 1, //鏁伴噺
+ HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+ HBQty: 1 //绠辨暟
+ });
+ }
+
+ childData = null;
+ }
+
+
+ childPage = null;
+ currRowIndex = 0;
+ childData = null;
+ obj.event = "";
+ }
+ }
+ }
+
+ }
+ //#endregion
+
if (event.key == "F7") {
- //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
- if (obj.event === 'HMaterNumber') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ //鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
+ if (obj.event === 'HMaterNumber') //鐗╂枡淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
//椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
@@ -1290,15 +1605,15 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', '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);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1306,9 +1621,19 @@
HMaterID: checkStatus.data[0].HItemID,
HMaterNumber: checkStatus.data[0].HNumber,
HMaterName: checkStatus.data[0].HName,
- HMaterModel: checkStatus.data[0].HModel
+ HMaterModel: checkStatus.data[0].HModel,
+ HUnitID: checkStatus.data[0].HUnitID,
+ HUnitNumber: checkStatus.data[0].HUnitNumber,
+ 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) {
@@ -1333,14 +1658,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"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1375,14 +1700,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"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1416,14 +1741,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"]));
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1432,6 +1757,88 @@
HCusNumber: checkStatus.data[0].HNumber,
HCusName: checkStatus.data[0].HName
});
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //鎿嶄綔鍛樹唬鐮�
+ 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: [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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ 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: [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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HGroupID: checkStatus.data[0].HItemID,
+ HGroupNumber: checkStatus.data[0].鐝粍浠ｇ爜,
+ HGroupName: checkStatus.data[0].鐝粍鍚嶇О,
+ });
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1460,7 +1867,7 @@
{
type: "POST",
url: GetWEBURL() + "/Sc_BarCode/Sub_SaveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: { "msg": sMainSub, "CampanyName": CampanyName },
dataType: "json",
success: function (result) {
@@ -1468,20 +1875,23 @@
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 {
- layer.alert(result.Message, { icon: 5 });
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ 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 });
}
});
}
@@ -1492,7 +1902,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());
@@ -1510,7 +1920,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏉＄爜鏁版嵁锛�');
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨瑕佹墦鍗扮殑鏉＄爜鏁版嵁锛�', sessionStorage["HTranSlate"]));
}
}
@@ -1518,22 +1928,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;
}
}
--
Gitblit v1.9.1