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/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html | 434 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 369 insertions(+), 65 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
index 2cf89a3..6f3b924 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
@@ -15,8 +15,9 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
- /* .layui-form-item .layui-inline {
+ /* .layui-form-item .layui-inline {
margin-right: 0;
}
@@ -45,6 +46,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -69,18 +71,8 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞儴闂�</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -89,6 +81,16 @@
<input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞儴闂�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -263,10 +265,12 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -305,6 +309,13 @@
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "1425";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
//妯″潡鍚�
var HModName = "Xs_SeOrderChangeBill";
@@ -397,9 +408,34 @@
//#region 琛ㄥご鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
+ if (OperationType == 4) {
+ //#region 鍒ゆ柇婧愬崟鐘舵��
+ var HSourceBillData = "";
+ var HSourceBillData = getSourceBillStatus_SeOrderBill(); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData.length == 0) {
+ layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氭簮鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鐘舵��"] + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ //#endregion
+ }
+
//if (AllowLoadData(data)) {
set_SaveBill(data);
//}
+ });
+ //#endregion
+
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(0);
});
//#endregion
@@ -430,6 +466,8 @@
"璁￠噺鍗曚綅": "",
"HQty_Old": "0",
"HQty_New": "0",
+ "HTaxRate_Old": "0",
+ "HTaxRate_New": "0",
"HTaxPrice_Old": "0",
"HTaxPrice_New": "0",
"HDate_Old": "",
@@ -461,6 +499,12 @@
case 'set_HideColumn':
get_HideColumn();
break;
+ //搴撳瓨鏌ヨ
+ case 'get_Inventory': get_Inventory();
+ break;
+ //鍑哄叆搴撹褰曟煡璇�
+ case 'get_InOutSum': get_InOutSum();
+ break;
}
});
//#endregion
@@ -489,6 +533,13 @@
//#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+ var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -497,25 +548,57 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
- case "HRate": //鐢ㄩ噺
- //value = (value * 1).toFixed(6);
+ case "HQty_New": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty_New: oldText
+ });
+ table.render(option);
- //var HWeight = $("#HWeight").val();
- //var HWaterQty = $("#HWaterQty").val();
- //var HRate = value;
- //var HQty = 0;
- //var HMaterRuleType = obj.data.HMaterRuleType;
- //if (HMaterRuleType == "鏌撴枡") {
- // HQty = HRate * HWeight;
- //} else if (HMaterRuleType == "鍔╁墏") {
- // HQty = HRate * HWaterQty;
- //}
- ////鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- //obj.update({
- // HRate: value,
- // HQty: HQty
- //});
- //table.render(option);
+ layer.msg("鏂版暟閲忚杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty_New = value * 1; //鏂版暟閲�
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty_New = Number(HQty_New.toFixed(HQtyDec));
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty_New: HQty_New
+ });
+ table.render(option);
+ break;
+ case "HTaxPrice_New": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice_New: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏂板惈绋庡崟浠疯杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
+ return;
+ }
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HTaxPrice_New = value * 1; //鏂板惈绋庡崟浠�=鍗曚环*(1+绋庣巼)
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HTaxPrice_New = Number(HTaxPrice_New.toFixed(HPriceDec));
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HTaxPrice_New: HTaxPrice_New
+ });
+ table.render(option);
break;
default:
}
@@ -599,20 +682,23 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, limit: 500
, height: 500
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100, style: "background-color:#efefef4d;", totalRow: true }
+ , { type: 'numbers', title: '搴忓彿', width: 100, style: "background-color:#efefef4d;" }
, { field: 'HMaterID', title: 'HMaterID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, event: "HMaterID", style: "background-color:#efefef4d;" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: "background-color:#efefef4d;" }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: "background-color:#efefef4d;" }
, { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: "background-color:#efefef4d;" }//f7
- , { field: 'HQty_Old', title: '鍘熸暟閲�', width: 100, style: "background-color:#efefef4d;"}
- , { field: 'HQty_New', title: '鏂版暟閲�', width: 100, edit: 'text' }
+ , { field: 'HQty_Old', title: '鍘熸暟閲�', width: 100, totalRow: true, style: "background-color:#efefef4d;"}
+ , { field: 'HQty_New', title: '鏂版暟閲�', width: 100, totalRow: true, edit: 'text' }
+ , { field: 'HTaxRate_Old', title: '鍘熺◣鐜�%', width: 100, style: "background-color:#efefef4d;" }
+ , { field: 'HTaxRate_New', title: '鏂扮◣鐜�%', width: 100, edit: 'text' }
, { field: 'HTaxPrice_Old', title: '鍘熷惈绋庡崟浠�', width: 100, style: "background-color:#efefef4d;" }
, { field: 'HTaxPrice_New', title: '鏂板惈绋庡崟浠�', width: 100, edit: 'text' }
, { field: 'HDate_Old', title: '鍘熶氦璐ф棩鏈�', width: 120, style: "background-color:#efefef4d;" }
@@ -624,7 +710,7 @@
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
- /* , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }*/
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -637,6 +723,8 @@
"璁￠噺鍗曚綅": "",
"HQty_Old": "0",
"HQty_New": "0",
+ "HTaxRate_Old": "0",
+ "HTaxRate_New": "0",
"HTaxPrice_Old": "0",
"HTaxPrice_New": "0",
"HDate_Old": "",
@@ -738,10 +826,12 @@
"瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
"HUnitID": result.data[i]["HUnitID"],
"璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
- "HQty_Old": result.data[i]["鍘熸暟閲�"],
- "HQty_New": result.data[i]["鏂版暟閲�"],
- "HTaxPrice_Old": result.data[i]["鍘熷惈绋庡崟浠�"],
- "HTaxPrice_New": result.data[i]["鏂板惈绋庡崟浠�"],
+ "HQty_Old": dealDoubleToFixed(result.data[i]["鍘熸暟閲�"], 1),
+ "HQty_New": dealDoubleToFixed(result.data[i]["鏂版暟閲�"], 1),
+ "HTaxRate_Old": result.data[i]["鍘熺◣鐜�"],
+ "HTaxRate_New": result.data[i]["鏂扮◣鐜�"],
+ "HTaxPrice_Old": dealDoubleToFixed(result.data[i]["鍘熷惈绋庡崟浠�"], 3),
+ "HTaxPrice_New": dealDoubleToFixed(result.data[i]["鏂板惈绋庡崟浠�"], 3),
"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
"HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
@@ -826,12 +916,14 @@
"瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
"HUnitID": result.data[i]["HUnitID"],
"璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
- "HQty_Old": result.data[i]["鏁伴噺"],
- "HQty_New": result.data[i]["鏁伴噺"],
- "HTaxPrice_Old": result.data[i]["鍚◣鍗曚环"],
- "HTaxPrice_New": result.data[i]["鍚◣鍗曚环"],
+ "HQty_Old": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
+ "HQty_New": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
+ "HTaxRate_Old": result.data[i]["绋庣巼"],
+ "HTaxRate_New": result.data[i]["绋庣巼"],
+ "HTaxPrice_Old": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"], 3),
+ "HTaxPrice_New": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"] ,3),
"HDate_Old": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
- "HDate_New": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
+ "HDate_New": new Date(result.data[i]["浜よ揣鏃ユ湡"]).getTime() < new Date().getTime() ? Format(new Date(),"yyyy-MM-dd"):formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HRemark": "",
"HSourceInterID": result.data[i]["hmainid"],
"HSourceEntryID": result.data[i]["hsubid"],
@@ -865,7 +957,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -873,7 +965,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -890,7 +982,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -898,8 +990,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
+
+ getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -935,13 +1029,14 @@
//#region 瀹㈡埛閫夋嫨椤甸潰
function get_checkCus() {
+ var HEmpID = $("#HEmpID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp=' + HEmpID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -966,7 +1061,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -974,7 +1069,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -991,7 +1086,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞柟寮忓垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -999,7 +1094,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSellSName").val(checkStatus.data[0].HName);
+ $("#HSellSName").val(checkStatus.data[0].閿�鍞柟寮忓悕绉�);
$("#HSellSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1041,10 +1136,12 @@
if (OperationType == 1 || OperationType == 2 || OperationType==4) {
refSav = "Add";
data.field.HChangeDate = new Date();
+ data.field.HSTOCKORGID = data.field.HOrgID;
}
if (OperationType == 3) {
refSav = "Update";
data.field.HChangeDate = new Date();
+ data.field.HSTOCKORGID = data.field.HOrgID;
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -1355,6 +1452,56 @@
}
//#endregion
+ //#region 搴撳瓨鏌ヨ
+ function get_Inventory() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ //寮圭獥鏂规硶
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
+ //#region 鍑哄叆搴撹褰曟煡璇�
+ function get_InOutSum() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
+
//#region 涓婄Щ
function btn_up() {
var checkStatus = table.checkStatus('mainTable')
@@ -1422,9 +1569,9 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
- layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
+ //if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ //} else {
//obj.del();
//layer.close(index);
var oldData = table.cache["mainTable"];
@@ -1432,7 +1579,7 @@
option.data = oldData;
table.render(option);
layer.close(index);
- }
+ /*}*/
});
}
}
@@ -1551,6 +1698,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
async: false,
@@ -1600,6 +1748,11 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
}
//鍙栨秷鍐荤粨鍒�
@@ -1640,16 +1793,94 @@
}
//#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOrderChangeBill/AuditXs_SeOrderChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
+ function getDecByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({ // 寮傛璇锋眰
+ url: GetWEBURL() + "Gy_Material/getDecByID", //璇锋眰鍦板潃
+ async: false, //鏄惁寮�鍚紓姝�
+ type: "GET", //璇锋眰绫诲瀷
+ data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
+ "HMaterID": HMaterID // 灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+ },
+ success: function (result) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
+ if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+ var data = result.data; //澹版槑data鍙橀噺锛屽苟灏嗗叾璧嬪�间负result瀵硅薄涓殑data灞炴��
+ resultData = data[0]; //灏哾ata鏁扮粍锛堟垨绫绘暟缁勫璞★級鐨勭涓�涓厓绱犺祴鍊肩粰鍙橀噺resultData
+ }
+ //else {
+ // layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑� 鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+ //}
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 }); //鎻愮ず寮圭獥 鍙戠敓閿欒 锛岃绀烘爣蹇椾负5鐨�
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
+ //#region 鑾峰彇婧愬崟-閿�鍞鍗曞崟鎹姸鎬�
+ function getSourceBillStatus_SeOrderBill() {
+ var HSourceBillData = "none";
+ var sWhere = " and hmainid = " + $("#HMainSourceInterID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ HSourceBillData = data1.data;
+ } else {
+ layer.alert(data1.code + "婧愬崟鍗曟嵁鐘舵�佸垽鏂け璐ワ紒", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return HSourceBillData;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
// 鍩虹璧勬枡杩斿洖鏁版嵁
- function GetHEmpValue(obj) //杩斿洖閿�鍞憳
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
+
+ getEmpInfoByHEmpID(obj[0].HItemID)
}
function GetHSupValue(obj) //杩斿洖瀹㈡埛
@@ -1664,11 +1895,84 @@
$("#HManagerID").val(obj[0].HItemID);
}
- function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
+
+ function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
+ {
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
+ $("#HSSID").val(obj[0].HItemID);
+ }
+
+ function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
+ {
+ $("#HSellSName").val(obj[0].閿�鍞柟寮忓悕绉�);
+ $("#HSellSID").val(obj[0].HItemID);
+ }
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
+
+ //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+ function getEmpInfoByHEmpID(HEmpID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+ async: false,
+ type: "GET",
+ data: {
+ "HEmpID": HEmpID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.HDeptName);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1