From 7bb3ffb383e41f66ea9e89b8b0f8182726e77d1b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 27 一月 2026 15:14:07 +0800
Subject: [PATCH] 华舟 新增 器具保养规程 器具点检规程 设备点检规程 设备保养规程 的默认结果选择
---
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 908 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 780 insertions(+), 128 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 1582188..5c02225 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">渚涘簲鍟�<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撶鍛�</label>
+ <label class="layui-form-label">浠撶鍛�<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
+ <label class="layui-form-label">璐熻矗浜�<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -128,7 +128,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -138,7 +138,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -150,7 +150,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹</label>
+ <label class="layui-form-label">楠屾敹<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -160,7 +160,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -170,13 +170,29 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<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>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰浠g爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -272,6 +288,8 @@
<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-CopyLine"><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>
+ <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>
</div>
</script>
@@ -287,6 +305,12 @@
</script>
<script>
+ //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+ var childPage = null; //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+ var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+ var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+ //#endregion
+
//#region 鎶樺彔娉ㄩ噴
//#endregion
layui.config({
@@ -310,8 +334,13 @@
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var allVal;
+
+ //妯″潡鍚�
+ var HModName = "Fb_StepFoldinBillEdit";
+ var titleData = [];
+
//鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//#endregion
@@ -360,6 +389,9 @@
// 鍒濆鍖栫晫
set_InitGrid();
+ DisPlay_HideColumn();
+
+
//鑾峰彇婧愬崟绫诲瀷
HSourceBillType();
//澶村伐鍏锋爮浜嬩欢
@@ -373,6 +405,12 @@
"HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
};
switch (obj.event) {
+ //搴撳瓨鏌ヨ
+ case 'get_Inventory': get_Inventory();
+ break;
+ //鍑哄叆搴撹褰曟煡璇�
+ case 'get_InOutSum': get_InOutSum();
+ break;
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
@@ -399,10 +437,10 @@
//checkRefresh();
}
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -447,7 +485,11 @@
form.on('submit(HKeeperList)', function () {
get_checkKeeper();
});
-
+ //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
+ form.on('submit(btnSearchHProNumber)', function () {
+ get_checkSearchHProNumber();
+ });
+ //#endregion
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
@@ -479,7 +521,191 @@
//#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 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ /*var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠g爜","閿�鍞嚭搴撴暟閲�","閿�鍞嚭搴撳鏍告暟閲�","閿�鍞嚭搴撳鏍搁噾棰�","鐢熶骇鏁伴噺","閿�鍞��搴撴暟閲�","閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+ //titleData = [];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (i >= dataCol.length) {
+ continue;
+ }
+
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] += "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) > -1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+
+
+ } else {
+ table.render(option);
+
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -552,6 +778,109 @@
table.render(option);
}
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ /* table.render(option);*/
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1;
+ var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ table.render(option);
+ default:
+ }
+ });
+ //#endregion
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -564,70 +893,73 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
/*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.浠撶鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HWHID": data.HWHID
- , "HWHName": data.璋冨叆浠撳簱
- , "HSCWHID": data.HSCWHID
- , "HSCWHName": data.璋冨嚭浠撳簱
- , "HManagerName": data.璐熻矗浜�
- , "HManagerID": data.HManagerID
- , "HSecManagerID": data.HSecManagerID
- , "HSecManagerName": data.楠屾敹
- , "HKeeperID": data.HKeeperID
- , "HKeeperName": data.淇濈鍛�
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSourceBillType": data.婧愬崟绫诲瀷
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].浠撶鍛�
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HWHID": data[0].HWHID
+ , "HWHName": data[0].璋冨叆浠撳簱
+ , "HSCWHID": data[0].HSCWHID
+ , "HSCWHName": data[0].璋冨嚭浠撳簱
+ , "HManagerName": data[0].璐熻矗浜�
+ , "HManagerID": data[0].HManagerID
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HSecManagerName": data[0].楠屾敹
+ , "HKeeperID": data[0].HKeeperID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HPSStyleID": data[0].HPSStyleID
+ , "HPSStyleName": data[0].閲囪喘鏂瑰紡
+ , "HSourceBillType": data[0].婧愬崟绫诲瀷
+ , "HSSID": data[0].HSSID
+ , "HSSName": data[0].缁撶畻鏂瑰紡
+ , "HLinkMan": data[0].鑱旂郴浜�
+ , "HLinkPhone": data[0].鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HProjectID": data[0]["HProjectID"]
+ , "HProNumber": data[0]["椤圭洰缂栫爜"]
+ , "HProName": data[0]["椤圭洰鍚嶇О"]
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HUpDater": data[0].淇敼浜�
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HDeleteMan": data[0].浣滃簾浜�
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠g爜": data.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁¢噺鍗曚綅": data.璁¢噺鍗曚綅, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data.鎵规,
- "HSourceBillNo": data.婧愬崟鍗曞彿, //婧愬崟鍙�
- "HSourceBillType": data.婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- "HSourceInterID": data.婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- "HSourceEntryID": data.婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠g爜": data[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
+ , "璁¢噺鍗曚綅": data[i].璁¢噺鍗曚綅, "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOrderPrice": data[i].閲囪喘閲戦, "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱, "HTaxRate": data[i].绋庣巼
+ , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data[i].绋庨) * data[i].姹囩巼
+ , "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data[i].鎵规,
+ "HSourceBillNo": data[i].婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": data[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": data[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
}
)
}
@@ -651,7 +983,30 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
-
+ //if ($("#HSupID").val() == 0) {
+ // layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HEmpID").val() == 0) {
+ // layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSecManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HKeeperID").val() == 0) {
+ // layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HDeptID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HWHID").val() == 0) {
layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -670,28 +1025,33 @@
}
}
- checkDuplicateData(num);
- const duplicateRows = checkDuplicateData(num);
- if (duplicateRows.length > 0) {
- let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+ //checkDuplicateData(num);
+ //const duplicateRows = checkDuplicateData(num);
+ //if (duplicateRows.length > 0) {
+ // let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
- for (let i = 0; i < duplicateRows.length; i++) {
- const { row1, row2 } = duplicateRows[i];
- message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+ // for (let i = 0; i < duplicateRows.length; i++) {
+ // const { row1, row2 } = duplicateRows[i];
+ // message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
- if (i !== duplicateRows.length - 1) {
- message += '锛�';
- }
- }
+ // if (i !== duplicateRows.length - 1) {
+ // message += '锛�';
+ // }
+ // }
- message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
- layer.alert(message);
- return;
- }
+ // message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+ // layer.alert(message);
+ // return;
+ //}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var sAllStr = JSON.stringify(allVal);
+ console.log(sMainStr);
+ console.log("---------");
+ console.log(sSubStr)
+ console.log("---------");
+ console.log(sAllStr);
//var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
@@ -725,6 +1085,105 @@
//琛屽唴蹇嵎閿瓫閫�
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 == "HMaterID") { //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+ if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+ if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+ 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,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+ childPage.getData(childSWhere, tableView);
+ }, 200);
+ }
+ , end: function () {
+ obj.event = "";
+ childPage = null;
+ currRowIndex = 0;
+ if (childData != null) {
+ obj.update({
+ "HMaterID": childData.HItemID
+ , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
+ , "HUnitID": childData.HUnitID
+ , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
+ })
+
+ 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,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+ childPage.getData(childSWhere, tableView);
+ }, 200);
+ }
+ } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+ 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("HBillNo");
+ element.focus();
+
+ childPage.getSelectedData(currRowIndex);
+
+ if (childData != null) {
+ obj.update({
+ "HMaterID": childData.HItemID
+ , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
+ , "HUnitID": childData.HUnitID
+ , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
+ })
+
+ childData = null;
+ }
+
+
+ childPage = null;
+ currRowIndex = 0;
+ childData = null;
+ obj.event = "";
+ }
+ }
+ }
+
+ }
+ //#endregion
+
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
@@ -743,30 +1202,48 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
+ if (checkStatus.data.length < 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID,
- "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜,
- "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
- "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿,
- "HUnitID": checkStatus.data[0].HUnitID,
- "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
- })
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HSecUnitRate": "0",
+ "HSecUnitID": "0", "杈呭姪璁¢噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
+ };
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+ table.render(option);//娓叉煋鐣岄潰
+ }
+ option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
+ option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
+ option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+ option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ }
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠g爜" : OptionData.鐗╂枡浠g爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁¢噺鍗曚綅" : OptionData.璁¢噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -780,7 +1257,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -797,11 +1274,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData[0].HItemID
+ , "璁¢噺鍗曚綅": OptionData[0].璁¢噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -832,11 +1313,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁¢噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSecUnitID": OptionData.HItemID
+ , "杈呭姪璁¢噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -867,11 +1352,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -902,17 +1392,91 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
obj.event = "";
return false;
}
+ })
+
+ $(document).off('dblclick', ".layui-table-edit").on('dblclick', '.layui-table-edit', function (e) {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HBillNo");
+ element.focus();
+
+ //鐗╂枡
+ if (obj.event == "HMaterID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length < 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HSecUnitRate": "0",
+ "HSecUnitID": "0", "杈呭姪璁¢噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
+ };
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+ table.render(option);//娓叉煋鐣岄潰
+ }
+ option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
+ option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
+ option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+ option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ }
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
+ });
+ }
+ obj.event = "";
+ //return false;
})
}
@@ -956,7 +1520,29 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
+ //鏈鏍� 宸插叧闂殑鍗曞瓙涓嶅厑璁镐笅鎺�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ if (temp != "none") {
+ if (temp.鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ if (temp.琛岀姸鎬� != "") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ } else {
+ return;
+ }
+ }
+
//鑾峰彇鍒嗘寮忚皟鍏ュ崟閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -990,7 +1576,7 @@
, "HSecManagerName": data.楠屾敹
, "HKeeperID": data.HKeeperID
, "HKeeperName": data.淇濈鍛�
- , "HSourceBillType": data.鍗曟嵁绫诲瀷
+ //, "HSourceBillType": data.鍗曟嵁绫诲瀷
});
@@ -1239,6 +1825,45 @@
})
}
+ //#region 椤圭洰浠g爜閫夋嫨椤甸潰
+ function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ョ▼椤圭洰鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Fb_StepFoldinBillEdit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
@@ -1268,6 +1893,33 @@
}
}
})
+ }
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐叆搴撳崟鏁版嵁
+ function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
}
//#endregion
@@ -1330,7 +1982,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁¢噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
--
Gitblit v1.9.1